diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-28 23:04:53 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-12-28 23:04:53 +0100 |
| commit | c42cb14c4dc20b4b15861b4d569e4d7f31f8624b (patch) | |
| tree | 419f6482b05ee5dc6244f056aed86f2aa2d825ca | |
| parent | a5716a556e5aa33305354d3ae79a1868459df5d8 (diff) | |
| parent | cd873271438a15b0ce696471c383a3f6a28a9371 (diff) | |
| download | kernel-c42cb14c4dc20b4b15861b4d569e4d7f31f8624b.tar.gz kernel-c42cb14c4dc20b4b15861b4d569e4d7f31f8624b.tar.xz kernel-c42cb14c4dc20b4b15861b4d569e4d7f31f8624b.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.21.0-0.rc0.git2.1.vanilla.knurd.1.fc30kernel-4.21.0-0.rc0.git2.1.vanilla.knurd.1.fc29kernel-4.21.0-0.rc0.git2.1.vanilla.knurd.1.fc28
34 files changed, 177 insertions, 648 deletions
diff --git a/Fix-for-module-sig-verification.patch b/Fix-for-module-sig-verification.patch deleted file mode 100644 index 3a5de65eb..000000000 --- a/Fix-for-module-sig-verification.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ea6e7d9d0fe3e448aef19b3943d4897ae0bef128 Mon Sep 17 00:00:00 2001 -From: Fedora Kernel Team <kernel-team@fedoraproject.org> -Date: Thu, 3 Aug 2017 13:46:51 -0500 -Subject: [PATCH] Fix for module sig verification - ---- - kernel/module_signing.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/module_signing.c b/kernel/module_signing.c -index 937c844..d3d6f95 100644 ---- a/kernel/module_signing.c -+++ b/kernel/module_signing.c -@@ -81,6 +81,6 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen) - } - - return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, -- NULL, VERIFYING_MODULE_SIGNATURE, -+ (void *)1UL, VERIFYING_MODULE_SIGNATURE, - NULL, NULL); - } --- -2.13.3 - diff --git a/brcmfmac-Remove-firmware-loading-code-duplication.patch b/brcmfmac-Remove-firmware-loading-code-duplication.patch deleted file mode 100644 index eb7903eee..000000000 --- a/brcmfmac-Remove-firmware-loading-code-duplication.patch +++ /dev/null @@ -1,615 +0,0 @@ -From 76202e874f06ab641fbe1caaddd4cfcf7158f174 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 10 Oct 2018 13:00:58 +0200 -Subject: [PATCH 1/5] brcmfmac: Remove firmware-loading code duplication - -brcmf_fw_request_next_item and brcmf_fw_request_done both have identical -code to complete the fw-request depending on the item-type. - -This commit adds a new brcmf_fw_complete_request helper removing this code -duplication. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - .../broadcom/brcm80211/brcmfmac/firmware.c | 62 +++++++++---------- - 1 file changed, 31 insertions(+), 31 deletions(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index 9095b830ae4d..784c84f0e9e7 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -@@ -504,6 +504,34 @@ static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) - return -ENOENT; - } - -+static int brcmf_fw_complete_request(const struct firmware *fw, -+ struct brcmf_fw *fwctx) -+{ -+ struct brcmf_fw_item *cur = &fwctx->req->items[fwctx->curpos]; -+ int ret = 0; -+ -+ brcmf_dbg(TRACE, "firmware %s %sfound\n", cur->path, fw ? "" : "not "); -+ -+ switch (cur->type) { -+ case BRCMF_FW_TYPE_NVRAM: -+ ret = brcmf_fw_request_nvram_done(fw, fwctx); -+ break; -+ case BRCMF_FW_TYPE_BINARY: -+ if (fw) -+ cur->binary = fw; -+ else -+ ret = -ENOENT; -+ break; -+ default: -+ /* something fishy here so bail out early */ -+ brcmf_err("unknown fw type: %d\n", cur->type); -+ release_firmware(fw); -+ ret = -EINVAL; -+ } -+ -+ return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret; -+} -+ - static int brcmf_fw_request_next_item(struct brcmf_fw *fwctx, bool async) - { - struct brcmf_fw_item *cur; -@@ -525,15 +553,7 @@ static int brcmf_fw_request_next_item(struct brcmf_fw *fwctx, bool async) - if (ret < 0) { - brcmf_fw_request_done(NULL, fwctx); - } else if (!async && fw) { -- brcmf_dbg(TRACE, "firmware %s %sfound\n", cur->path, -- fw ? "" : "not "); -- if (cur->type == BRCMF_FW_TYPE_BINARY) -- cur->binary = fw; -- else if (cur->type == BRCMF_FW_TYPE_NVRAM) -- brcmf_fw_request_nvram_done(fw, fwctx); -- else -- release_firmware(fw); -- -+ brcmf_fw_complete_request(fw, fwctx); - return -EAGAIN; - } - return 0; -@@ -547,28 +567,8 @@ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) - - cur = &fwctx->req->items[fwctx->curpos]; - -- brcmf_dbg(TRACE, "enter: firmware %s %sfound\n", cur->path, -- fw ? "" : "not "); -- -- if (!fw) -- ret = -ENOENT; -- -- switch (cur->type) { -- case BRCMF_FW_TYPE_NVRAM: -- ret = brcmf_fw_request_nvram_done(fw, fwctx); -- break; -- case BRCMF_FW_TYPE_BINARY: -- cur->binary = fw; -- break; -- default: -- /* something fishy here so bail out early */ -- brcmf_err("unknown fw type: %d\n", cur->type); -- release_firmware(fw); -- ret = -EINVAL; -- goto fail; -- } -- -- if (ret < 0 && !(cur->flags & BRCMF_FW_REQF_OPTIONAL)) -+ ret = brcmf_fw_complete_request(fw, fwctx); -+ if (ret < 0) - goto fail; - - do { --- -2.19.1 - -From a3c4b522bff976360fb21c9205fcb37a121d4074 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 10 Oct 2018 13:00:59 +0200 -Subject: [PATCH 2/5] brcmfmac: Remove recursion from firmware load error - handling - -Before this commit brcmf_fw_request_done would call -brcmf_fw_request_next_item to load the next item, which on an error would -call brcmf_fw_request_done, which if the error is recoverable (*) will -then continue calling brcmf_fw_request_next_item for the next item again -which on an error will call brcmf_fw_request_done again... - -This does not blow up because we only have a limited number of items so -we never recurse too deep. But the recursion is still quite ugly and -frankly is giving me a headache, so lets fix this. - -This commit fixes this by removing brcmf_fw_request_next_item and by -making brcmf_fw_get_firmwares and brcmf_fw_request_done directly call -firmware_request_nowait resp. firmware_request themselves. - -*) brcmf_fw_request_nvram_done fallback path succeeds or - BRCMF_FW_REQF_OPTIONAL is set - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - .../broadcom/brcm80211/brcmfmac/firmware.c | 65 ++++++------------- - 1 file changed, 19 insertions(+), 46 deletions(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index 784c84f0e9e7..08aaf99fee34 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -@@ -532,33 +532,6 @@ static int brcmf_fw_complete_request(const struct firmware *fw, - return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret; - } - --static int brcmf_fw_request_next_item(struct brcmf_fw *fwctx, bool async) --{ -- struct brcmf_fw_item *cur; -- const struct firmware *fw = NULL; -- int ret; -- -- cur = &fwctx->req->items[fwctx->curpos]; -- -- brcmf_dbg(TRACE, "%srequest for %s\n", async ? "async " : "", -- cur->path); -- -- if (async) -- ret = request_firmware_nowait(THIS_MODULE, true, cur->path, -- fwctx->dev, GFP_KERNEL, fwctx, -- brcmf_fw_request_done); -- else -- ret = request_firmware(&fw, cur->path, fwctx->dev); -- -- if (ret < 0) { -- brcmf_fw_request_done(NULL, fwctx); -- } else if (!async && fw) { -- brcmf_fw_complete_request(fw, fwctx); -- return -EAGAIN; -- } -- return 0; --} -- - static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) - { - struct brcmf_fw *fwctx = ctx; -@@ -568,26 +541,19 @@ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) - cur = &fwctx->req->items[fwctx->curpos]; - - ret = brcmf_fw_complete_request(fw, fwctx); -- if (ret < 0) -- goto fail; -- -- do { -- if (++fwctx->curpos == fwctx->req->n_items) { -- ret = 0; -- goto done; -- } - -- ret = brcmf_fw_request_next_item(fwctx, false); -- } while (ret == -EAGAIN); -- -- return; -+ while (ret == 0 && ++fwctx->curpos < fwctx->req->n_items) { -+ cur = &fwctx->req->items[fwctx->curpos]; -+ request_firmware(&fw, cur->path, fwctx->dev); -+ ret = brcmf_fw_complete_request(fw, ctx); -+ } - --fail: -- brcmf_dbg(TRACE, "failed err=%d: dev=%s, fw=%s\n", ret, -- dev_name(fwctx->dev), cur->path); -- brcmf_fw_free_request(fwctx->req); -- fwctx->req = NULL; --done: -+ if (ret) { -+ brcmf_dbg(TRACE, "failed err=%d: dev=%s, fw=%s\n", ret, -+ dev_name(fwctx->dev), cur->path); -+ brcmf_fw_free_request(fwctx->req); -+ fwctx->req = NULL; -+ } - fwctx->done(fwctx->dev, ret, fwctx->req); - kfree(fwctx); - } -@@ -611,7 +577,9 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, - void (*fw_cb)(struct device *dev, int err, - struct brcmf_fw_request *req)) - { -+ struct brcmf_fw_item *first = &req->items[0]; - struct brcmf_fw *fwctx; -+ int ret; - - brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev)); - if (!fw_cb) -@@ -628,7 +596,12 @@ int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, - fwctx->req = req; - fwctx->done = fw_cb; - -- brcmf_fw_request_next_item(fwctx, true); -+ ret = request_firmware_nowait(THIS_MODULE, true, first->path, -+ fwctx->dev, GFP_KERNEL, fwctx, -+ brcmf_fw_request_done); -+ if (ret < 0) -+ brcmf_fw_request_done(NULL, fwctx); -+ - return 0; - } - --- -2.19.1 - -From c2c41d3f837ed492369607940af950ef554b8685 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 10 Oct 2018 13:01:00 +0200 -Subject: [PATCH 3/5] brcmfmac: Add support for first trying to get a board - specific nvram file - -The nvram files which some brcmfmac chips need are board-specific. To be -able to distribute these as part of linux-firmware, so that devices with -such a wifi chip will work OOTB, multiple (one per board) versions must -co-exist under /lib/firmware. - -This commit adds support for callers of the brcmfmac/firmware.c code to -pass in a board_type parameter through the request structure. - -If that parameter is set then the code will first try to load -chipmodel.board_type.txt before falling back to the old chipmodel.txt name. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - .../broadcom/brcm80211/brcmfmac/firmware.c | 27 ++++++++++++++++++- - .../broadcom/brcm80211/brcmfmac/firmware.h | 1 + - 2 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index 08aaf99fee34..6755b2388fbc 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -@@ -532,6 +532,31 @@ static int brcmf_fw_complete_request(const struct firmware *fw, - return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret; - } - -+static int brcmf_fw_request_firmware(const struct firmware **fw, -+ struct brcmf_fw *fwctx) -+{ -+ struct brcmf_fw_item *cur = &fwctx->req->items[fwctx->curpos]; -+ int ret; -+ -+ /* nvram files are board-specific, first try a board-specific path */ -+ if (cur->type == BRCMF_FW_TYPE_NVRAM && fwctx->req->board_type) { -+ char alt_path[BRCMF_FW_NAME_LEN]; -+ -+ strlcpy(alt_path, cur->path, BRCMF_FW_NAME_LEN); -+ /* strip .txt at the end */ -+ alt_path[strlen(alt_path) - 4] = 0; -+ strlcat(alt_path, ".", BRCMF_FW_NAME_LEN); -+ strlcat(alt_path, fwctx->req->board_type, BRCMF_FW_NAME_LEN); -+ strlcat(alt_path, ".txt", BRCMF_FW_NAME_LEN); -+ -+ ret = request_firmware(fw, alt_path, fwctx->dev); -+ if (ret == 0) -+ return ret; -+ } -+ -+ return request_firmware(fw, cur->path, fwctx->dev); -+} -+ - static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) - { - struct brcmf_fw *fwctx = ctx; -@@ -544,7 +569,7 @@ static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) - - while (ret == 0 && ++fwctx->curpos < fwctx->req->n_items) { - cur = &fwctx->req->items[fwctx->curpos]; -- request_firmware(&fw, cur->path, fwctx->dev); -+ brcmf_fw_request_firmware(&fw, fwctx); - ret = brcmf_fw_complete_request(fw, ctx); - } - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h -index 2893e56910f0..a0834be8864e 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h -@@ -70,6 +70,7 @@ struct brcmf_fw_request { - u16 domain_nr; - u16 bus_nr; - u32 n_items; -+ const char *board_type; - struct brcmf_fw_item items[0]; - }; - --- -2.19.1 - -From 282477a8e4034ee2ea906d2eb234ce9c86f5685f Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Sat, 17 Nov 2018 15:18:35 +0000 -Subject: [PATCH 4/5] brcmfmac: Set board_type used for nvram file selection to - machine-compatible - -For of/devicetree using machines, set the board_type used for nvram file -selection to the first string listed in the top-level's node compatible -string, aka the machine-compatible as used by of_machine_is_compatible(). - -The board_type setting is used to load the board-specific nvram file with -a board-specific name so that we can ship files for each supported board -in linux-firmware. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> -Signed-off-by: Peter Robinson <pbrobinson@gmail.com> ---- - .../broadcom/brcm80211/brcmfmac/Makefile | 2 + - .../broadcom/brcm80211/brcmfmac/common.c | 3 +- - .../broadcom/brcm80211/brcmfmac/common.h | 8 ++ - .../broadcom/brcm80211/brcmfmac/dmi.c | 116 ++++++++++++++++++ - .../wireless/broadcom/brcm80211/brcmfmac/of.c | 11 +- - .../broadcom/brcm80211/brcmfmac/pcie.c | 1 + - .../broadcom/brcm80211/brcmfmac/sdio.c | 1 + - 7 files changed, 140 insertions(+), 2 deletions(-) - create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile -index 1f5a9b948abf..22fd95a736a8 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile -@@ -54,3 +54,5 @@ brcmfmac-$(CONFIG_BRCM_TRACING) += \ - tracepoint.o - brcmfmac-$(CONFIG_OF) += \ - of.o -+brcmfmac-$(CONFIG_DMI) += \ -+ dmi.o -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -index cd3651069d0c..b93b1e797333 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -@@ -450,7 +450,8 @@ struct brcmf_mp_device *brcmf_get_module_param(struct device *dev, - } - } - if (!found) { -- /* No platform data for this device, try OF (Open Firwmare) */ -+ /* No platform data for this device, try OF and DMI data */ -+ brcmf_dmi_probe(settings, chip, chiprev); - brcmf_of_probe(dev, bus_type, settings); - } - return settings; -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h -index a34642cb4d2f..4ce56be90b74 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h -@@ -59,6 +59,7 @@ struct brcmf_mp_device { - bool iapp; - bool ignore_probe_fail; - struct brcmfmac_pd_cc *country_codes; -+ const char *board_type; - union { - struct brcmfmac_sdio_pd sdio; - } bus; -@@ -74,4 +75,11 @@ void brcmf_release_module_param(struct brcmf_mp_device *module_param); - /* Sets dongle media info (drv_version, mac address). */ - int brcmf_c_preinit_dcmds(struct brcmf_if *ifp); - -+#ifdef CONFIG_DMI -+void brcmf_dmi_probe(struct brcmf_mp_device *settings, u32 chip, u32 chiprev); -+#else -+static inline void -+brcmf_dmi_probe(struct brcmf_mp_device *settings, u32 chip, u32 chiprev) {} -+#endif -+ - #endif /* BRCMFMAC_COMMON_H */ -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c -new file mode 100644 -index 000000000000..51d76ac45075 ---- /dev/null -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c -@@ -0,0 +1,116 @@ -+/* -+ * Copyright 2018 Hans de Goede <hdegoede@redhat.com> -+ * -+ * Permission to use, copy, modify, and/or distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <linux/dmi.h> -+#include <linux/mod_devicetable.h> -+#include "core.h" -+#include "common.h" -+#include "brcm_hw_ids.h" -+ -+/* The DMI data never changes so we can use a static buf for this */ -+static char dmi_board_type[128]; -+ -+struct brcmf_dmi_data { -+ u32 chip; -+ u32 chiprev; -+ const char *board_type; -+}; -+ -+/* NOTE: Please keep all entries sorted alphabetically */ -+ -+static const struct brcmf_dmi_data gpd_win_pocket_data = { -+ BRCM_CC_4356_CHIP_ID, 2, "gpd-win-pocket" -+}; -+ -+static const struct brcmf_dmi_data jumper_ezpad_mini3_data = { -+ BRCM_CC_43430_CHIP_ID, 0, "jumper-ezpad-mini3" -+}; -+ -+static const struct brcmf_dmi_data meegopad_t08_data = { -+ BRCM_CC_43340_CHIP_ID, 2, "meegopad-t08" -+}; -+ -+static const struct dmi_system_id dmi_platform_data[] = { -+ { -+ /* Match for the GPDwin which unfortunately uses somewhat -+ * generic dmi strings, which is why we test for 4 strings. -+ * Comparing against 23 other byt/cht boards, board_vendor -+ * and board_name are unique to the GPDwin, where as only one -+ * other board has the same board_serial and 3 others have -+ * the same default product_name. Also the GPDwin is the -+ * only device to have both board_ and product_name not set. -+ */ -+ .matches = { -+ DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"), -+ DMI_MATCH(DMI_BOARD_NAME, "Default string"), -+ DMI_MATCH(DMI_BOARD_SERIAL, "Default string"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Default string"), -+ }, -+ .driver_data = (void *)&gpd_win_pocket_data, -+ }, -+ { -+ /* Jumper EZpad mini3 */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Insyde"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "CherryTrail"), -+ /* jumperx.T87.KFBNEEA02 with the version-nr dropped */ -+ DMI_MATCH(DMI_BIOS_VERSION, "jumperx.T87.KFBNEEA"), -+ }, -+ .driver_data = (void *)&jumper_ezpad_mini3_data, -+ }, -+ { -+ /* Meegopad T08 */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Default string"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "Default string"), -+ DMI_MATCH(DMI_BOARD_NAME, "T3 MRD"), -+ DMI_MATCH(DMI_BOARD_VERSION, "V1.1"), -+ }, -+ .driver_data = (void *)&meegopad_t08_data, -+ }, -+ {} -+}; -+ -+void brcmf_dmi_probe(struct brcmf_mp_device *settings, u32 chip, u32 chiprev) -+{ -+ const struct dmi_system_id *match; -+ const struct brcmf_dmi_data *data; -+ const char *sys_vendor; -+ const char *product_name; -+ -+ /* Some models have DMI strings which are too generic, e.g. -+ * "Default string", we use a quirk table for these. -+ */ -+ for (match = dmi_first_match(dmi_platform_data); -+ match; -+ match = dmi_first_match(match + 1)) { -+ data = match->driver_data; -+ -+ if (data->chip == chip && data->chiprev == chiprev) { -+ settings->board_type = data->board_type; -+ return; -+ } -+ } -+ -+ /* Not found in the quirk-table, use sys_vendor-product_name */ -+ sys_vendor = dmi_get_system_info(DMI_SYS_VENDOR); -+ product_name = dmi_get_system_info(DMI_PRODUCT_NAME); -+ if (sys_vendor && product_name) { -+ snprintf(dmi_board_type, sizeof(dmi_board_type), "%s-%s", -+ sys_vendor, product_name); -+ settings->board_type = dmi_board_type; -+ } -+} -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c -index aee6e5937c41..84e3373289eb 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c -@@ -27,11 +27,20 @@ void brcmf_of_probe(struct device *dev, enum brcmf_bus_type bus_type, - struct brcmf_mp_device *settings) - { - struct brcmfmac_sdio_pd *sdio = &settings->bus.sdio; -- struct device_node *np = dev->of_node; -+ struct device_node *root, *np = dev->of_node; -+ struct property *prop; - int irq; - u32 irqf; - u32 val; - -+ /* Set board-type to the first string of the machine compatible prop */ -+ root = of_find_node_by_path("/"); -+ if (root) { -+ prop = of_find_property(root, "compatible", NULL); -+ settings->board_type = of_prop_next_string(prop, NULL); -+ of_node_put(root); -+ } -+ - if (!np || bus_type != BRCMF_BUSTYPE_SDIO || - !of_device_is_compatible(np, "brcm,bcm4329-fmac")) - return; -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -index 4fffa6988087..b12f3e0ee69c 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -@@ -1785,6 +1785,7 @@ brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo) - fwreq->items[BRCMF_PCIE_FW_CODE].type = BRCMF_FW_TYPE_BINARY; - fwreq->items[BRCMF_PCIE_FW_NVRAM].type = BRCMF_FW_TYPE_NVRAM; - fwreq->items[BRCMF_PCIE_FW_NVRAM].flags = BRCMF_FW_REQF_OPTIONAL; -+ fwreq->board_type = devinfo->settings->board_type; - /* NVRAM reserves PCI domain 0 for Broadcom's SDK faked bus */ - fwreq->domain_nr = pci_domain_nr(devinfo->pdev->bus) + 1; - fwreq->bus_nr = devinfo->pdev->bus->number; -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index a907d7b065fa..3dbbbb117563 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -4177,6 +4177,7 @@ brcmf_sdio_prepare_fw_request(struct brcmf_sdio *bus) - - fwreq->items[BRCMF_SDIO_FW_CODE].type = BRCMF_FW_TYPE_BINARY; - fwreq->items[BRCMF_SDIO_FW_NVRAM].type = BRCMF_FW_TYPE_NVRAM; -+ fwreq->board_type = bus->sdiodev->settings->board_type; - - return fwreq; - } --- -2.19.1 - -From 6351ca678eb1391129cf5afccab518f376d57596 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Wed, 10 Oct 2018 13:01:03 +0200 -Subject: [PATCH 5/5] brcmfmac: Cleanup brcmf_fw_request_done() - -The "cur" variable is now only used for a debug print and we already -print the same info from brcmf_fw_complete_request(), so the debug print -does not provide any extra info and we can remove it. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - .../net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index 6755b2388fbc..b38c4b40b235 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -@@ -560,22 +560,16 @@ static int brcmf_fw_request_firmware(const struct firmware **fw, - static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) - { - struct brcmf_fw *fwctx = ctx; -- struct brcmf_fw_item *cur; -- int ret = 0; -- -- cur = &fwctx->req->items[fwctx->curpos]; -+ int ret; - - ret = brcmf_fw_complete_request(fw, fwctx); - - while (ret == 0 && ++fwctx->curpos < fwctx->req->n_items) { -- cur = &fwctx->req->items[fwctx->curpos]; - brcmf_fw_request_firmware(&fw, fwctx); - ret = brcmf_fw_complete_request(fw, ctx); - } - - if (ret) { -- brcmf_dbg(TRACE, "failed err=%d: dev=%s, fw=%s\n", ret, -- dev_name(fwctx->dev), cur->path); - brcmf_fw_free_request(fwctx->req); - fwctx->req = NULL; - } --- -2.19.1 - diff --git a/configs/fedora/generic/CONFIG_CAN_FLEXCAN b/configs/fedora/generic/CONFIG_CAN_FLEXCAN new file mode 100644 index 000000000..3ba377ce4 --- /dev/null +++ b/configs/fedora/generic/CONFIG_CAN_FLEXCAN @@ -0,0 +1 @@ +# CONFIG_CAN_FLEXCAN is not set diff --git a/configs/fedora/generic/CONFIG_CRYPTO_ADIANTUM b/configs/fedora/generic/CONFIG_CRYPTO_ADIANTUM new file mode 100644 index 000000000..099b137d1 --- /dev/null +++ b/configs/fedora/generic/CONFIG_CRYPTO_ADIANTUM @@ -0,0 +1 @@ +CONFIG_CRYPTO_ADIANTUM=m diff --git a/configs/fedora/generic/CONFIG_CRYPTO_STREEBOG b/configs/fedora/generic/CONFIG_CRYPTO_STREEBOG new file mode 100644 index 000000000..37bce9527 --- /dev/null +++ b/configs/fedora/generic/CONFIG_CRYPTO_STREEBOG @@ -0,0 +1 @@ +CONFIG_CRYPTO_STREEBOG=m diff --git a/configs/fedora/generic/CONFIG_ENERGY_MODEL b/configs/fedora/generic/CONFIG_ENERGY_MODEL new file mode 100644 index 000000000..ae61c90f2 --- /dev/null +++ b/configs/fedora/generic/CONFIG_ENERGY_MODEL @@ -0,0 +1 @@ +# CONFIG_ENERGY_MODEL is not set diff --git a/configs/fedora/generic/CONFIG_NET_DSA_MICROCHIP_KSZ9477 b/configs/fedora/generic/CONFIG_NET_DSA_MICROCHIP_KSZ9477 new file mode 100644 index 000000000..87dcb9a74 --- /dev/null +++ b/configs/fedora/generic/CONFIG_NET_DSA_MICROCHIP_KSZ9477 @@ -0,0 +1 @@ +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m diff --git a/configs/fedora/generic/CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI b/configs/fedora/generic/CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI new file mode 100644 index 000000000..63f557814 --- /dev/null +++ b/configs/fedora/generic/CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI @@ -0,0 +1 @@ +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m diff --git a/configs/fedora/generic/CONFIG_QTNFMAC_PCIE b/configs/fedora/generic/CONFIG_QTNFMAC_PCIE new file mode 100644 index 000000000..749650c69 --- /dev/null +++ b/configs/fedora/generic/CONFIG_QTNFMAC_PCIE @@ -0,0 +1 @@ +CONFIG_QTNFMAC_PCIE=m diff --git a/configs/fedora/generic/CONFIG_TEST_OBJAGG b/configs/fedora/generic/CONFIG_TEST_OBJAGG new file mode 100644 index 000000000..37ec47bee --- /dev/null +++ b/configs/fedora/generic/CONFIG_TEST_OBJAGG @@ -0,0 +1 @@ +# CONFIG_TEST_OBJAGG is not set diff --git a/configs/fedora/generic/CONFIG_USB_NET_AQC111 b/configs/fedora/generic/CONFIG_USB_NET_AQC111 new file mode 100644 index 000000000..4ca637c26 --- /dev/null +++ b/configs/fedora/generic/CONFIG_USB_NET_AQC111 @@ -0,0 +1 @@ +CONFIG_USB_NET_AQC111=m diff --git a/configs/fedora/generic/CONFIG_VIRT_WIFI b/configs/fedora/generic/CONFIG_VIRT_WIFI new file mode 100644 index 000000000..464019cde --- /dev/null +++ b/configs/fedora/generic/CONFIG_VIRT_WIFI @@ -0,0 +1 @@ +CONFIG_VIRT_WIFI=m diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON b/configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON new file mode 100644 index 000000000..dc4911d62 --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_NHPOLY1305_NEON @@ -0,0 +1 @@ +CONFIG_CRYPTO_NHPOLY1305_NEON=m diff --git a/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2 b/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2 new file mode 100644 index 000000000..93c471386 --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_AVX2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_NHPOLY1305_AVX2=m diff --git a/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2 b/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2 new file mode 100644 index 000000000..6c990a66d --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_CRYPTO_NHPOLY1305_SSE2 @@ -0,0 +1 @@ +CONFIG_CRYPTO_NHPOLY1305_SSE2=m diff --git a/configs/fedora/generic/x86/CONFIG_PVH b/configs/fedora/generic/x86/CONFIG_PVH new file mode 100644 index 000000000..bb0cefd13 --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_PVH @@ -0,0 +1 @@ +CONFIG_PVH=y diff --git a/configs/fedora/generic/x86/CONFIG_RESCTRL b/configs/fedora/generic/x86/CONFIG_RESCTRL new file mode 100644 index 000000000..1822f0b7a --- /dev/null +++ b/configs/fedora/generic/x86/CONFIG_RESCTRL @@ -0,0 +1 @@ +CONFIG_RESCTRL=y @@ -1 +1 @@ -a5f2bd479f58f171a16a9a4f3b4e748ab3057c0f +00c569b567c7f1f0da6162868fd02a9f29411805 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index f49750ea3..62e81e135 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -785,6 +785,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -1055,6 +1056,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -1144,6 +1146,7 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1178,6 +1181,7 @@ CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4_ARM64_CE=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1640,6 +1644,7 @@ CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3663,6 +3668,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4641,6 +4648,7 @@ CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -6120,6 +6128,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6578,6 +6587,7 @@ CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_MV_UDC=m # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6905,6 +6915,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 044206158..f3d8ef1cb 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -785,6 +785,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -1055,6 +1056,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -1144,6 +1146,7 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1178,6 +1181,7 @@ CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4_ARM64_CE=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1631,6 +1635,7 @@ CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3642,6 +3647,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4619,6 +4626,7 @@ CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -6097,6 +6105,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6555,6 +6564,7 @@ CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_MV_UDC=m # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6882,6 +6892,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index b00215e2b..d5740624d 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -1081,6 +1081,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -1180,6 +1181,7 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1210,6 +1212,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1726,6 +1729,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENC28J60=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3861,6 +3865,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4884,6 +4890,7 @@ CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -6510,6 +6517,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -7006,6 +7014,7 @@ CONFIG_USB_MV_UDC=m CONFIG_USB_MXS_PHY=m # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -7372,6 +7381,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 1a33a9468..a93c32bd0 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -1047,6 +1047,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -1126,6 +1127,7 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1156,6 +1158,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1639,6 +1642,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENC28J60=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3687,6 +3691,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4618,6 +4624,7 @@ CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -6118,6 +6125,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6582,6 +6590,7 @@ CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_MV_UDC=m # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6924,6 +6933,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 4a07ce45e..7538a12b5 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -1047,6 +1047,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -1126,6 +1127,7 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1156,6 +1158,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1631,6 +1634,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENC28J60=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3667,6 +3671,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4597,6 +4603,7 @@ CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -6096,6 +6103,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6560,6 +6568,7 @@ CONFIG_USB_MUSB_SUNXI=m CONFIG_USB_MV_UDC=m # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6902,6 +6911,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 7337a5f08..2f6b735a4 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -1081,6 +1081,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -1180,6 +1181,7 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1210,6 +1212,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1718,6 +1721,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENC28J60=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3841,6 +3845,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4863,6 +4869,7 @@ CONFIG_QRTR=m CONFIG_QRTR_SMD=m CONFIG_QRTR_TUN=m CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -6488,6 +6495,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6984,6 +6992,7 @@ CONFIG_USB_MV_UDC=m CONFIG_USB_MXS_PHY=m # CONFIG_USB_NET2272 is not set # CONFIG_USB_NET2280 is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -7350,6 +7359,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 1fda5690c..7308e9a64 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -662,6 +662,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -892,6 +893,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -973,6 +975,8 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_AVX2=m +CONFIG_CRYPTO_NHPOLY1305_SSE2=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -996,6 +1000,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1460,6 +1465,7 @@ CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3487,6 +3493,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4319,6 +4327,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_PVH=y CONFIG_PVPANIC=m CONFIG_PWM_CRC=y # CONFIG_PWM_FSL_FTM is not set @@ -4354,6 +4363,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -4481,6 +4491,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m +CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5705,6 +5716,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6107,6 +6119,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6419,6 +6432,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-i686.config b/kernel-i686.config index ac7b681e0..1c6cdc142 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -661,6 +661,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -891,6 +892,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -972,6 +974,8 @@ CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS640=m +CONFIG_CRYPTO_NHPOLY1305_AVX2=m +CONFIG_CRYPTO_NHPOLY1305_SSE2=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -995,6 +999,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1450,6 +1455,7 @@ CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3467,6 +3473,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4298,6 +4306,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_PVH=y CONFIG_PVPANIC=m CONFIG_PWM_CRC=y # CONFIG_PWM_FSL_FTM is not set @@ -4333,6 +4342,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -4460,6 +4470,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m +CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5683,6 +5694,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6085,6 +6097,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6397,6 +6410,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 80f9a3497..503af2fba 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -832,6 +832,7 @@ CONFIG_CRC_T10DIF=y CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -929,6 +930,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1329,6 +1331,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3242,6 +3245,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4094,6 +4099,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -5386,6 +5392,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -5780,6 +5787,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6085,6 +6093,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 46bdc125a..3c7f3b300 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -831,6 +831,7 @@ CONFIG_CRC_T10DIF=y CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -928,6 +929,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1319,6 +1321,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3220,6 +3223,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4071,6 +4076,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -5362,6 +5368,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -5756,6 +5763,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6061,6 +6069,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index a4a200ec6..da92e639a 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -602,6 +602,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -833,6 +834,7 @@ CONFIG_CRC_T10DIF=y CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -927,6 +929,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1327,6 +1330,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENC28J60 is not set # CONFIG_ENCLOSURE_SERVICES is not set CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3178,6 +3182,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -3986,6 +3992,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -5276,6 +5283,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -5671,6 +5679,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -5975,6 +5984,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 64d76fb9e..756592928 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -601,6 +601,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -832,6 +833,7 @@ CONFIG_CRC_T10DIF=y CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m CONFIG_CRYPTO_AEGIS256=m @@ -926,6 +928,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1317,6 +1320,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENC28J60 is not set # CONFIG_ENCLOSURE_SERVICES is not set CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3156,6 +3160,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -3963,6 +3969,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -5252,6 +5259,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -5647,6 +5655,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -5951,6 +5960,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a741a996d..0f2ae76f0 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -676,6 +676,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -911,6 +912,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m CONFIG_CRYPTO_AEGIS128L=m @@ -1008,6 +1010,8 @@ CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS1280_SSE2=m CONFIG_CRYPTO_MORUS640=m CONFIG_CRYPTO_MORUS640_SSE2=m +CONFIG_CRYPTO_NHPOLY1305_AVX2=m +CONFIG_CRYPTO_NHPOLY1305_SSE2=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1038,6 +1042,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1507,6 +1512,7 @@ CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3526,6 +3532,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4354,6 +4362,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_PVH=y CONFIG_PVPANIC=m CONFIG_PWM_CRC=y # CONFIG_PWM_FSL_FTM is not set @@ -4389,6 +4398,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y CONFIG_QUOTA_DEBUG=y @@ -4518,6 +4528,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m +CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5750,6 +5761,7 @@ CONFIG_TEST_KSTRTOX=y CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6153,6 +6165,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6466,6 +6479,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 686d4dc66..8d8820e27 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -675,6 +675,7 @@ CONFIG_CAN_EMS_PCI=m # CONFIG_CAN_EMS_PCMCIA is not set CONFIG_CAN_EMS_USB=m CONFIG_CAN_ESD_USB2=m +# CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_GRCAN is not set CONFIG_CAN_GS_USB=m CONFIG_CAN_GW=m @@ -910,6 +911,7 @@ CONFIG_CROS_EC_SPI=m CONFIG_CROS_KBD_LED_BACKLIGHT=m CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2=m CONFIG_CRYPTO_AEGIS128L=m @@ -1007,6 +1009,8 @@ CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS1280_SSE2=m CONFIG_CRYPTO_MORUS640=m CONFIG_CRYPTO_MORUS640_SSE2=m +CONFIG_CRYPTO_NHPOLY1305_AVX2=m +CONFIG_CRYPTO_NHPOLY1305_SSE2=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m @@ -1037,6 +1041,7 @@ CONFIG_CRYPTO_SIMD=y CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_STATS=y +CONFIG_CRYPTO_STREEBOG=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TGR192=m @@ -1497,6 +1502,7 @@ CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y +# CONFIG_ENERGY_MODEL is not set CONFIG_ENIC=m CONFIG_ENVELOPE_DETECTOR=m CONFIG_EPIC100=m @@ -3506,6 +3512,8 @@ CONFIG_NET_DSA_BCM_SF2=m # CONFIG_NET_DSA_LEGACY is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y @@ -4333,6 +4341,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK=y # CONFIG_PUNIT_ATOM_DEBUG is not set +CONFIG_PVH=y CONFIG_PVPANIC=m CONFIG_PWM_CRC=y # CONFIG_PWM_FSL_FTM is not set @@ -4368,6 +4377,7 @@ CONFIG_QLGE=m # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set CONFIG_QSEMI_PHY=m +CONFIG_QTNFMAC_PCIE=m CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QUOTACTL=y # CONFIG_QUOTA_DEBUG is not set @@ -4497,6 +4507,7 @@ CONFIG_RELAY=y CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m CONFIG_RENESAS_PHY=m +CONFIG_RESCTRL=y # CONFIG_RESET_ATTACK_MITIGATION is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RETPOLINE=y @@ -5728,6 +5739,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LKM is not set # CONFIG_TEST_MEMCAT_P is not set +# CONFIG_TEST_OBJAGG is not set # CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_PARMAN is not set # CONFIG_TEST_POWER is not set @@ -6131,6 +6143,7 @@ CONFIG_USB_MR800=m # CONFIG_USB_MUSB_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_MUSB_HOST is not set +CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDC_EEM=m @@ -6444,6 +6457,7 @@ CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO=y CONFIG_VIRTUALIZATION=y +CONFIG_VIRT_WIFI=m CONFIG_VITESSE_PHY=m CONFIG_VL53L0X_I2C=m CONFIG_VL6180=m diff --git a/kernel.spec b/kernel.spec index 7e50bad99..5c380af02 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -611,10 +611,6 @@ Patch335: bcm2835-mmc-Several-fixes-for-bcm2835-driver.patch # https://patchwork.kernel.org/patch/10741809/ Patch336: bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch -# Patches enabling device specific brcm firmware nvram -# https://www.spinics.net/lists/linux-wireless/msg178827.html -Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch - # Fix for AllWinner A64 Timer Errata, still not final # https://patchwork.kernel.org/patch/10392891/ Patch350: arm64-arch_timer-Workaround-for-Allwinner-A64-timer-instability.patch @@ -624,9 +620,6 @@ Patch351: arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch # 500 - Temp fixes/CVEs etc -# rhbz 1476467 -Patch501: Fix-for-module-sig-verification.patch - # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch @@ -1910,6 +1903,9 @@ fi # # %changelog +* Fri Dec 28 2018 Laura Abbott <labbott@redhat.com> - 4.21.0-0.rc0.git2.1 +- Linux v4.20-6428-g00c569b567c7 + * Thu Dec 27 2018 Hans de Goede <hdegoede@redhat.com> - Set CONFIG_REALTEK_PHY=y to workaround realtek ethernet issues (rhbz 1650984) @@ -1,2 +1,3 @@ SHA512 (linux-4.20.tar.xz) = e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4 SHA512 (patch-4.20-git1.xz) = c4efb764d46f7a69a93ed0fd5d9cac3ed58f366eb669e7797e538782ff28f1c1e5a6f0beeb81d622bf34a3ee5ee90950d1d3752c8b361967909c0225c6596c91 +SHA512 (patch-4.20-git2.xz) = 69c6d0611bdc931b2c49b7e1ac717da24cf46674f46e06de958becb228f9175ea610b59e9b41d8cc1787d52fbfe80b84257f22e818fc6441dd34f47e4b5d4017 |