Linux v4.15-6064-g255442c93843

63 files changed, 458 insertions, 3123 deletions

diff --git a/0001-Bluetooth-btusb-Add-a-Kconfig-option-to-enable-USB-a.patch b/0001-Bluetooth-btusb-Add-a-Kconfig-option-to-enable-USB-a.patch
deleted file mode 100644
index 1f94c3d70..000000000
--- a/0001-Bluetooth-btusb-Add-a-Kconfig-option-to-enable-USB-a.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 20eeb02a0a489e35de0830b2d61f09d43763c982 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 13 Nov 2017 09:23:19 +0100
-Subject: [PATCH] Bluetooth: btusb: Add a Kconfig option to enable USB
- autosuspend by default
-
-On many laptops the btusb device is the only USB device not having USB
-autosuspend enabled, this causes not only the HCI but also the USB
-controller to stay awake, together using aprox. 0.4W of power.
-
-Modern ultrabooks idle around 6W (at 50% screen brightness), 3.5W for
-Apollo Lake devices. 0.4W is a significant chunk of this (7 / 11%).
-
-The btusb driver already contains code to allow enabling USB autosuspend,
-but currently leaves it up to the user / userspace to enable it. This
-means that for most people it will not be enabled, leading to an
-unnecessarily high power consumption.
-
-Since enabling it is not entirely without risk of regressions, this
-commit adds a Kconfig option so that Linux distributions can choose to
-enable it by default. This commit also adds a module option so that when
-distros receive bugs they can easily ask the user to disable it again
-for easy debugging.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
-Changes in v2:
--s/BT_USB_AUTOSUSPEND/BT_HCIBTUSB_AUTOSUSPEND/
--s/enable_usb_autosuspend/enable_autosuspend/
----
- drivers/bluetooth/Kconfig | 10 ++++++++++
- drivers/bluetooth/btusb.c |  7 +++++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
-index 6475f8c0d3b2..20940417d937 100644
---- a/drivers/bluetooth/Kconfig
-+++ b/drivers/bluetooth/Kconfig
-@@ -30,6 +30,16 @@ config BT_HCIBTUSB
- 	  Say Y here to compile support for Bluetooth USB devices into the
- 	  kernel or say M to compile it as module (btusb).
- 
-+config BT_HCIBTUSB_AUTOSUSPEND
-+	bool "Enable USB autosuspend for Bluetooth USB devices by default"
-+	depends on BT_HCIBTUSB
-+	help
-+	  Say Y here to enable USB autosuspend for Bluetooth USB devices by
-+	  default.
-+
-+	  This can be overridden by passing btusb.enable_autosuspend=[y|n]
-+	  on the kernel commandline.
-+
- config BT_HCIBTUSB_BCM
- 	bool "Broadcom protocol support"
- 	depends on BT_HCIBTUSB
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index c054d7bce490..3386034a44aa 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -40,6 +40,7 @@
- 
- static bool disable_scofix;
- static bool force_scofix;
-+static bool enable_autosuspend = IS_ENABLED(CONFIG_BT_HCIBTUSB_AUTOSUSPEND);
- 
- static bool reset = true;
- 
-@@ -3175,6 +3176,9 @@ static int btusb_probe(struct usb_interface *intf,
- 	}
- #endif
- 
-+	if (enable_autosuspend)
-+		usb_enable_autosuspend(data->udev);
-+
- 	err = hci_register_dev(hdev);
- 	if (err < 0)
- 		goto out_free_dev;
-@@ -3387,6 +3391,9 @@ MODULE_PARM_DESC(disable_scofix, "Disable fixup of wrong SCO buffer size");
- module_param(force_scofix, bool, 0644);
- MODULE_PARM_DESC(force_scofix, "Force fixup of wrong SCO buffers size");
- 
-+module_param(enable_autosuspend, bool, 0644);
-+MODULE_PARM_DESC(enable_autosuspend, "Enable USB autosuspend by default");
-+
- module_param(reset, bool, 0644);
- MODULE_PARM_DESC(reset, "Send HCI reset command on initialization");
- 
--- 
-2.14.3
-
diff --git a/0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch b/0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch
deleted file mode 100644
index cc1af2ceb..000000000
--- a/0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a5ffa27c07e06900fcfc50b08de6d11e45830168 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 3 Jan 2018 12:49:44 +0100
-Subject: [PATCH v2] Bluetooth: btusb: Disable autosuspend on QCA Rome devices
-
-Commit fd865802c66b ("Bluetooth: btusb: fix QCA Rome suspend/resume") fixes
-a suspend/resume problem on QCA devices by doing a full reset on resume,
-reloading the firmware.
-
-A similar problem happens when using runtime-pm / autosuspend, when this is
-enabled by the user the QCA Rome device stops working. Reloading the
-firmware after a runtime suspend is not really an option since the latency
-caused by this is unacceptable.
-
-To fix the runtime-pm issues, this commit disables runtime-pm on QCA Rome
-HCIs, by getting (and not releasing) an usb autopm reference on the btusb
-interface.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/bluetooth/btusb.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 808c249845db..6ed3a0e5b8f6 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -3122,8 +3122,15 @@ static int btusb_probe(struct usb_interface *intf,
- 		/* QCA Rome devices lose their updated firmware over suspend,
- 		 * but the USB hub doesn't notice any status change.
- 		 * Explicitly request a device reset on resume.
-+		 * And disable runtime pm by getting a pm reference, the USB
-+		 * core will drop our reference on disconnect.
- 		 */
- 		set_bit(BTUSB_RESET_RESUME, &data->flags);
-+		err = usb_autopm_get_interface(data->intf);
-+		if (err < 0) {
-+			BT_ERR("failed to get pm reference %d", err);
-+			goto out_free_dev;
-+		}
- 	}
- 
- #ifdef CONFIG_BT_HCIBTUSB_RTL
--- 
-2.14.3
-
diff --git a/0001-HID-multitouch-Properly-deal-with-Win8-PTP-reports-w.patch b/0001-HID-multitouch-Properly-deal-with-Win8-PTP-reports-w.patch
deleted file mode 100644
index e15ec6bb1..000000000
--- a/0001-HID-multitouch-Properly-deal-with-Win8-PTP-reports-w.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From f5c1da991de077420fda17a236342de5a0068f5d Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 22 Nov 2017 12:57:08 +0100
-Subject: [PATCH v2 1/3] HID: multitouch: Properly deal with Win8 PTP reports
- with 0 touches
-
-The Windows Precision Touchpad spec "Figure 4 Button Only Down and Up"
-and "Table 9 Report Sequence for Button Only Down and Up" indicate
-that the first packet of a (possibly hybrid mode multi-packet) frame
-may contain a contact-count of 0 if only a button is pressed and no
-fingers are detected.
-
-This means that a value of 0 for contact-count is a valid value and
-should be used as expected contact count when it is the first packet
-(num_received == 0), as extra check to make sure that this is the first
-packet of a buttons only frame, we also check that the timestamp is
-different.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
- drivers/hid/hid-multitouch.c | 32 ++++++++++++++++++++++++++++++--
- 1 file changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 9ef24b518f12..d8b1cad74faf 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -119,6 +119,9 @@ struct mt_device {
- 	unsigned long mt_io_flags;	/* mt flags (MT_IO_FLAGS_*) */
- 	int cc_index;	/* contact count field index in the report */
- 	int cc_value_index;	/* contact count value index in the field */
-+	int scantime_index;	/* scantime field index in the report */
-+	int scantime_val_index;	/* scantime value index in the field */
-+	int prev_scantime;	/* scantime reported in the previous packet */
- 	unsigned last_slot_field;	/* the last field of a slot */
- 	unsigned mt_report_id;	/* the report ID of the multitouch device */
- 	unsigned long initial_quirks;	/* initial quirks state */
-@@ -599,6 +602,12 @@ static int mt_touch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
- 				EV_MSC, MSC_TIMESTAMP);
- 			input_set_capability(hi->input, EV_MSC, MSC_TIMESTAMP);
- 			mt_store_field(usage, td, hi);
-+			/* Ignore if indexes are out of bounds. */
-+			if (field->index >= field->report->maxfield ||
-+			    usage->usage_index >= field->report_count)
-+				return 1;
-+			td->scantime_index = field->index;
-+			td->scantime_val_index = usage->usage_index;
- 			return 1;
- 		case HID_DG_CONTACTCOUNT:
- 			/* Ignore if indexes are out of bounds. */
-@@ -855,9 +864,10 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
- static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
- {
- 	struct mt_device *td = hid_get_drvdata(hid);
-+	__s32 cls = td->mtclass.name;
- 	struct hid_field *field;
- 	unsigned count;
--	int r, n;
-+	int r, n, scantime = 0;
- 
- 	/* sticky fingers release in progress, abort */
- 	if (test_and_set_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags))
-@@ -867,12 +877,29 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
- 	 * Includes multi-packet support where subsequent
- 	 * packets are sent with zero contactcount.
- 	 */
-+	if (td->scantime_index >= 0) {
-+		field = report->field[td->scantime_index];
-+		scantime = field->value[td->scantime_val_index];
-+	}
- 	if (td->cc_index >= 0) {
- 		struct hid_field *field = report->field[td->cc_index];
- 		int value = field->value[td->cc_value_index];
--		if (value)
-+
-+		/*
-+		 * For Win8 PTPs the first packet (td->num_received == 0) may
-+		 * have a contactcount of 0 if there only is a button event.
-+		 * We double check that this is not a continuation packet
-+		 * of a possible multi-packet frame be checking that the
-+		 * timestamp has changed.
-+		 */
-+		if ((cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL) &&
-+		    td->num_received == 0 && td->prev_scantime != scantime)
-+			td->num_expected = value;
-+		/* A non 0 contact count always indicates a first packet */
-+		else if (value)
- 			td->num_expected = value;
- 	}
-+	td->prev_scantime = scantime;
- 
- 	for (r = 0; r < report->maxfield; r++) {
- 		field = report->field[r];
-@@ -1329,6 +1356,7 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)
- 	td->maxcontact_report_id = -1;
- 	td->inputmode_value = MT_INPUTMODE_TOUCHSCREEN;
- 	td->cc_index = -1;
-+	td->scantime_index = -1;
- 	td->mt_report_id = -1;
- 	hid_set_drvdata(hdev, td);
- 
--- 
-2.14.3
-
diff --git a/0002-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch b/0002-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch
deleted file mode 100644
index 3ea374ff5..000000000
--- a/0002-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From c25d877f4ee97deb92170129eee4777a5d5997d9 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 22 Nov 2017 12:57:09 +0100
-Subject: [PATCH v2 2/3] HID: multitouch: Only look at non touch fields in
- first packet of a frame
-
-Devices in "single finger hybrid mode" will send one report per finger,
-on some devices only the first report of such a multi-packet frame will
-contain a value for BTN_LEFT, in subsequent reports (if multiple fingers
-are down) the value is always 0, causing hid-mt to report BTN_LEFT going
-1 - 0 - 1 - 0 when pressing a clickpad and putting down a second finger.
-This happens for example on USB 0603:0002 mt touchpads.
-
-This commit fixes this by only reporting non touch fields for the first
-packet of a (possibly) multi-packet frame.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
- drivers/hid/hid-multitouch.c | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index d8b1cad74faf..760c4a042e6a 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -787,9 +787,11 @@ static int mt_touch_event(struct hid_device *hid, struct hid_field *field,
- }
- 
- static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
--				struct hid_usage *usage, __s32 value)
-+				struct hid_usage *usage, __s32 value,
-+				bool first_packet)
- {
- 	struct mt_device *td = hid_get_drvdata(hid);
-+	__s32 cls = td->mtclass.name;
- 	__s32 quirks = td->mtclass.quirks;
- 	struct input_dev *input = field->hidinput->input;
- 
-@@ -846,6 +848,15 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
- 			break;
- 
- 		default:
-+			/*
-+			 * For Win8 PTP touchpads we should only look at
-+			 * non finger/touch events in the first_packet of
-+			 * a (possible) multi-packet frame.
-+			 */
-+			if ((cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL) &&
-+			    !first_packet)
-+				return;
-+
- 			if (usage->type)
- 				input_event(input, usage->type, usage->code,
- 						value);
-@@ -866,6 +877,7 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
- 	struct mt_device *td = hid_get_drvdata(hid);
- 	__s32 cls = td->mtclass.name;
- 	struct hid_field *field;
-+	bool first_packet;
- 	unsigned count;
- 	int r, n, scantime = 0;
- 
-@@ -901,6 +913,7 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
- 	}
- 	td->prev_scantime = scantime;
- 
-+	first_packet = td->num_received == 0;
- 	for (r = 0; r < report->maxfield; r++) {
- 		field = report->field[r];
- 		count = field->report_count;
-@@ -910,7 +923,7 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
- 
- 		for (n = 0; n < count; n++)
- 			mt_process_mt_event(hid, field, &field->usage[n],
--					field->value[n]);
-+					    field->value[n], first_packet);
- 	}
- 
- 	if (td->num_received >= td->num_expected)
--- 
-2.14.3
-
diff --git a/0003-HID-multitouch-Combine-all-left-button-events-in-a-f.patch b/0003-HID-multitouch-Combine-all-left-button-events-in-a-f.patch
deleted file mode 100644
index 7fda714cb..000000000
--- a/0003-HID-multitouch-Combine-all-left-button-events-in-a-f.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1719566899e5a69b4ba767beb07dab7ceb9ae5a8 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 22 Nov 2017 12:57:10 +0100
-Subject: [PATCH v2 3/3] HID: multitouch: Combine all left-button events in a
- frame
-
-According to the Win8 Precision Touchpad spec, inside the HID_UP_BUTTON
-usage-page usage 1 is for a clickpad getting clicked, 2 for an external
-left button and 3 for an external right button. Since Linux uses
-BTN_LEFT for a clickpad being clicked we end up mapping both usage 1
-and 2 to BTN_LEFT and if a single report contains both then we ended
-up always reporting the value of both in a single SYN, e.g. :
-BTN_LEFT 1, BTN_LEFT 0, SYN. This happens for example with Hantick
-HTT5288 i2c mt touchpads.
-
-This commit fixes this by not immediately reporting left button when we
-parse the report, but instead storing or-ing together the values and
-reporting the result from mt_sync_frame() when we've a complete frame.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
- drivers/hid/hid-multitouch.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 760c4a042e6a..76088f2cf598 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -122,6 +122,7 @@ struct mt_device {
- 	int scantime_index;	/* scantime field index in the report */
- 	int scantime_val_index;	/* scantime value index in the field */
- 	int prev_scantime;	/* scantime reported in the previous packet */
-+	int left_button_state;	/* left button state */
- 	unsigned last_slot_field;	/* the last field of a slot */
- 	unsigned mt_report_id;	/* the report ID of the multitouch device */
- 	unsigned long initial_quirks;	/* initial quirks state */
-@@ -743,10 +744,16 @@ static void mt_complete_slot(struct mt_device *td, struct input_dev *input)
-  */
- static void mt_sync_frame(struct mt_device *td, struct input_dev *input)
- {
-+	__s32 cls = td->mtclass.name;
-+
-+	if (cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL)
-+		input_event(input, EV_KEY, BTN_LEFT, td->left_button_state);
-+
- 	input_mt_sync_frame(input);
- 	input_event(input, EV_MSC, MSC_TIMESTAMP, td->timestamp);
- 	input_sync(input);
- 	td->num_received = 0;
-+	td->left_button_state = 0;
- 	if (test_bit(MT_IO_FLAGS_ACTIVE_SLOTS, &td->mt_io_flags))
- 		set_bit(MT_IO_FLAGS_PENDING_SLOTS, &td->mt_io_flags);
- 	else
-@@ -857,6 +864,19 @@ static void mt_process_mt_event(struct hid_device *hid, struct hid_field *field,
- 			    !first_packet)
- 				return;
- 
-+			/*
-+			 * For Win8 PTP touchpads we map both the clickpad click
-+			 * and any "external" left buttons to BTN_LEFT if a
-+			 * device claims to have both we need to report 1 for
-+			 * BTN_LEFT if either is pressed, so we or all values
-+			 * together and report the result in mt_sync_frame().
-+			 */
-+			if ((cls == MT_CLS_WIN_8 || cls == MT_CLS_WIN_8_DUAL) &&
-+			    usage->type == EV_KEY && usage->code == BTN_LEFT) {
-+				td->left_button_state |= value;
-+				return;
-+			}
-+
- 			if (usage->type)
- 				input_event(input, usage->type, usage->code,
- 						value);
--- 
-2.14.3
-
diff --git a/arm64-socionext-96b-enablement.patch b/arm64-socionext-96b-enablement.patch
deleted file mode 100644
index d5d6cda86..000000000
--- a/arm64-socionext-96b-enablement.patch
+++ /dev/null
@@ -1,2679 +0,0 @@
-From e3dff048a10f16aa0fd32438442ce39558bbdbef Mon Sep 17 00:00:00 2001
-From: Jassi Brar <jaswinder.singh@linaro.org>
-Date: Tue, 29 Aug 2017 22:45:59 +0530
-Subject: net: socionext: Add Synquacer NetSec driver
-
-This driver adds support for Socionext "netsec" IP Gigabit
-Ethernet + PHY IP used in the Synquacer SC2A11 SoC.
-
-Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
-Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
----
- drivers/net/ethernet/Kconfig                       |   1 +
- drivers/net/ethernet/Makefile                      |   1 +
- drivers/net/ethernet/socionext/Kconfig             |  29 +
- drivers/net/ethernet/socionext/Makefile            |   1 +
- drivers/net/ethernet/socionext/netsec/Makefile     |   6 +
- drivers/net/ethernet/socionext/netsec/netsec.h     | 408 ++++++++++++++
- .../socionext/netsec/netsec_desc_ring_access.c     | 623 +++++++++++++++++++++
- .../net/ethernet/socionext/netsec/netsec_ethtool.c |  78 +++
- .../ethernet/socionext/netsec/netsec_gmac_access.c | 330 +++++++++++
- .../net/ethernet/socionext/netsec/netsec_netdev.c  | 540 ++++++++++++++++++
- .../ethernet/socionext/netsec/netsec_platform.c    | 435 ++++++++++++++
- 11 files changed, 2452 insertions(+)
- create mode 100644 drivers/net/ethernet/socionext/Kconfig
- create mode 100644 drivers/net/ethernet/socionext/Makefile
- create mode 100644 drivers/net/ethernet/socionext/netsec/Makefile
- create mode 100644 drivers/net/ethernet/socionext/netsec/netsec.h
- create mode 100644 drivers/net/ethernet/socionext/netsec/netsec_desc_ring_access.c
- create mode 100644 drivers/net/ethernet/socionext/netsec/netsec_ethtool.c
- create mode 100644 drivers/net/ethernet/socionext/netsec/netsec_gmac_access.c
- create mode 100644 drivers/net/ethernet/socionext/netsec/netsec_netdev.c
- create mode 100644 drivers/net/ethernet/socionext/netsec/netsec_platform.c
-
-diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
-index c604213..d50519e 100644
---- a/drivers/net/ethernet/Kconfig
-+++ b/drivers/net/ethernet/Kconfig
-@@ -170,6 +170,7 @@ source "drivers/net/ethernet/sis/Kconfig"
- source "drivers/net/ethernet/sfc/Kconfig"
- source "drivers/net/ethernet/sgi/Kconfig"
- source "drivers/net/ethernet/smsc/Kconfig"
-+source "drivers/net/ethernet/socionext/Kconfig"
- source "drivers/net/ethernet/stmicro/Kconfig"
- source "drivers/net/ethernet/sun/Kconfig"
- source "drivers/net/ethernet/tehuti/Kconfig"
-diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
-index a0a03d4..6ae1bb9 100644
---- a/drivers/net/ethernet/Makefile
-+++ b/drivers/net/ethernet/Makefile
-@@ -81,6 +81,7 @@ obj-$(CONFIG_SFC) += sfc/
- obj-$(CONFIG_SFC_FALCON) += sfc/falcon/
- obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
- obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
-+obj-$(CONFIG_NET_VENDOR_SNI) += socionext/
- obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
- obj-$(CONFIG_NET_VENDOR_SUN) += sun/
- obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
-diff --git a/drivers/net/ethernet/socionext/Kconfig b/drivers/net/ethernet/socionext/Kconfig
-new file mode 100644
-index 0000000..a6dc195
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/Kconfig
-@@ -0,0 +1,29 @@
-+#
-+# Socionext Network device configuration
-+#
-+
-+config NET_VENDOR_SNI
-+	bool "Socionext devices"
-+	default y
-+	---help---
-+	  If you have a network (Ethernet) card belonging to this class, say Y.
-+
-+	  Note that the answer to this question doesn't directly affect the
-+	  the questions about Socionext cards. If you say Y, you will be asked
-+	  for your specific card in the following questions.
-+
-+if NET_VENDOR_SNI
-+
-+config SNI_NETSEC
-+	tristate "NETSEC Driver Support"
-+	depends on OF
-+	select PHYLIB
-+	select MII
-+help
-+	  Enable to add support for the SocioNext NetSec Gigabit Ethernet
-+	  controller + PHY, as found on the Synquacer SC2A11 SoC
-+
-+	  To compile this driver as a module, choose M here: the module will be
-+	  called netsec.  If unsure, say N.
-+
-+endif # NET_VENDOR_SNI
-diff --git a/drivers/net/ethernet/socionext/Makefile b/drivers/net/ethernet/socionext/Makefile
-new file mode 100644
-index 0000000..9555899
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_SNI_NETSEC) += netsec/
-diff --git a/drivers/net/ethernet/socionext/netsec/Makefile b/drivers/net/ethernet/socionext/netsec/Makefile
-new file mode 100644
-index 0000000..18884ed
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/Makefile
-@@ -0,0 +1,6 @@
-+obj-$(CONFIG_SNI_NETSEC) := netsec.o
-+netsec-objs := netsec_desc_ring_access.o \
-+		netsec_netdev.o \
-+		netsec_ethtool.o \
-+		netsec_platform.o \
-+		netsec_gmac_access.o
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec.h b/drivers/net/ethernet/socionext/netsec/netsec.h
-new file mode 100644
-index 0000000..3b97661
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/netsec.h
-@@ -0,0 +1,408 @@
-+/**
-+ * netsec.h
-+ *
-+ *  Copyright (C) 2013-2014 Fujitsu Semiconductor Limited.
-+ *  Copyright (C) 2014-2017 Linaro Ltd. All rights reserved.
-+ *     Andy Green <andy.green@linaro.org>
-+ *     Jassi Brar <jaswinder.singh@linaro.org>
-+ *     Ard Biesheuvel <ard.biesheuvel@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public License
-+ *  as published by the Free Software Foundation; either version 2
-+ *  of the License, or (at your option) any later version.
-+ */
-+#ifndef NETSEC_INTERNAL_H
-+#define NETSEC_INTERNAL_H
-+
-+#include <linux/netdevice.h>
-+#include <linux/types.h>
-+#include <linux/device.h>
-+#include <linux/phy.h>
-+#include <linux/ethtool.h>
-+#include <linux/of_address.h>
-+#include <linux/of_mdio.h>
-+#include <linux/etherdevice.h>
-+#include <net/sock.h>
-+
-+#define NETSEC_FLOW_CONTROL_START_THRESHOLD	36
-+#define NETSEC_FLOW_CONTROL_STOP_THRESHOLD	48
-+
-+#define NETSEC_CLK_MHZ				1000000
-+
-+#define NETSEC_RX_PKT_BUF_LEN			1522
-+#define NETSEC_RX_JUMBO_PKT_BUF_LEN		9022
-+
-+#define NETSEC_NETDEV_TX_PKT_SCAT_NUM_MAX	19
-+
-+#define DESC_NUM				128
-+
-+#define NETSEC_TX_SHIFT_OWN_FIELD		31
-+#define NETSEC_TX_SHIFT_LD_FIELD		30
-+#define NETSEC_TX_SHIFT_DRID_FIELD		24
-+#define NETSEC_TX_SHIFT_PT_FIELD		21
-+#define NETSEC_TX_SHIFT_TDRID_FIELD		16
-+#define NETSEC_TX_SHIFT_CC_FIELD		15
-+#define NETSEC_TX_SHIFT_FS_FIELD		9
-+#define NETSEC_TX_LAST				8
-+#define NETSEC_TX_SHIFT_CO			7
-+#define NETSEC_TX_SHIFT_SO			6
-+#define NETSEC_TX_SHIFT_TRS_FIELD		4
-+
-+#define NETSEC_RX_PKT_OWN_FIELD			31
-+#define NETSEC_RX_PKT_LD_FIELD			30
-+#define NETSEC_RX_PKT_SDRID_FIELD		24
-+#define NETSEC_RX_PKT_FR_FIELD			23
-+#define NETSEC_RX_PKT_ER_FIELD			21
-+#define NETSEC_RX_PKT_ERR_FIELD			16
-+#define NETSEC_RX_PKT_TDRID_FIELD		12
-+#define NETSEC_RX_PKT_FS_FIELD			9
-+#define NETSEC_RX_PKT_LS_FIELD			8
-+#define NETSEC_RX_PKT_CO_FIELD			6
-+
-+#define NETSEC_RX_PKT_ERR_MASK			3
-+
-+#define NETSEC_MAX_TX_PKT_LEN			1518
-+#define NETSEC_MAX_TX_JUMBO_PKT_LEN		9018
-+
-+enum netsec_rings {
-+	NETSEC_RING_TX,
-+	NETSEC_RING_RX
-+};
-+
-+#define NETSEC_RING_GMAC			15
-+#define NETSEC_RING_MAX				1
-+
-+#define NETSEC_TCP_SEG_LEN_MAX			1460
-+#define NETSEC_TCP_JUMBO_SEG_LEN_MAX		8960
-+
-+#define NETSEC_RX_CKSUM_NOTAVAIL		0
-+#define NETSEC_RX_CKSUM_OK			1
-+#define NETSEC_RX_CKSUM_NG			2
-+
-+#define NETSEC_TOP_IRQ_REG_CODE_LOAD_END	BIT(20)
-+#define NETSEC_IRQ_TRANSITION_COMPLETE		BIT(4)
-+#define NETSEC_IRQ_RX				BIT(1)
-+#define NETSEC_IRQ_TX				BIT(0)
-+
-+#define NETSEC_IRQ_EMPTY			BIT(17)
-+#define NETSEC_IRQ_ERR				BIT(16)
-+#define NETSEC_IRQ_PKT_CNT			BIT(15)
-+#define NETSEC_IRQ_TIMEUP			BIT(14)
-+#define NETSEC_IRQ_RCV				(NETSEC_IRQ_PKT_CNT | \
-+						 NETSEC_IRQ_TIMEUP)
-+
-+#define NETSEC_IRQ_TX_DONE			BIT(15)
-+#define NETSEC_IRQ_SND				(NETSEC_IRQ_TX_DONE | \
-+						 NETSEC_IRQ_TIMEUP)
-+
-+#define NETSEC_MODE_TRANS_COMP_IRQ_N2T		BIT(20)
-+#define NETSEC_MODE_TRANS_COMP_IRQ_T2N		BIT(19)
-+
-+#define NETSEC_DESC_MIN				2
-+#define NETSEC_DESC_MAX				2047
-+#define NETSEC_INT_PKTCNT_MAX			2047
-+
-+#define NETSEC_FLOW_START_TH_MAX		95
-+#define NETSEC_FLOW_STOP_TH_MAX			95
-+#define NETSEC_FLOW_PAUSE_TIME_MIN		5
-+
-+#define NETSEC_CLK_EN_REG_DOM_ALL		0x3f
-+
-+#define NETSEC_REG_TOP_STATUS			0x80
-+#define NETSEC_REG_TOP_INTEN			0x81
-+#define NETSEC_REG_INTEN_SET			0x8d
-+#define NETSEC_REG_INTEN_CLR			0x8e
-+#define NETSEC_REG_NRM_TX_STATUS		0x100
-+#define NETSEC_REG_NRM_TX_INTEN			0x101
-+#define NETSEC_REG_NRM_TX_INTEN_SET		0x10a
-+#define NETSEC_REG_NRM_TX_INTEN_CLR		0x10b
-+#define NETSEC_REG_NRM_RX_STATUS		0x110
-+#define NETSEC_REG_NRM_RX_INTEN			0x111
-+#define NETSEC_REG_NRM_RX_INTEN_SET		0x11a
-+#define NETSEC_REG_NRM_RX_INTEN_CLR		0x11b
-+#define NETSEC_REG_RESERVED_RX_DESC_START	0x122
-+#define NETSEC_REG_RESERVED_TX_DESC_START	0x132
-+#define NETSEC_REG_CLK_EN			0x40
-+#define NETSEC_REG_SOFT_RST			0x41
-+#define NETSEC_REG_PKT_CMD_BUF			0x34
-+#define NETSEC_REG_PKT_CTRL			0x50
-+#define NETSEC_REG_COM_INIT			0x48
-+#define NETSEC_REG_DMA_TMR_CTRL			0x83
-+#define NETSEC_REG_F_TAIKI_MC_VER		0x8b
-+#define NETSEC_REG_F_TAIKI_VER			0x8c
-+#define NETSEC_REG_DMA_HM_CTRL			0x85
-+#define NETSEC_REG_DMA_MH_CTRL			0x88
-+#define NETSEC_REG_ADDR_DIS_CORE		0x86
-+#define NETSEC_REG_DMAC_HM_CMD_BUF		0x84
-+#define NETSEC_REG_DMAC_MH_CMD_BUF		0x87
-+#define NETSEC_REG_NRM_TX_PKTCNT		0x104
-+#define NETSEC_REG_NRM_TX_DONE_TXINT_PKTCNT	0x106
-+#define NETSEC_REG_NRM_RX_RXINT_PKTCNT		0x116
-+#define NETSEC_REG_NRM_TX_TXINT_TMR		0x108
-+#define NETSEC_REG_NRM_RX_RXINT_TMR		0x118
-+#define NETSEC_REG_NRM_TX_DONE_PKTCNT		0x105
-+#define NETSEC_REG_NRM_RX_PKTCNT		0x115
-+#define NETSEC_REG_NRM_TX_TMR			0x107
-+#define NETSEC_REG_NRM_RX_TMR			0x117
-+#define NETSEC_REG_NRM_TX_DESC_START_UP		0x10d
-+#define NETSEC_REG_NRM_TX_DESC_START_LW		0x102
-+#define NETSEC_REG_NRM_RX_DESC_START_UP		0x11d
-+#define NETSEC_REG_NRM_RX_DESC_START_LW		0x112
-+#define NETSEC_REG_NRM_TX_CONFIG		0x10c
-+#define NETSEC_REG_NRM_RX_CONFIG		0x11c
-+#define MAC_REG_DATA				0x470
-+#define MAC_REG_CMD				0x471
-+#define MAC_REG_FLOW_TH				0x473
-+#define MAC_REG_INTF_SEL			0x475
-+#define MAC_REG_DESC_INIT			0x47f
-+#define MAC_REG_DESC_SOFT_RST			0x481
-+#define NETSEC_REG_MODE_TRANS_COMP_STATUS	0x140
-+#define GMAC_REG_MCR				0x0000
-+#define GMAC_REG_MFFR				0x0004
-+#define GMAC_REG_GAR				0x0010
-+#define GMAC_REG_GDR				0x0014
-+#define GMAC_REG_FCR				0x0018
-+#define GMAC_REG_BMR				0x1000
-+#define GMAC_REG_RDLAR				0x100c
-+#define GMAC_REG_TDLAR				0x1010
-+#define GMAC_REG_OMR				0x1018
-+
-+#define NETSEC_PKT_CTRL_REG_MODE_NRM		BIT(28)
-+#define NETSEC_PKT_CTRL_REG_EN_JUMBO		BIT(27)
-+#define NETSEC_PKT_CTRL_REG_LOG_CHKSUM_ER	BIT(3)
-+#define NETSEC_PKT_CTRL_REG_LOG_HD_INCOMPLETE	BIT(2)
-+#define NETSEC_PKT_CTRL_REG_LOG_HD_ER		BIT(1)
-+#define NETSEC_PKT_CTRL_REG_DRP_NO_MATCH	BIT(0)
-+
-+#define NETSEC_CLK_EN_REG_DOM_G			BIT(5)
-+#define NETSEC_CLK_EN_REG_DOM_C			BIT(1)
-+#define NETSEC_CLK_EN_REG_DOM_D			BIT(0)
-+
-+#define NETSEC_COM_INIT_REG_DB			BIT(2)
-+#define NETSEC_COM_INIT_REG_CLS			BIT(1)
-+#define NETSEC_COM_INIT_REG_ALL			(NETSEC_COM_INIT_REG_CLS | \
-+						 NETSEC_COM_INIT_REG_DB)
-+
-+#define NETSEC_SOFT_RST_REG_RESET		0
-+#define NETSEC_SOFT_RST_REG_RUN			BIT(31)
-+
-+#define NETSEC_DMA_CTRL_REG_STOP		1
-+#define MH_CTRL__MODE_TRANS			BIT(20)
-+
-+#define NETSEC_GMAC_CMD_ST_READ			0
-+#define NETSEC_GMAC_CMD_ST_WRITE		BIT(28)
-+#define NETSEC_GMAC_CMD_ST_BUSY			BIT(31)
-+
-+#define NETSEC_GMAC_BMR_REG_COMMON		0x00412080
-+#define NETSEC_GMAC_BMR_REG_RESET		0x00020181
-+#define NETSEC_GMAC_BMR_REG_SWR			0x00000001
-+
-+#define NETSEC_GMAC_OMR_REG_ST			BIT(13)
-+#define NETSEC_GMAC_OMR_REG_SR			BIT(1)
-+
-+#define NETSEC_GMAC_MCR_REG_IBN			BIT(30)
-+#define NETSEC_GMAC_MCR_REG_CST			BIT(25)
-+#define NETSEC_GMAC_MCR_REG_JE			BIT(20)
-+#define NETSEC_MCR_PS				BIT(15)
-+#define NETSEC_GMAC_MCR_REG_FES			BIT(14)
-+#define NETSEC_GMAC_MCR_REG_FULL_DUPLEX_COMMON	0x0000280c
-+#define NETSEC_GMAC_MCR_REG_HALF_DUPLEX_COMMON	0x0001a00c
-+
-+#define NETSEC_FCR_RFE				BIT(2)
-+#define NETSEC_FCR_TFE				BIT(1)
-+
-+#define NETSEC_GMAC_GAR_REG_GW			BIT(1)
-+#define NETSEC_GMAC_GAR_REG_GB			BIT(0)
-+
-+#define NETSEC_GMAC_GAR_REG_SHIFT_PA		11
-+#define NETSEC_GMAC_GAR_REG_SHIFT_GR		6
-+#define GMAC_REG_SHIFT_CR_GAR			2
-+
-+#define NETSEC_GMAC_GAR_REG_CR_25_35_MHZ	2
-+#define NETSEC_GMAC_GAR_REG_CR_35_60_MHZ	3
-+#define NETSEC_GMAC_GAR_REG_CR_60_100_MHZ	0
-+#define NETSEC_GMAC_GAR_REG_CR_100_150_MHZ	1
-+#define NETSEC_GMAC_GAR_REG_CR_150_250_MHZ	4
-+#define NETSEC_GMAC_GAR_REG_CR_250_300_MHZ	5
-+
-+#define NETSEC_GMAC_RDLAR_REG_COMMON		0x18000
-+#define NETSEC_GMAC_TDLAR_REG_COMMON		0x1c000
-+
-+#define NETSEC_REG_NETSEC_VER_F_TAIKI		0x50000
-+
-+#define NETSEC_REG_DESC_RING_CONFIG_CFG_UP	BIT(31)
-+#define NETSEC_REG_DESC_RING_CONFIG_CH_RST	BIT(30)
-+#define NETSEC_REG_DESC_TMR_MODE		4
-+#define NETSEC_REG_DESC_ENDIAN			0
-+
-+#define NETSEC_MAC_DESC_SOFT_RST_SOFT_RST	1
-+#define NETSEC_MAC_DESC_INIT_REG_INIT		1
-+
-+#define NETSEC_EEPROM_MAC_ADDRESS		0x00
-+#define NETSEC_EEPROM_HM_ME_ADDRESS_H		0x08
-+#define NETSEC_EEPROM_HM_ME_ADDRESS_L		0x0C
-+#define NETSEC_EEPROM_HM_ME_SIZE		0x10
-+#define NETSEC_EEPROM_MH_ME_ADDRESS_H		0x14
-+#define NETSEC_EEPROM_MH_ME_ADDRESS_L		0x18
-+#define NETSEC_EEPROM_MH_ME_SIZE		0x1C
-+#define NETSEC_EEPROM_PKT_ME_ADDRESS		0x20
-+#define NETSEC_EEPROM_PKT_ME_SIZE		0x24
-+
-+/* this is used to interpret a register layout */
-+struct netsec_pkt_ctrlaram {
-+	u8 log_chksum_er_flag:1;
-+	u8 log_hd_imcomplete_flag:1;
-+	u8 log_hd_er_flag:1;
-+};
-+
-+struct netsec_param {
-+	struct netsec_pkt_ctrlaram pkt_ctrlaram;
-+	bool use_jumbo_pkt_flag;
-+};
-+
-+struct netsec_mac_mode {
-+	u16 flow_start_th;
-+	u16 flow_stop_th;
-+	u16 pause_time;
-+	bool flow_ctrl_enable_flag;
-+};
-+
-+struct netsec_desc_ring {
-+	spinlock_t spinlock_desc; /* protect descriptor access */
-+	phys_addr_t desc_phys;
-+	struct netsec_frag_info *frag;
-+	struct sk_buff **priv;
-+	void *ring_vaddr;
-+	enum netsec_rings id;
-+	int len;
-+	u16 tx_done_num;
-+	u16 rx_num;
-+	u16 head;
-+	u16 tail;
-+	bool running;
-+	bool full;
-+};
-+
-+struct netsec_frag_info {
-+	dma_addr_t dma_addr;
-+	void *addr;
-+	u16 len;
-+};
-+
-+struct netsec_priv {
-+	struct netsec_desc_ring desc_ring[NETSEC_RING_MAX + 1];
-+	struct ethtool_coalesce et_coalesce;
-+	struct netsec_mac_mode mac_mode;
-+	struct netsec_param param;
-+	struct napi_struct napi;
-+	phy_interface_t phy_interface;
-+	spinlock_t tx_queue_lock; /* protect transmit queue */
-+	struct netsec_frag_info tx_info[MAX_SKB_FRAGS];
-+	struct net_device *ndev;
-+	struct device_node *phy_np;
-+	struct phy_device *phydev;
-+	struct mii_bus *mii_bus;
-+	void __iomem *ioaddr;
-+	const void *eeprom_base;
-+	struct device *dev;
-+	struct clk *clk[3];
-+	u32 rx_pkt_buf_len;
-+	u32 msg_enable;
-+	u32 freq;
-+	int actual_link_speed;
-+	int clock_count;
-+	bool rx_cksum_offload_flag;
-+	bool actual_duplex;
-+	bool irq_registered;
-+};
-+
-+struct netsec_tx_de {
-+	u32 attr;
-+	u32 data_buf_addr_up;
-+	u32 data_buf_addr_lw;
-+	u32 buf_len_info;
-+};
-+
-+struct netsec_rx_de {
-+	u32 attr;
-+	u32 data_buf_addr_up;
-+	u32 data_buf_addr_lw;
-+	u32 buf_len_info;
-+};
-+
-+struct netsec_tx_pkt_ctrl {
-+	u16 tcp_seg_len;
-+	bool tcp_seg_offload_flag;
-+	bool cksum_offload_flag;
-+};
-+
-+struct netsec_rx_pkt_info {
-+	int rx_cksum_result;
-+	int err_code;
-+	bool is_fragmented;
-+	bool err_flag;
-+};
-+
-+struct netsec_skb_cb {
-+	bool is_rx;
-+};
-+
-+static inline void netsec_writel(struct netsec_priv *priv,
-+				 u32 reg_addr, u32 val)
-+{
-+	writel_relaxed(val, priv->ioaddr + (reg_addr << 2));
-+}
-+
-+static inline u32 netsec_readl(struct netsec_priv *priv, u32 reg_addr)
-+{
-+	return readl_relaxed(priv->ioaddr + (reg_addr << 2));
-+}
-+
-+static inline void netsec_mark_skb_type(struct sk_buff *skb, bool is_rx)
-+{
-+	struct netsec_skb_cb *cb = (struct netsec_skb_cb *)skb->cb;
-+
-+	cb->is_rx = is_rx;
-+}
-+
-+static inline bool skb_is_rx(struct sk_buff *skb)
-+{
-+	struct netsec_skb_cb *cb = (struct netsec_skb_cb *)skb->cb;
-+
-+	return cb->is_rx;
-+}
-+
-+extern const struct net_device_ops netsec_netdev_ops;
-+extern const struct ethtool_ops netsec_ethtool_ops;
-+
-+int netsec_start_gmac(struct netsec_priv *priv);
-+int netsec_stop_gmac(struct netsec_priv *priv);
-+int netsec_mii_register(struct netsec_priv *priv);
-+void netsec_mii_unregister(struct netsec_priv *priv);
-+int netsec_start_desc_ring(struct netsec_priv *priv, enum netsec_rings id);
-+void netsec_stop_desc_ring(struct netsec_priv *priv, enum netsec_rings id);
-+u16 netsec_get_rx_num(struct netsec_priv *priv);
-+u16 netsec_get_tx_avail_num(struct netsec_priv *priv);
-+int netsec_clean_tx_desc_ring(struct netsec_priv *priv);
-+int netsec_clean_rx_desc_ring(struct netsec_priv *priv);
-+int netsec_set_tx_pkt_data(struct netsec_priv *priv,
-+			   const struct netsec_tx_pkt_ctrl *tx_ctrl,
-+			   u8 count_frags, const struct netsec_frag_info *info,
-+			   struct sk_buff *skb);
-+int netsec_get_rx_pkt_data(struct netsec_priv *priv,
-+			   struct netsec_rx_pkt_info *rxpi,
-+			   struct netsec_frag_info *frag, u16 *len,
-+			   struct sk_buff **skb);
-+void netsec_ring_irq_enable(struct netsec_priv *priv,
-+			    enum netsec_rings id, u32 i);
-+void netsec_ring_irq_disable(struct netsec_priv *priv,
-+			     enum netsec_rings id, u32 i);
-+int netsec_alloc_desc_ring(struct netsec_priv *priv, enum netsec_rings id);
-+void netsec_free_desc_ring(struct netsec_priv *priv,
-+			   struct netsec_desc_ring *desc);
-+int netsec_setup_rx_desc(struct netsec_priv *priv,
-+			 struct netsec_desc_ring *desc);
-+int netsec_netdev_napi_poll(struct napi_struct *napi_p, int budget);
-+
-+#endif /* NETSEC_INTERNAL_H */
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec_desc_ring_access.c b/drivers/net/ethernet/socionext/netsec/netsec_desc_ring_access.c
-new file mode 100644
-index 0000000..a4e56cd
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/netsec_desc_ring_access.c
-@@ -0,0 +1,623 @@
-+/**
-+ * drivers/net/ethernet/socionext/netsec/netsec_desc_ring_access.c
-+ *
-+ *  Copyright (C) 2013-2014 Fujitsu Semiconductor Limited.
-+ *  Copyright (C) 2014-2017 Linaro Ltd. All rights reserved.
-+ *     Andy Green <andy.green@linaro.org>
-+ *     Jassi Brar <jaswinder.singh@linaro.org>
-+ *     Ard Biesheuvel <ard.biesheuvel@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public License
-+ *  as published by the Free Software Foundation; either version 2
-+ *  of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/spinlock.h>
-+#include <linux/dma-mapping.h>
-+
-+#include "netsec.h"
-+
-+static const u32 ads_irq_set[] = {
-+	NETSEC_REG_NRM_TX_INTEN_SET,
-+	NETSEC_REG_NRM_RX_INTEN_SET,
-+};
-+
-+static const u32 desc_ring_irq_inten_clr_reg_addr[] = {
-+	NETSEC_REG_NRM_TX_INTEN_CLR,
-+	NETSEC_REG_NRM_RX_INTEN_CLR,
-+};
-+
-+static const u32 int_tmr_reg_addr[] = {
-+	NETSEC_REG_NRM_TX_TXINT_TMR,
-+	NETSEC_REG_NRM_RX_RXINT_TMR,
-+};
-+
-+static const u32 rx_pkt_cnt_reg_addr[] = {
-+	0,
-+	NETSEC_REG_NRM_RX_PKTCNT,
-+};
-+
-+static const u32 tx_pkt_cnt_reg_addr[] = {
-+	NETSEC_REG_NRM_TX_PKTCNT,
-+	0,
-+};
-+
-+static const u32 int_pkt_cnt_reg_addr[] = {
-+	NETSEC_REG_NRM_TX_DONE_TXINT_PKTCNT,
-+	NETSEC_REG_NRM_RX_RXINT_PKTCNT,
-+};
-+
-+static const u32 tx_done_pkt_addr[] = {
-+	NETSEC_REG_NRM_TX_DONE_PKTCNT,
-+	0,
-+};
-+
-+static const u32 netsec_desc_mask[] = {
-+	[NETSEC_RING_TX] = NETSEC_GMAC_OMR_REG_ST,
-+	[NETSEC_RING_RX] = NETSEC_GMAC_OMR_REG_SR
-+};
-+
-+void netsec_ring_irq_enable(struct netsec_priv *priv,
-+			    enum netsec_rings id, u32 irqf)
-+{
-+	netsec_writel(priv, ads_irq_set[id], irqf);
-+}
-+
-+void netsec_ring_irq_disable(struct netsec_priv *priv,
-+			     enum netsec_rings id, u32 irqf)
-+{
-+	netsec_writel(priv, desc_ring_irq_inten_clr_reg_addr[id], irqf);
-+}
-+
-+static struct sk_buff *alloc_rx_pkt_buf(struct netsec_priv *priv,
-+					struct netsec_frag_info *info)
-+{
-+	struct sk_buff *skb;
-+
-+	if (device_get_dma_attr(priv->dev) == DEV_DMA_COHERENT) {
-+		skb = netdev_alloc_skb_ip_align(priv->ndev, info->len);
-+	} else {
-+		info->len = L1_CACHE_ALIGN(info->len);
-+		skb = netdev_alloc_skb(priv->ndev, info->len);
-+	}
-+	if (!skb)
-+		return NULL;
-+
-+	netsec_mark_skb_type(skb, NETSEC_RING_RX);
-+	info->addr = skb->data;
-+	info->dma_addr = dma_map_single(priv->dev, info->addr, info->len,
-+					DMA_FROM_DEVICE);
-+	if (dma_mapping_error(priv->dev, info->dma_addr)) {
-+		dev_kfree_skb(skb);
-+		return NULL;
-+	}
-+	return skb;
-+}
-+
-+int netsec_alloc_desc_ring(struct netsec_priv *priv, enum netsec_rings id)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[id];
-+	int ret = 0;
-+
-+	desc->id = id;
-+	desc->len = sizeof(struct netsec_tx_de); /* rx and tx desc same size */
-+
-+	spin_lock_init(&desc->spinlock_desc);
-+
-+	desc->ring_vaddr = dma_zalloc_coherent(priv->dev, desc->len * DESC_NUM,
-+					       &desc->desc_phys, GFP_KERNEL);
-+	if (!desc->ring_vaddr) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+
-+	desc->frag = kcalloc(DESC_NUM, sizeof(*desc->frag), GFP_KERNEL);
-+	if (!desc->frag) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+
-+	desc->priv = kcalloc(DESC_NUM, sizeof(struct sk_buff *), GFP_KERNEL);
-+	if (!desc->priv) {
-+		ret = -ENOMEM;
-+		goto err;
-+	}
-+
-+	return 0;
-+
-+err:
-+	netsec_free_desc_ring(priv, desc);
-+
-+	return ret;
-+}
-+
-+static void netsec_uninit_pkt_desc_ring(struct netsec_priv *priv,
-+					struct netsec_desc_ring *desc)
-+{
-+	struct netsec_frag_info *frag;
-+	u32 status;
-+	u16 idx;
-+
-+	for (idx = 0; idx < DESC_NUM; idx++) {
-+		frag = &desc->frag[idx];
-+		if (!frag->addr)
-+			continue;
-+
-+		status = *(u32 *)(desc->ring_vaddr + desc->len * idx);
-+
-+		dma_unmap_single(priv->dev, frag->dma_addr, frag->len,
-+				 skb_is_rx(desc->priv[idx]) ? DMA_FROM_DEVICE :
-+							      DMA_TO_DEVICE);
-+		if ((status >> NETSEC_TX_LAST) & 1)
-+			dev_kfree_skb(desc->priv[idx]);
-+	}
-+
-+	memset(desc->frag, 0, sizeof(struct netsec_frag_info) * DESC_NUM);
-+	memset(desc->priv, 0, sizeof(struct sk_buff *) * DESC_NUM);
-+	memset(desc->ring_vaddr, 0, desc->len * DESC_NUM);
-+}
-+
-+void netsec_free_desc_ring(struct netsec_priv *priv,
-+			   struct netsec_desc_ring *desc)
-+{
-+	if (desc->ring_vaddr && desc->frag && desc->priv)
-+		netsec_uninit_pkt_desc_ring(priv, desc);
-+
-+	if (desc->ring_vaddr) {
-+		dma_free_coherent(priv->dev, desc->len * DESC_NUM,
-+				  desc->ring_vaddr, desc->desc_phys);
-+		desc->ring_vaddr = NULL;
-+	}
-+	kfree(desc->frag);
-+	desc->frag = NULL;
-+	kfree(desc->priv);
-+	desc->priv = NULL;
-+}
-+
-+static void netsec_set_rx_de(struct netsec_priv *priv,
-+			     struct netsec_desc_ring *desc, u16 idx,
-+			     const struct netsec_frag_info *info,
-+			     struct sk_buff *skb)
-+{
-+	struct netsec_rx_de *de = desc->ring_vaddr + desc->len * idx;
-+	u32 attr = (1 << NETSEC_RX_PKT_OWN_FIELD) |
-+		   (1 << NETSEC_RX_PKT_FS_FIELD) |
-+		   (1 << NETSEC_RX_PKT_LS_FIELD);
-+
-+	if (idx == DESC_NUM - 1)
-+		attr |= (1 << NETSEC_RX_PKT_LD_FIELD);
-+
-+	de->data_buf_addr_up = upper_32_bits(info->dma_addr);
-+	de->data_buf_addr_lw = lower_32_bits(info->dma_addr);
-+	de->buf_len_info = info->len;
-+	/* desc->attr makes the descriptor live, so it must be physically
-+	 * written last after the rest of the descriptor body is already there
-+	 */
-+	dma_wmb();
-+	de->attr = attr;
-+
-+	desc->frag[idx].dma_addr = info->dma_addr;
-+	desc->frag[idx].addr = info->addr;
-+	desc->frag[idx].len = info->len;
-+
-+	desc->priv[idx] = skb;
-+}
-+
-+int netsec_setup_rx_desc(struct netsec_priv *priv,
-+			 struct netsec_desc_ring *desc)
-+{
-+	struct netsec_frag_info info;
-+	struct sk_buff *skb;
-+	int n;
-+
-+	info.len = priv->rx_pkt_buf_len;
-+
-+	for (n = 0; n < DESC_NUM; n++) {
-+		skb = alloc_rx_pkt_buf(priv, &info);
-+		if (!skb) {
-+			netsec_uninit_pkt_desc_ring(priv, desc);
-+			return -ENOMEM;
-+		}
-+		netsec_set_rx_de(priv, desc, n, &info, skb);
-+	}
-+
-+	return 0;
-+}
-+
-+static void netsec_set_tx_desc_entry(struct netsec_priv *priv,
-+				     struct netsec_desc_ring *desc,
-+				     const struct netsec_tx_pkt_ctrl *tx_ctrl,
-+				     bool first_flag, bool last_flag,
-+				     const struct netsec_frag_info *frag,
-+				     struct sk_buff *skb)
-+{
-+	struct netsec_tx_de *tx_desc_entry;
-+	int idx = desc->head;
-+	u32 attr;
-+
-+	tx_desc_entry = desc->ring_vaddr + (desc->len * idx);
-+
-+	attr = (1 << NETSEC_TX_SHIFT_OWN_FIELD) |
-+	       (desc->id << NETSEC_TX_SHIFT_DRID_FIELD) |
-+	       (1 << NETSEC_TX_SHIFT_PT_FIELD) |
-+	       (NETSEC_RING_GMAC << NETSEC_TX_SHIFT_TDRID_FIELD) |
-+	       (first_flag << NETSEC_TX_SHIFT_FS_FIELD) |
-+	       (last_flag << NETSEC_TX_LAST) |
-+	       (tx_ctrl->cksum_offload_flag << NETSEC_TX_SHIFT_CO) |
-+	       (tx_ctrl->tcp_seg_offload_flag << NETSEC_TX_SHIFT_SO) |
-+	       (1 << NETSEC_TX_SHIFT_TRS_FIELD);
-+	if (idx == DESC_NUM - 1)
-+		attr |= (1 << NETSEC_TX_SHIFT_LD_FIELD);
-+
-+	tx_desc_entry->data_buf_addr_up = upper_32_bits(frag->dma_addr);
-+	tx_desc_entry->data_buf_addr_lw = lower_32_bits(frag->dma_addr);
-+	tx_desc_entry->buf_len_info = (tx_ctrl->tcp_seg_len << 16) | frag->len;
-+	/* desc->attr makes the descriptor live, so it must be physically
-+	 * written last after the rest of the descriptor body is already there
-+	 */
-+	dma_wmb();
-+	tx_desc_entry->attr = attr;
-+
-+	desc->frag[idx] = *frag;
-+	desc->priv[idx] = skb;
-+}
-+
-+static void netsec_get_rx_de(struct netsec_priv *priv,
-+			     struct netsec_desc_ring *desc, u16 idx,
-+			     struct netsec_rx_pkt_info *rxpi,
-+			     struct netsec_frag_info *frag, u16 *len,
-+			     struct sk_buff **skb)
-+{
-+	struct netsec_rx_de de = {};
-+
-+	*rxpi = (struct netsec_rx_pkt_info){};
-+	memcpy(&de, desc->ring_vaddr + desc->len * idx, desc->len);
-+
-+	dev_dbg(priv->dev, "%08x\n", *(u32 *)&de);
-+	*len = de.buf_len_info >> 16;
-+
-+	rxpi->is_fragmented = (de.attr >> NETSEC_RX_PKT_FR_FIELD) & 1;
-+	rxpi->err_flag = (de.attr >> NETSEC_RX_PKT_ER_FIELD) & 1;
-+	rxpi->rx_cksum_result = (de.attr >> NETSEC_RX_PKT_CO_FIELD) & 3;
-+	rxpi->err_code = (de.attr >> NETSEC_RX_PKT_ERR_FIELD) &
-+							NETSEC_RX_PKT_ERR_MASK;
-+	*frag = desc->frag[idx];
-+	*skb = desc->priv[idx];
-+}
-+
-+static void netsec_inc_desc_head_idx(struct netsec_priv *priv,
-+				     struct netsec_desc_ring *desc, u16 inc)
-+{
-+	u32 sum;
-+
-+	sum = desc->head + inc;
-+
-+	if (sum >= DESC_NUM)
-+		sum -= DESC_NUM;
-+
-+	desc->head = sum;
-+	desc->full = desc->head == desc->tail;
-+}
-+
-+static void netsec_inc_desc_tail_idx(struct netsec_priv *priv,
-+				     struct netsec_desc_ring *desc)
-+{
-+	u32 sum;
-+
-+	sum = desc->tail + 1;
-+
-+	if (sum >= DESC_NUM)
-+		sum -= DESC_NUM;
-+
-+	desc->tail = sum;
-+	desc->full = false;
-+}
-+
-+static u16 netsec_get_tx_avail_num_sub(struct netsec_priv *priv,
-+				       const struct netsec_desc_ring *desc)
-+{
-+	if (desc->full)
-+		return 0;
-+
-+	if (desc->tail > desc->head)
-+		return desc->tail - desc->head;
-+
-+	return DESC_NUM + desc->tail - desc->head;
-+}
-+
-+static u16 netsec_get_tx_done_num_sub(struct netsec_priv *priv,
-+				      struct netsec_desc_ring *desc)
-+{
-+	desc->tx_done_num += netsec_readl(priv, tx_done_pkt_addr[desc->id]);
-+
-+	return desc->tx_done_num;
-+}
-+
-+static int netsec_set_irq_coalesce_param(struct netsec_priv *priv,
-+					 enum netsec_rings id)
-+{
-+	int max_frames, tmr;
-+
-+	switch (id) {
-+	case NETSEC_RING_TX:
-+		max_frames = priv->et_coalesce.tx_max_coalesced_frames;
-+		tmr = priv->et_coalesce.tx_coalesce_usecs;
-+		break;
-+	case NETSEC_RING_RX:
-+		max_frames = priv->et_coalesce.rx_max_coalesced_frames;
-+		tmr = priv->et_coalesce.rx_coalesce_usecs;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	netsec_writel(priv, int_pkt_cnt_reg_addr[id], max_frames);
-+	netsec_writel(priv, int_tmr_reg_addr[id], ((tmr != 0) << 31) | tmr);
-+
-+	return 0;
-+}
-+
-+int netsec_start_desc_ring(struct netsec_priv *priv, enum netsec_rings id)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[id];
-+	int ret = 0;
-+
-+	spin_lock_bh(&desc->spinlock_desc);
-+
-+	if (desc->running) {
-+		ret = -EBUSY;
-+		goto err;
-+	}
-+
-+	switch (desc->id) {
-+	case NETSEC_RING_RX:
-+		netsec_writel(priv, ads_irq_set[id], NETSEC_IRQ_RCV);
-+		break;
-+	case NETSEC_RING_TX:
-+		netsec_writel(priv, ads_irq_set[id], NETSEC_IRQ_EMPTY);
-+		break;
-+	}
-+
-+	netsec_set_irq_coalesce_param(priv, desc->id);
-+	desc->running = true;
-+
-+err:
-+	spin_unlock_bh(&desc->spinlock_desc);
-+
-+	return ret;
-+}
-+
-+void netsec_stop_desc_ring(struct netsec_priv *priv, enum netsec_rings id)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[id];
-+
-+	spin_lock_bh(&desc->spinlock_desc);
-+	if (desc->running)
-+		netsec_writel(priv, desc_ring_irq_inten_clr_reg_addr[id],
-+			      NETSEC_IRQ_RCV | NETSEC_IRQ_EMPTY |
-+			      NETSEC_IRQ_SND);
-+
-+	desc->running = false;
-+	spin_unlock_bh(&desc->spinlock_desc);
-+}
-+
-+u16 netsec_get_rx_num(struct netsec_priv *priv)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[NETSEC_RING_RX];
-+	u32 result;
-+
-+	spin_lock(&desc->spinlock_desc);
-+	if (desc->running) {
-+		result = netsec_readl(priv,
-+				      rx_pkt_cnt_reg_addr[NETSEC_RING_RX]);
-+		desc->rx_num += result;
-+		if (result)
-+			netsec_inc_desc_head_idx(priv, desc, result);
-+	}
-+	spin_unlock(&desc->spinlock_desc);
-+
-+	return desc->rx_num;
-+}
-+
-+u16 netsec_get_tx_avail_num(struct netsec_priv *priv)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[NETSEC_RING_TX];
-+	u16 result;
-+
-+	spin_lock(&desc->spinlock_desc);
-+
-+	if (!desc->running) {
-+		netif_err(priv, drv, priv->ndev,
-+			  "%s: not running tx desc\n", __func__);
-+		result = 0;
-+		goto err;
-+	}
-+
-+	result = netsec_get_tx_avail_num_sub(priv, desc);
-+
-+err:
-+	spin_unlock(&desc->spinlock_desc);
-+
-+	return result;
-+}
-+
-+int netsec_clean_tx_desc_ring(struct netsec_priv *priv)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[NETSEC_RING_TX];
-+	unsigned int pkts = 0, bytes = 0;
-+	struct netsec_frag_info *frag;
-+	struct netsec_tx_de *entry;
-+	bool is_last;
-+
-+	spin_lock(&desc->spinlock_desc);
-+
-+	netsec_get_tx_done_num_sub(priv, desc);
-+
-+	while ((desc->tail != desc->head || desc->full) && desc->tx_done_num) {
-+		frag = &desc->frag[desc->tail];
-+		entry = desc->ring_vaddr + desc->len * desc->tail;
-+		is_last = (entry->attr >> NETSEC_TX_LAST) & 1;
-+
-+		dma_unmap_single(priv->dev, frag->dma_addr, frag->len,
-+				 DMA_TO_DEVICE);
-+		if (is_last) {
-+			pkts++;
-+			bytes += desc->priv[desc->tail]->len;
-+			dev_kfree_skb(desc->priv[desc->tail]);
-+		}
-+		*frag = (struct netsec_frag_info){};
-+		netsec_inc_desc_tail_idx(priv, desc);
-+
-+		if (is_last)
-+			desc->tx_done_num--;
-+	}
-+
-+	spin_unlock(&desc->spinlock_desc);
-+
-+	priv->ndev->stats.tx_packets += pkts;
-+	priv->ndev->stats.tx_bytes += bytes;
-+
-+	netdev_completed_queue(priv->ndev, pkts, bytes);
-+
-+	return 0;
-+}
-+
-+int netsec_clean_rx_desc_ring(struct netsec_priv *priv)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[NETSEC_RING_RX];
-+
-+	spin_lock(&desc->spinlock_desc);
-+
-+	while (desc->full || (desc->tail != desc->head)) {
-+		netsec_set_rx_de(priv, desc, desc->tail,
-+				 &desc->frag[desc->tail],
-+				 desc->priv[desc->tail]);
-+		desc->rx_num--;
-+		netsec_inc_desc_tail_idx(priv, desc);
-+	}
-+
-+	spin_unlock(&desc->spinlock_desc);
-+
-+	return 0;
-+}
-+
-+int netsec_set_tx_pkt_data(struct netsec_priv *priv,
-+			   const struct netsec_tx_pkt_ctrl *tx_ctrl,
-+			   u8 count_frags, const struct netsec_frag_info *info,
-+			   struct sk_buff *skb)
-+{
-+	struct netsec_desc_ring *desc;
-+	u32 sum_len = 0;
-+	unsigned int i;
-+	int ret = 0;
-+
-+	if (tx_ctrl->tcp_seg_offload_flag && !tx_ctrl->cksum_offload_flag)
-+		return -EINVAL;
-+
-+	if (tx_ctrl->tcp_seg_offload_flag) {
-+		if (tx_ctrl->tcp_seg_len == 0)
-+			return -EINVAL;
-+
-+		if (priv->param.use_jumbo_pkt_flag) {
-+			if (tx_ctrl->tcp_seg_len > NETSEC_TCP_JUMBO_SEG_LEN_MAX)
-+				return -EINVAL;
-+		} else {
-+			if (tx_ctrl->tcp_seg_len > NETSEC_TCP_SEG_LEN_MAX)
-+				return -EINVAL;
-+		}
-+	} else {
-+		if (tx_ctrl->tcp_seg_len)
-+			return -EINVAL;
-+	}
-+
-+	if (!count_frags)
-+		return -ERANGE;
-+
-+	for (i = 0; i < count_frags; i++) {
-+		if ((info[i].len == 0) || (info[i].len > 0xffff)) {
-+			netif_err(priv, drv, priv->ndev,
-+				  "%s: bad info len\n", __func__);
-+			return -EINVAL;
-+		}
-+		sum_len += info[i].len;
-+	}
-+
-+	if (!tx_ctrl->tcp_seg_offload_flag) {
-+		if (priv->param.use_jumbo_pkt_flag) {
-+			if (sum_len > NETSEC_MAX_TX_JUMBO_PKT_LEN)
-+				return -EINVAL;
-+		} else {
-+			if (sum_len > NETSEC_MAX_TX_PKT_LEN)
-+				return -EINVAL;
-+		}
-+	}
-+
-+	desc = &priv->desc_ring[NETSEC_RING_TX];
-+	spin_lock(&desc->spinlock_desc);
-+
-+	if (!desc->running) {
-+		ret = -ENODEV;
-+		goto end;
-+	}
-+
-+	dma_rmb(); /* we need to see a consistent view of pending tx count */
-+	if (count_frags > netsec_get_tx_avail_num_sub(priv, desc)) {
-+		ret = -EBUSY;
-+		goto end;
-+	}
-+
-+	for (i = 0; i < count_frags; i++) {
-+		netsec_set_tx_desc_entry(priv, desc, tx_ctrl, i == 0,
-+					 i == count_frags - 1, &info[i], skb);
-+		netsec_inc_desc_head_idx(priv, desc, 1);
-+	}
-+
-+	dma_wmb(); /* ensure the descriptor is flushed */
-+	netsec_writel(priv, tx_pkt_cnt_reg_addr[NETSEC_RING_TX], 1);
-+
-+end:
-+	spin_unlock(&desc->spinlock_desc);
-+
-+	return ret;
-+}
-+
-+int netsec_get_rx_pkt_data(struct netsec_priv *priv,
-+			   struct netsec_rx_pkt_info *rxpi,
-+			   struct netsec_frag_info *frag, u16 *len,
-+			   struct sk_buff **skb)
-+{
-+	struct netsec_desc_ring *desc = &priv->desc_ring[NETSEC_RING_RX];
-+	struct netsec_frag_info info;
-+	struct sk_buff *tmp_skb;
-+	int ret = 0;
-+
-+	spin_lock(&desc->spinlock_desc);
-+
-+	if (desc->rx_num == 0) {
-+		dev_err(priv->dev, "%s 0 len rx\n", __func__);
-+		ret = -EINVAL;
-+		goto err;
-+	}
-+
-+	info.len = priv->rx_pkt_buf_len;
-+	dma_rmb(); /* we need to ensure we only see current data in descriptor */
-+	tmp_skb = alloc_rx_pkt_buf(priv, &info);
-+	if (!tmp_skb) {
-+		netsec_set_rx_de(priv, desc, desc->tail,
-+				 &desc->frag[desc->tail],
-+				 desc->priv[desc->tail]);
-+		ret = -ENOMEM;
-+	} else {
-+		netsec_get_rx_de(priv, desc, desc->tail, rxpi, frag, len, skb);
-+		netsec_set_rx_de(priv, desc, desc->tail, &info, tmp_skb);
-+	}
-+
-+	netsec_inc_desc_tail_idx(priv, desc);
-+	desc->rx_num--;
-+
-+err:
-+	spin_unlock(&desc->spinlock_desc);
-+
-+	return ret;
-+}
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec_ethtool.c b/drivers/net/ethernet/socionext/netsec/netsec_ethtool.c
-new file mode 100644
-index 0000000..45830fe
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/netsec_ethtool.c
-@@ -0,0 +1,78 @@
-+/**
-+ * drivers/net/ethernet/socionext/netsec/netsec_ethtool.c
-+ *
-+ *  Copyright (C) 2013-2014 Fujitsu Semiconductor Limited.
-+ *  Copyright (C) 2014-2017 Linaro Ltd. All rights reserved.
-+ *     Andy Green <andy.green@linaro.org>
-+ *     Jassi Brar <jaswinder.singh@linaro.org>
-+ *     Ard Biesheuvel <ard.biesheuvel@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public License
-+ *  as published by the Free Software Foundation; either version 2
-+ *  of the License, or (at your option) any later version.
-+ */
-+
-+#include "netsec.h"
-+
-+static void netsec_et_get_drvinfo(struct net_device *net_device,
-+				  struct ethtool_drvinfo *info)
-+{
-+	strlcpy(info->driver, "netsec", sizeof(info->driver));
-+	strlcpy(info->bus_info, dev_name(net_device->dev.parent),
-+		sizeof(info->bus_info));
-+}
-+
-+static int netsec_et_get_coalesce(struct net_device *net_device,
-+				  struct ethtool_coalesce *et_coalesce)
-+{
-+	struct netsec_priv *priv = netdev_priv(net_device);
-+
-+	*et_coalesce = priv->et_coalesce;
-+
-+	return 0;
-+}
-+
-+static int netsec_et_set_coalesce(struct net_device *net_device,
-+				  struct ethtool_coalesce *et_coalesce)
-+{
-+	struct netsec_priv *priv = netdev_priv(net_device);
-+
-+	if (et_coalesce->rx_max_coalesced_frames > NETSEC_INT_PKTCNT_MAX)
-+		return -EINVAL;
-+	if (et_coalesce->tx_max_coalesced_frames > NETSEC_INT_PKTCNT_MAX)
-+		return -EINVAL;
-+	if (!et_coalesce->rx_max_coalesced_frames)
-+		return -EINVAL;
-+	if (!et_coalesce->tx_max_coalesced_frames)
-+		return -EINVAL;
-+
-+	priv->et_coalesce = *et_coalesce;
-+
-+	return 0;
-+}
-+
-+static u32 netsec_et_get_msglevel(struct net_device *dev)
-+{
-+	struct netsec_priv *priv = netdev_priv(dev);
-+
-+	return priv->msg_enable;
-+}
-+
-+static void netsec_et_set_msglevel(struct net_device *dev, u32 datum)
-+{
-+	struct netsec_priv *priv = netdev_priv(dev);
-+
-+	priv->msg_enable = datum;
-+}
-+
-+const struct ethtool_ops netsec_ethtool_ops = {
-+	.get_drvinfo		= netsec_et_get_drvinfo,
-+	.get_link_ksettings	= phy_ethtool_get_link_ksettings,
-+	.set_link_ksettings	= phy_ethtool_set_link_ksettings,
-+	.get_link		= ethtool_op_get_link,
-+	.get_coalesce		= netsec_et_get_coalesce,
-+	.set_coalesce		= netsec_et_set_coalesce,
-+	.get_msglevel		= netsec_et_get_msglevel,
-+	.set_msglevel		= netsec_et_set_msglevel,
-+};
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec_gmac_access.c b/drivers/net/ethernet/socionext/netsec/netsec_gmac_access.c
-new file mode 100644
-index 0000000..94e9b7f
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/netsec_gmac_access.c
-@@ -0,0 +1,330 @@
-+/**
-+ * drivers/net/ethernet/socionext/netsec/netsec_gmac_access.c
-+ *
-+ *  Copyright (C) 2013-2014 Fujitsu Semiconductor Limited.
-+ *  Copyright (C) 2014-2017 Linaro Ltd. All rights reserved.
-+ *     Andy Green <andy.green@linaro.org>
-+ *     Jassi Brar <jaswinder.singh@linaro.org>
-+ *     Ard Biesheuvel <ard.biesheuvel@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public License
-+ *  as published by the Free Software Foundation; either version 2
-+ *  of the License, or (at your option) any later version.
-+ */
-+#include "netsec.h"
-+
-+#define TIMEOUT_SPINS_MAC		1000
-+#define TIMEOUT_SECONDARY_MS_MAC	100
-+
-+static u32 netsec_clk_type(u32 freq)
-+{
-+	if (freq < 35 * NETSEC_CLK_MHZ)
-+		return NETSEC_GMAC_GAR_REG_CR_25_35_MHZ;
-+	if (freq < 60 * NETSEC_CLK_MHZ)
-+		return NETSEC_GMAC_GAR_REG_CR_35_60_MHZ;
-+	if (freq < 100 * NETSEC_CLK_MHZ)
-+		return NETSEC_GMAC_GAR_REG_CR_60_100_MHZ;
-+	if (freq < 150 * NETSEC_CLK_MHZ)
-+		return NETSEC_GMAC_GAR_REG_CR_100_150_MHZ;
-+	if (freq < 250 * NETSEC_CLK_MHZ)
-+		return NETSEC_GMAC_GAR_REG_CR_150_250_MHZ;
-+
-+	return NETSEC_GMAC_GAR_REG_CR_250_300_MHZ;
-+}
-+
-+static int netsec_wait_while_busy(struct netsec_priv *priv, u32 addr, u32 mask)
-+{
-+	u32 timeout = TIMEOUT_SPINS_MAC;
-+
-+	while (--timeout && netsec_readl(priv, addr) & mask)
-+		cpu_relax();
-+	if (timeout)
-+		return 0;
-+
-+	timeout = TIMEOUT_SECONDARY_MS_MAC;
-+	while (--timeout && netsec_readl(priv, addr) & mask)
-+		usleep_range(1000, 2000);
-+
-+	if (timeout)
-+		return 0;
-+
-+	netdev_WARN(priv->ndev, "%s: timeout\n", __func__);
-+
-+	return -ETIMEDOUT;
-+}
-+
-+static int netsec_mac_write(struct netsec_priv *priv, u32 addr, u32 value)
-+{
-+	netsec_writel(priv, MAC_REG_DATA, value);
-+	netsec_writel(priv, MAC_REG_CMD, addr | NETSEC_GMAC_CMD_ST_WRITE);
-+	return netsec_wait_while_busy(priv,
-+				      MAC_REG_CMD, NETSEC_GMAC_CMD_ST_BUSY);
-+}
-+
-+static int netsec_mac_read(struct netsec_priv *priv, u32 addr, u32 *read)
-+{
-+	int ret;
-+
-+	netsec_writel(priv, MAC_REG_CMD, addr | NETSEC_GMAC_CMD_ST_READ);
-+	ret = netsec_wait_while_busy(priv,
-+				     MAC_REG_CMD, NETSEC_GMAC_CMD_ST_BUSY);
-+	if (ret)
-+		return ret;
-+
-+	*read = netsec_readl(priv, MAC_REG_DATA);
-+
-+	return 0;
-+}
-+
-+static int netsec_mac_wait_while_busy(struct netsec_priv *priv,
-+				      u32 addr, u32 mask)
-+{
-+	u32 timeout = TIMEOUT_SPINS_MAC;
-+	int ret, data;
-+
-+	do {
-+		ret = netsec_mac_read(priv, addr, &data);
-+		if (ret)
-+			break;
-+		cpu_relax();
-+	} while (--timeout && (data & mask));
-+
-+	if (timeout)
-+		return 0;
-+
-+	timeout = TIMEOUT_SECONDARY_MS_MAC;
-+	do {
-+		usleep_range(1000, 2000);
-+
-+		ret = netsec_mac_read(priv, addr, &data);
-+		if (ret)
-+			break;
-+		cpu_relax();
-+	} while (--timeout && (data & mask));
-+
-+	if (timeout && !ret)
-+		return 0;
-+
-+	netdev_WARN(priv->ndev, "%s: timeout\n", __func__);
-+
-+	return -ETIMEDOUT;
-+}
-+
-+static int netsec_mac_update_to_phy_state(struct netsec_priv *priv)
-+{
-+	struct phy_device *phydev = priv->ndev->phydev;
-+	u32 value = 0;
-+
-+	value = phydev->duplex ? NETSEC_GMAC_MCR_REG_FULL_DUPLEX_COMMON :
-+				 NETSEC_GMAC_MCR_REG_HALF_DUPLEX_COMMON;
-+
-+	if (phydev->speed != SPEED_1000)
-+		value |= NETSEC_MCR_PS;
-+
-+	if ((priv->phy_interface != PHY_INTERFACE_MODE_GMII) &&
-+	    (phydev->speed == SPEED_100))
-+		value |= NETSEC_GMAC_MCR_REG_FES;
-+
-+	value |= NETSEC_GMAC_MCR_REG_CST | NETSEC_GMAC_MCR_REG_JE;
-+
-+	if (priv->phy_interface == PHY_INTERFACE_MODE_RGMII)
-+		value |= NETSEC_GMAC_MCR_REG_IBN;
-+
-+	if (netsec_mac_write(priv, GMAC_REG_MCR, value))
-+		return -ETIMEDOUT;
-+
-+	priv->actual_link_speed = phydev->speed;
-+	priv->actual_duplex = phydev->duplex;
-+
-+	return 0;
-+}
-+
-+/* NB netsec_start_gmac() only called from adjust_link */
-+
-+int netsec_start_gmac(struct netsec_priv *priv)
-+{
-+	struct phy_device *phydev = priv->ndev->phydev;
-+	u32 value = 0;
-+	int ret;
-+
-+	if (priv->desc_ring[NETSEC_RING_TX].running &&
-+	    priv->desc_ring[NETSEC_RING_RX].running)
-+		return 0;
-+
-+	if (!priv->desc_ring[NETSEC_RING_RX].running &&
-+	    !priv->desc_ring[NETSEC_RING_TX].running) {
-+		if (phydev->speed != SPEED_1000)
-+			value = (NETSEC_GMAC_MCR_REG_CST |
-+				 NETSEC_GMAC_MCR_REG_HALF_DUPLEX_COMMON);
-+
-+		if (netsec_mac_write(priv, GMAC_REG_MCR, value))
-+			return -ETIMEDOUT;
-+		if (netsec_mac_write(priv, GMAC_REG_BMR,
-+				     NETSEC_GMAC_BMR_REG_RESET))
-+			return -ETIMEDOUT;
-+
-+		/* Wait soft reset */
-+		usleep_range(1000, 5000);
-+
-+		ret = netsec_mac_read(priv, GMAC_REG_BMR, &value);
-+		if (ret)
-+			return ret;
-+		if (value & NETSEC_GMAC_BMR_REG_SWR)
-+			return -EAGAIN;
-+
-+		netsec_writel(priv, MAC_REG_DESC_SOFT_RST, 1);
-+		if (netsec_wait_while_busy(priv, MAC_REG_DESC_SOFT_RST, 1))
-+			return -ETIMEDOUT;
-+
-+		netsec_writel(priv, MAC_REG_DESC_INIT, 1);
-+		if (netsec_wait_while_busy(priv, MAC_REG_DESC_INIT, 1))
-+			return -ETIMEDOUT;
-+
-+		if (netsec_mac_write(priv, GMAC_REG_BMR,
-+				     NETSEC_GMAC_BMR_REG_COMMON))
-+			return -ETIMEDOUT;
-+		if (netsec_mac_write(priv, GMAC_REG_RDLAR,
-+				     NETSEC_GMAC_RDLAR_REG_COMMON))
-+			return -ETIMEDOUT;
-+		if (netsec_mac_write(priv, GMAC_REG_TDLAR,
-+				     NETSEC_GMAC_TDLAR_REG_COMMON))
-+			return -ETIMEDOUT;
-+		if (netsec_mac_write(priv, GMAC_REG_MFFR, 0x80000001))
-+			return -ETIMEDOUT;
-+
-+		ret = netsec_mac_update_to_phy_state(priv);
-+		if (ret)
-+			return ret;
-+
-+		if (priv->mac_mode.flow_ctrl_enable_flag) {
-+			netsec_writel(priv, MAC_REG_FLOW_TH,
-+				      (priv->mac_mode.flow_stop_th << 16) |
-+				      priv->mac_mode.flow_start_th);
-+			if (netsec_mac_write(priv, GMAC_REG_FCR,
-+					     (priv->mac_mode.pause_time << 16) |
-+					     NETSEC_FCR_RFE | NETSEC_FCR_TFE))
-+				return -ETIMEDOUT;
-+		}
-+	}
-+
-+	ret = netsec_mac_read(priv, GMAC_REG_OMR, &value);
-+	if (ret)
-+		return ret;
-+
-+	if (!priv->desc_ring[NETSEC_RING_RX].running) {
-+		value |= NETSEC_GMAC_OMR_REG_SR;
-+		netsec_start_desc_ring(priv, NETSEC_RING_RX);
-+	}
-+	if (!priv->desc_ring[NETSEC_RING_TX].running) {
-+		value |= NETSEC_GMAC_OMR_REG_ST;
-+		netsec_start_desc_ring(priv, NETSEC_RING_TX);
-+	}
-+
-+	if (netsec_mac_write(priv, GMAC_REG_OMR, value))
-+		return -ETIMEDOUT;
-+
-+	netsec_writel(priv, NETSEC_REG_INTEN_SET,
-+		      NETSEC_IRQ_TX | NETSEC_IRQ_RX);
-+
-+	return 0;
-+}
-+
-+int netsec_stop_gmac(struct netsec_priv *priv)
-+{
-+	u32 value;
-+	int ret;
-+
-+	ret = netsec_mac_read(priv, GMAC_REG_OMR, &value);
-+	if (ret)
-+		return ret;
-+
-+	if (priv->desc_ring[NETSEC_RING_RX].running) {
-+		value &= ~NETSEC_GMAC_OMR_REG_SR;
-+		netsec_stop_desc_ring(priv, NETSEC_RING_RX);
-+	}
-+	if (priv->desc_ring[NETSEC_RING_TX].running) {
-+		value &= ~NETSEC_GMAC_OMR_REG_ST;
-+		netsec_stop_desc_ring(priv, NETSEC_RING_TX);
-+	}
-+
-+	priv->actual_link_speed = 0;
-+	priv->actual_duplex = false;
-+
-+	return netsec_mac_write(priv, GMAC_REG_OMR, value);
-+}
-+
-+static int netsec_phy_write(struct mii_bus *bus,
-+			    int phy_addr, int reg, u16 val)
-+{
-+	struct netsec_priv *priv = bus->priv;
-+
-+	if (netsec_mac_write(priv, GMAC_REG_GDR, val))
-+		return -ETIMEDOUT;
-+	if (netsec_mac_write(priv, GMAC_REG_GAR,
-+			     phy_addr << NETSEC_GMAC_GAR_REG_SHIFT_PA |
-+			     reg << NETSEC_GMAC_GAR_REG_SHIFT_GR |
-+			     NETSEC_GMAC_GAR_REG_GW | NETSEC_GMAC_GAR_REG_GB |
-+			     (netsec_clk_type(priv->freq) <<
-+			      GMAC_REG_SHIFT_CR_GAR)))
-+		return -ETIMEDOUT;
-+
-+	return netsec_mac_wait_while_busy(priv, GMAC_REG_GAR,
-+					  NETSEC_GMAC_GAR_REG_GB);
-+}
-+
-+static int netsec_phy_read(struct mii_bus *bus, int phy_addr, int reg_addr)
-+{
-+	struct netsec_priv *priv = bus->priv;
-+	u32 data;
-+	int ret;
-+
-+	if (netsec_mac_write(priv, GMAC_REG_GAR, NETSEC_GMAC_GAR_REG_GB |
-+			     phy_addr << NETSEC_GMAC_GAR_REG_SHIFT_PA |
-+			     reg_addr << NETSEC_GMAC_GAR_REG_SHIFT_GR |
-+			     (netsec_clk_type(priv->freq) <<
-+			      GMAC_REG_SHIFT_CR_GAR)))
-+		return -ETIMEDOUT;
-+
-+	ret = netsec_mac_wait_while_busy(priv, GMAC_REG_GAR,
-+					 NETSEC_GMAC_GAR_REG_GB);
-+	if (ret)
-+		return ret;
-+
-+	ret = netsec_mac_read(priv, GMAC_REG_GDR, &data);
-+	if (ret)
-+		return ret;
-+
-+	return data;
-+}
-+
-+int netsec_mii_register(struct netsec_priv *priv)
-+{
-+	struct mii_bus *bus = devm_mdiobus_alloc(priv->dev);
-+	int ret;
-+
-+	if (!bus)
-+		return -ENOMEM;
-+
-+	snprintf(bus->id, MII_BUS_ID_SIZE, "%s", dev_name(priv->dev));
-+	bus->priv = priv;
-+	bus->name = "SNI NETSEC MDIO";
-+	bus->read = netsec_phy_read;
-+	bus->write = netsec_phy_write;
-+	bus->parent = priv->dev;
-+	priv->mii_bus = bus;
-+
-+	if (dev_of_node(priv->dev)) {
-+		ret = of_mdiobus_register(bus, dev_of_node(priv->dev));
-+	} else {
-+		/* Mask out all PHYs from auto probing. */
-+		bus->phy_mask = ~0;
-+		ret = mdiobus_register(bus);
-+	}
-+	return ret;
-+}
-+
-+void netsec_mii_unregister(struct netsec_priv *priv)
-+{
-+	mdiobus_unregister(priv->mii_bus);
-+}
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec_netdev.c b/drivers/net/ethernet/socionext/netsec/netsec_netdev.c
-new file mode 100644
-index 0000000..e99cf0e
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/netsec_netdev.c
-@@ -0,0 +1,540 @@
-+/**
-+ * drivers/net/ethernet/socionext/netsec/netsec_netdev.c
-+ *
-+ *  Copyright (C) 2013-2014 Fujitsu Semiconductor Limited.
-+ *  Copyright (C) 2014-2017 Linaro Ltd. All rights reserved.
-+ *     Andy Green <andy.green@linaro.org>
-+ *     Jassi Brar <jaswinder.singh@linaro.org>
-+ *     Ard Biesheuvel <ard.biesheuvel@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public License
-+ *  as published by the Free Software Foundation; either version 2
-+ *  of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/ip.h>
-+#include <linux/ipv6.h>
-+#include <linux/tcp.h>
-+#include <net/tcp.h>
-+#include <net/ip6_checksum.h>
-+#include <linux/pm_runtime.h>
-+
-+#include "netsec.h"
-+
-+#define WAIT_FW_RDY_TIMEOUT 50
-+
-+static const u32 desc_ring_irq_status_reg_addr[] = {
-+	NETSEC_REG_NRM_TX_STATUS,
-+	NETSEC_REG_NRM_RX_STATUS,
-+};
-+
-+static const u32 desc_ads[] = {
-+	NETSEC_REG_NRM_TX_CONFIG,
-+	NETSEC_REG_NRM_RX_CONFIG,
-+};
-+
-+static const u32 netsec_desc_start_reg_addr_up[] = {
-+	NETSEC_REG_NRM_TX_DESC_START_UP,
-+	NETSEC_REG_NRM_RX_DESC_START_UP,
-+};
-+
-+static const u32 netsec_desc_start_reg_addr_lw[] = {
-+	NETSEC_REG_NRM_TX_DESC_START_LW,
-+	NETSEC_REG_NRM_RX_DESC_START_LW,
-+};
-+
-+static u32 netsec_calc_pkt_ctrl_reg_param(const struct netsec_pkt_ctrlaram
-+					*pkt_ctrlaram_p)
-+{
-+	u32 param = NETSEC_PKT_CTRL_REG_MODE_NRM;
-+
-+	if (pkt_ctrlaram_p->log_chksum_er_flag)
-+		param |= NETSEC_PKT_CTRL_REG_LOG_CHKSUM_ER;
-+
-+	if (pkt_ctrlaram_p->log_hd_imcomplete_flag)
-+		param |= NETSEC_PKT_CTRL_REG_LOG_HD_INCOMPLETE;
-+
-+	if (pkt_ctrlaram_p->log_hd_er_flag)
-+		param |= NETSEC_PKT_CTRL_REG_LOG_HD_ER;
-+
-+	return param;
-+}
-+
-+static int netsec_netdev_load_ucode_region(struct netsec_priv *priv, u32 reg,
-+					   u32 addr_h, u32 addr_l, u32 size)
-+{
-+	u64 base = (u64)addr_h << 32 | addr_l;
-+	__le32 *ucode;
-+	u32 i;
-+
-+	ucode = memremap(base, size * sizeof(u32), MEMREMAP_WT);
-+	if (!ucode)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < size; i++)
-+		netsec_writel(priv, reg, le32_to_cpu(ucode[i]));
-+
-+	memunmap(ucode);
-+	return 0;
-+}
-+
-+static int netsec_netdev_load_microcode(struct netsec_priv *priv)
-+{
-+	int err;
-+
-+	err = netsec_netdev_load_ucode_region(
-+		priv, NETSEC_REG_DMAC_HM_CMD_BUF,
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_HM_ME_ADDRESS_H),
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_HM_ME_ADDRESS_L),
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_HM_ME_SIZE));
-+	if (err)
-+		return err;
-+
-+	err = netsec_netdev_load_ucode_region(
-+		priv, NETSEC_REG_DMAC_MH_CMD_BUF,
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_MH_ME_ADDRESS_H),
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_MH_ME_ADDRESS_L),
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_MH_ME_SIZE));
-+	if (err)
-+		return err;
-+
-+	err = netsec_netdev_load_ucode_region(
-+		priv, NETSEC_REG_PKT_CMD_BUF,
-+		0,
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_PKT_ME_ADDRESS),
-+		le32_to_cpup(priv->eeprom_base + NETSEC_EEPROM_PKT_ME_SIZE));
-+	if (err)
-+		return err;
-+
-+	return 0;
-+}
-+
-+static int netsec_init_hardware(struct netsec_priv *priv)
-+{
-+	u32 value;
-+	int err;
-+
-+	/* set desc_start addr */
-+	netsec_writel(priv, netsec_desc_start_reg_addr_up[NETSEC_RING_RX],
-+		      upper_32_bits(priv->desc_ring[NETSEC_RING_RX].desc_phys));
-+	netsec_writel(priv, netsec_desc_start_reg_addr_lw[NETSEC_RING_RX],
-+		      lower_32_bits(priv->desc_ring[NETSEC_RING_RX].desc_phys));
-+
-+	netsec_writel(priv, netsec_desc_start_reg_addr_up[NETSEC_RING_TX],
-+		      upper_32_bits(priv->desc_ring[NETSEC_RING_TX].desc_phys));
-+	netsec_writel(priv, netsec_desc_start_reg_addr_lw[NETSEC_RING_TX],
-+		      lower_32_bits(priv->desc_ring[NETSEC_RING_TX].desc_phys));
-+
-+	/* set normal tx desc ring config */
-+	netsec_writel(priv, desc_ads[NETSEC_RING_TX],
-+		      1 << NETSEC_REG_DESC_ENDIAN);
-+	netsec_writel(priv, desc_ads[NETSEC_RING_RX],
-+		      1 << NETSEC_REG_DESC_ENDIAN);
-+
-+	err = netsec_netdev_load_microcode(priv);
-+	if (err) {
-+		netif_err(priv, probe, priv->ndev,
-+			  "%s: failed to load microcode (%d)\n", __func__, err);
-+		return err;
-+	}
-+
-+	/* start DMA engines */
-+	netsec_writel(priv, NETSEC_REG_DMA_TMR_CTRL, priv->freq / 1000000 - 1);
-+	netsec_writel(priv, NETSEC_REG_ADDR_DIS_CORE, 0);
-+
-+	usleep_range(1000, 2000);
-+
-+	if (!(netsec_readl(priv, NETSEC_REG_TOP_STATUS) &
-+	      NETSEC_TOP_IRQ_REG_CODE_LOAD_END)) {
-+		netif_err(priv, drv, priv->ndev, "microengine start failed\n");
-+		return -ENXIO;
-+	}
-+	netsec_writel(priv, NETSEC_REG_TOP_STATUS,
-+		      NETSEC_TOP_IRQ_REG_CODE_LOAD_END);
-+
-+	value = netsec_calc_pkt_ctrl_reg_param(&priv->param.pkt_ctrlaram);
-+
-+	if (priv->param.use_jumbo_pkt_flag)
-+		value |= NETSEC_PKT_CTRL_REG_EN_JUMBO;
-+
-+	/* change to normal mode */
-+	netsec_writel(priv, NETSEC_REG_DMA_MH_CTRL, MH_CTRL__MODE_TRANS);
-+	netsec_writel(priv, NETSEC_REG_PKT_CTRL, value);
-+
-+	while ((netsec_readl(priv, NETSEC_REG_MODE_TRANS_COMP_STATUS) &
-+		NETSEC_MODE_TRANS_COMP_IRQ_T2N) == 0)
-+		cpu_relax();
-+
-+	return 0;
-+}
-+
-+static void netsec_ring_irq_clr(struct netsec_priv *priv,
-+				unsigned int id, u32 value)
-+{
-+	netsec_writel(priv, desc_ring_irq_status_reg_addr[id],
-+		      value & (NETSEC_IRQ_EMPTY | NETSEC_IRQ_ERR));
-+}
-+
-+static void netsec_napi_tx_processing(struct netsec_priv *priv)
-+{
-+	netsec_ring_irq_clr(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+	netsec_clean_tx_desc_ring(priv);
-+
-+	if (netif_queue_stopped(priv->ndev) &&
-+	    netsec_get_tx_avail_num(priv) >= NETSEC_NETDEV_TX_PKT_SCAT_NUM_MAX)
-+		netif_wake_queue(priv->ndev);
-+}
-+
-+int netsec_netdev_napi_poll(struct napi_struct *napi_p, int budget)
-+{
-+	struct netsec_priv *priv = container_of(napi_p, struct netsec_priv,
-+						napi);
-+	struct net_device *ndev = priv->ndev;
-+	struct netsec_rx_pkt_info rx_info;
-+	int ret, done = 0, rx_num = 0;
-+	struct netsec_frag_info frag;
-+	struct sk_buff *skb;
-+	u16 len;
-+
-+	netsec_napi_tx_processing(priv);
-+
-+	while (done < budget) {
-+		if (!rx_num) {
-+			rx_num = netsec_get_rx_num(priv);
-+			if (!rx_num)
-+				break;
-+		}
-+		done++;
-+		rx_num--;
-+		ret = netsec_get_rx_pkt_data(priv, &rx_info, &frag, &len, &skb);
-+		if (unlikely(ret == -ENOMEM)) {
-+			netif_err(priv, drv, priv->ndev,
-+				  "%s: rx fail %d\n", __func__, ret);
-+			ndev->stats.rx_dropped++;
-+			continue;
-+		}
-+		dma_unmap_single(priv->dev, frag.dma_addr, frag.len,
-+				 DMA_FROM_DEVICE);
-+		skb_put(skb, len);
-+		skb->protocol = eth_type_trans(skb, priv->ndev);
-+
-+		if (priv->rx_cksum_offload_flag &&
-+		    rx_info.rx_cksum_result == NETSEC_RX_CKSUM_OK)
-+			skb->ip_summed = CHECKSUM_UNNECESSARY;
-+
-+		if (napi_gro_receive(napi_p, skb) != GRO_DROP) {
-+			ndev->stats.rx_packets++;
-+			ndev->stats.rx_bytes += len;
-+		}
-+	}
-+
-+	if (done < budget && napi_complete_done(napi_p, done))
-+		netsec_writel(priv, NETSEC_REG_INTEN_SET,
-+			      NETSEC_IRQ_TX | NETSEC_IRQ_RX);
-+	return done;
-+}
-+
-+static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb,
-+					    struct net_device *ndev)
-+{
-+	struct netsec_priv *priv = netdev_priv(ndev);
-+	struct netsec_tx_pkt_ctrl tx_ctrl = {};
-+	u16 pend_tx, tso_seg_len = 0;
-+	skb_frag_t *frag;
-+	int count_frags;
-+	int ret, i;
-+
-+	netsec_ring_irq_clr(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+
-+	count_frags = skb_shinfo(skb)->nr_frags + 1;
-+
-+	if (skb->ip_summed == CHECKSUM_PARTIAL) {
-+		if ((skb->protocol == htons(ETH_P_IP) &&
-+		     ip_hdr(skb)->protocol == IPPROTO_TCP) ||
-+		    (skb->protocol == htons(ETH_P_IPV6) &&
-+		     ipv6_hdr(skb)->nexthdr == IPPROTO_TCP))
-+			tx_ctrl.cksum_offload_flag = true;
-+		else
-+			skb_checksum_help(skb);
-+	}
-+
-+	if (skb_is_gso(skb))
-+		tso_seg_len = skb_shinfo(skb)->gso_size;
-+
-+	if (tso_seg_len > 0) {
-+		if (skb->protocol == htons(ETH_P_IP)) {
-+			ip_hdr(skb)->tot_len = 0;
-+			tcp_hdr(skb)->check =
-+				~tcp_v4_check(0, ip_hdr(skb)->saddr,
-+					      ip_hdr(skb)->daddr, 0);
-+		} else {
-+			ipv6_hdr(skb)->payload_len = 0;
-+			tcp_hdr(skb)->check =
-+				~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-+						 &ipv6_hdr(skb)->daddr,
-+						 0, IPPROTO_TCP, 0);
-+		}
-+
-+		tx_ctrl.tcp_seg_offload_flag = true;
-+		tx_ctrl.tcp_seg_len = tso_seg_len;
-+	}
-+
-+	priv->tx_info[0].dma_addr = dma_map_single(priv->dev, skb->data,
-+						   skb_headlen(skb),
-+						   DMA_TO_DEVICE);
-+	if (dma_mapping_error(priv->dev, priv->tx_info[0].dma_addr)) {
-+		netif_err(priv, drv, priv->ndev,
-+			  "%s: DMA mapping failed\n", __func__);
-+		return NETDEV_TX_OK;
-+	}
-+	priv->tx_info[0].addr = skb->data;
-+	priv->tx_info[0].len = skb_headlen(skb);
-+
-+	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-+		frag = &skb_shinfo(skb)->frags[i];
-+		priv->tx_info[i + 1].dma_addr =
-+			skb_frag_dma_map(priv->dev, frag, 0,
-+					 skb_frag_size(frag), DMA_TO_DEVICE);
-+		priv->tx_info[i + 1].addr = skb_frag_address(frag);
-+		priv->tx_info[i + 1].len = frag->size;
-+	}
-+
-+	netsec_mark_skb_type(skb, NETSEC_RING_TX);
-+
-+	ret = netsec_set_tx_pkt_data(priv, &tx_ctrl, count_frags,
-+				     priv->tx_info, skb);
-+	if (ret) {
-+		netif_info(priv, drv, priv->ndev,
-+			   "set tx pkt failed %d\n", ret);
-+		for (i = 0; i < count_frags; i++)
-+			dma_unmap_single(priv->dev, priv->tx_info[i].dma_addr,
-+					 priv->tx_info[i].len, DMA_TO_DEVICE);
-+		ndev->stats.tx_dropped++;
-+
-+		return NETDEV_TX_OK;
-+	}
-+
-+	netdev_sent_queue(priv->ndev, skb->len);
-+
-+	spin_lock(&priv->tx_queue_lock);
-+	pend_tx = netsec_get_tx_avail_num(priv);
-+
-+	if (pend_tx < NETSEC_NETDEV_TX_PKT_SCAT_NUM_MAX) {
-+		netsec_ring_irq_enable(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+		netif_stop_queue(ndev);
-+		goto err;
-+	}
-+	if (pend_tx <= DESC_NUM - 2) {
-+		netsec_ring_irq_enable(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+		goto err;
-+	}
-+	netsec_ring_irq_disable(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+
-+err:
-+	spin_unlock(&priv->tx_queue_lock);
-+
-+	return NETDEV_TX_OK;
-+}
-+
-+static int netsec_netdev_set_features(struct net_device *ndev,
-+				      netdev_features_t features)
-+{
-+	struct netsec_priv *priv = netdev_priv(ndev);
-+
-+	priv->rx_cksum_offload_flag = !!(features & NETIF_F_RXCSUM);
-+
-+	return 0;
-+}
-+
-+static void netsec_phy_adjust_link(struct net_device *ndev)
-+{
-+	struct netsec_priv *priv = netdev_priv(ndev);
-+
-+	if (priv->actual_link_speed == ndev->phydev->speed &&
-+	    priv->actual_duplex == ndev->phydev->duplex)
-+		return;
-+
-+	phy_print_status(ndev->phydev);
-+
-+	netsec_stop_gmac(priv);
-+	netsec_start_gmac(priv);
-+}
-+
-+static irqreturn_t netsec_irq_handler(int irq, void *dev_id)
-+{
-+	struct netsec_priv *priv = dev_id;
-+	u32 status = netsec_readl(priv, NETSEC_REG_TOP_STATUS) &
-+		     netsec_readl(priv, NETSEC_REG_TOP_INTEN);
-+
-+	if (!status)
-+		return IRQ_NONE;
-+
-+	if (status & (NETSEC_IRQ_TX | NETSEC_IRQ_RX)) {
-+		netsec_writel(priv, NETSEC_REG_INTEN_CLR,
-+			      status & (NETSEC_IRQ_TX | NETSEC_IRQ_RX));
-+		napi_schedule(&priv->napi);
-+	}
-+
-+	return IRQ_HANDLED;
-+}
-+
-+static void netsec_reset_hardware(struct netsec_priv *priv)
-+{
-+	/* stop DMA engines */
-+	if (!netsec_readl(priv, NETSEC_REG_ADDR_DIS_CORE)) {
-+		netsec_writel(priv, NETSEC_REG_DMA_HM_CTRL,
-+			      NETSEC_DMA_CTRL_REG_STOP);
-+		netsec_writel(priv, NETSEC_REG_DMA_MH_CTRL,
-+			      NETSEC_DMA_CTRL_REG_STOP);
-+
-+		while (netsec_readl(priv, NETSEC_REG_DMA_HM_CTRL) &
-+		       NETSEC_DMA_CTRL_REG_STOP)
-+			cpu_relax();
-+
-+		while (netsec_readl(priv, NETSEC_REG_DMA_MH_CTRL) &
-+		       NETSEC_DMA_CTRL_REG_STOP)
-+			cpu_relax();
-+	}
-+
-+	netsec_writel(priv, NETSEC_REG_SOFT_RST, NETSEC_SOFT_RST_REG_RESET);
-+	netsec_writel(priv, NETSEC_REG_SOFT_RST, NETSEC_SOFT_RST_REG_RUN);
-+	netsec_writel(priv, NETSEC_REG_COM_INIT, NETSEC_COM_INIT_REG_ALL);
-+
-+	while (netsec_readl(priv, NETSEC_REG_COM_INIT) != 0)
-+		cpu_relax();
-+}
-+
-+static int netsec_netdev_open(struct net_device *ndev)
-+{
-+	struct netsec_priv *priv = netdev_priv(ndev);
-+	int ret, n;
-+
-+	pm_runtime_get_sync(priv->dev);
-+
-+	netsec_reset_hardware(priv);
-+
-+	for (n = 0; n <= NETSEC_RING_MAX; n++) {
-+		ret = netsec_alloc_desc_ring(priv, n);
-+		if (ret) {
-+			netif_err(priv, probe, priv->ndev,
-+				  "%s: alloc ring failed\n", __func__);
-+			goto err;
-+		}
-+	}
-+
-+	ret = netsec_setup_rx_desc(priv, &priv->desc_ring[NETSEC_RING_RX]);
-+	if (ret) {
-+		netif_err(priv, probe, priv->ndev,
-+			  "%s: fail setup ring\n", __func__);
-+		goto err1;
-+	}
-+
-+	ret = netsec_init_hardware(priv);
-+	if (ret) {
-+		netif_err(priv, probe, priv->ndev,
-+			  "%s: netsec_init_hardware fail %d\n", __func__, ret);
-+		goto err1;
-+	}
-+
-+	ret = request_irq(priv->ndev->irq, netsec_irq_handler,
-+			  IRQF_SHARED, "netsec", priv);
-+	if (ret) {
-+		netif_err(priv, drv, priv->ndev, "request_irq failed\n");
-+		goto err1;
-+	}
-+	priv->irq_registered = true;
-+
-+	ret = netsec_clean_rx_desc_ring(priv);
-+	if (ret) {
-+		netif_err(priv, drv, priv->ndev,
-+			  "%s: clean rx desc fail\n", __func__);
-+		goto err2;
-+	}
-+
-+	ret = netsec_clean_tx_desc_ring(priv);
-+	if (ret) {
-+		netif_err(priv, drv, priv->ndev,
-+			  "%s: clean tx desc fail\n", __func__);
-+		goto err2;
-+	}
-+
-+	netsec_ring_irq_clr(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+
-+	if (dev_of_node(priv->dev)) {
-+		if (!of_phy_connect(priv->ndev, priv->phy_np,
-+				    netsec_phy_adjust_link, 0,
-+				    priv->phy_interface)) {
-+			netif_err(priv, link, priv->ndev, "missing PHY\n");
-+			goto err2;
-+		}
-+	} else {
-+		ret = phy_connect_direct(priv->ndev, priv->phydev,
-+					 netsec_phy_adjust_link,
-+					 priv->phy_interface);
-+		if (ret) {
-+			netif_err(priv, link, priv->ndev,
-+				  "phy_connect_direct() failed (%d)\n", ret);
-+			goto err2;
-+		}
-+	}
-+
-+	phy_start_aneg(ndev->phydev);
-+
-+	netsec_ring_irq_disable(priv, NETSEC_RING_TX, NETSEC_IRQ_EMPTY);
-+
-+	netsec_start_gmac(priv);
-+	napi_enable(&priv->napi);
-+	netif_start_queue(ndev);
-+
-+	netsec_writel(priv, NETSEC_REG_INTEN_SET,
-+		      NETSEC_IRQ_TX | NETSEC_IRQ_RX);
-+
-+	return 0;
-+
-+err2:
-+	pm_runtime_put_sync(priv->dev);
-+	free_irq(priv->ndev->irq, priv);
-+	priv->irq_registered = false;
-+err1:
-+	for (n = 0; n <= NETSEC_RING_MAX; n++)
-+		netsec_free_desc_ring(priv, &priv->desc_ring[n]);
-+err:
-+	pm_runtime_put_sync(priv->dev);
-+
-+	return ret;
-+}
-+
-+static int netsec_netdev_stop(struct net_device *ndev)
-+{
-+	struct netsec_priv *priv = netdev_priv(ndev);
-+	int n;
-+
-+	phy_stop(ndev->phydev);
-+	phy_disconnect(ndev->phydev);
-+
-+	netif_stop_queue(priv->ndev);
-+	napi_disable(&priv->napi);
-+
-+	netsec_writel(priv, NETSEC_REG_INTEN_CLR, ~0);
-+	netsec_stop_gmac(priv);
-+
-+	pm_runtime_put_sync(priv->dev);
-+
-+	for (n = 0; n <= NETSEC_RING_MAX; n++)
-+		netsec_free_desc_ring(priv, &priv->desc_ring[n]);
-+
-+	free_irq(priv->ndev->irq, priv);
-+	priv->irq_registered = false;
-+
-+	return 0;
-+}
-+
-+const struct net_device_ops netsec_netdev_ops = {
-+	.ndo_open		= netsec_netdev_open,
-+	.ndo_stop		= netsec_netdev_stop,
-+	.ndo_start_xmit		= netsec_netdev_start_xmit,
-+	.ndo_set_features	= netsec_netdev_set_features,
-+	.ndo_set_mac_address    = eth_mac_addr,
-+	.ndo_validate_addr	= eth_validate_addr,
-+};
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec_platform.c b/drivers/net/ethernet/socionext/netsec/netsec_platform.c
-new file mode 100644
-index 0000000..624f6a7
---- /dev/null
-+++ b/drivers/net/ethernet/socionext/netsec/netsec_platform.c
-@@ -0,0 +1,435 @@
-+/**
-+ * drivers/net/ethernet/socionext/netsec/netsec_platform.c
-+ *
-+ *  Copyright (C) 2013-2014 Fujitsu Semiconductor Limited.
-+ *  Copyright (C) 2014-2017 Linaro Ltd. All rights reserved.
-+ *     Andy Green <andy.green@linaro.org>
-+ *     Jassi Brar <jaswinder.singh@linaro.org>
-+ *     Ard Biesheuvel <ard.biesheuvel@linaro.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or
-+ *  modify it under the terms of the GNU General Public License
-+ *  as published by the Free Software Foundation; either version 2
-+ *  of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/acpi.h>
-+#include <linux/device.h>
-+#include <linux/ctype.h>
-+#include <linux/netdevice.h>
-+#include <linux/types.h>
-+#include <linux/bitops.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/module.h>
-+#include <linux/sizes.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/of_net.h>
-+#include <linux/io.h>
-+#include <linux/pm_runtime.h>
-+
-+#include "netsec.h"
-+
-+#define NETSEC_F_NETSEC_VER_MAJOR_NUM(x) (x & 0xffff0000)
-+
-+static int napi_weight = 64;
-+static u16 pause_time = 256;
-+
-+static int netsec_of_probe(struct platform_device *pdev,
-+			   struct netsec_priv *priv)
-+{
-+	int clk_count, ret, i;
-+
-+	priv->phy_np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
-+	if (!priv->phy_np) {
-+		dev_err(&pdev->dev, "missing required property 'phy-handle'\n");
-+		return -EINVAL;
-+	}
-+
-+	/* we require named clocks if there is more than one */
-+	clk_count = of_property_count_strings(pdev->dev.of_node, "clock-names");
-+	if (clk_count > 1) {
-+		if (clk_count > ARRAY_SIZE(priv->clk)) {
-+			dev_err(&pdev->dev, "too many clocks specified (%d)\n",
-+				clk_count);
-+			return -EINVAL;
-+		}
-+
-+		for (i = 0; i < clk_count; i++) {
-+			const char *clk_name;
-+
-+			ret = of_property_read_string_index(pdev->dev.of_node,
-+							    "clock-names", i,
-+							    &clk_name);
-+			if (ret) {
-+				dev_err(&pdev->dev,
-+					"failed to parse 'clock-names'\n");
-+				return ret;
-+			}
-+			priv->clk[i] = devm_clk_get(&pdev->dev, clk_name);
-+			if (!strcmp(clk_name, "phy_refclk")) {
-+				priv->freq = clk_get_rate(priv->clk[i]);
-+				dev_dbg(&pdev->dev,
-+					"found PHY refclock #%d freq %u\n",
-+					i, priv->freq);
-+			}
-+		}
-+		priv->clock_count = clk_count;
-+	} else {
-+		priv->clk[0] = devm_clk_get(&pdev->dev, NULL);
-+		if (IS_ERR(priv->clk)) {
-+			dev_err(&pdev->dev,
-+				"missing required property 'clocks'\n");
-+			return PTR_ERR(priv->clk);
-+		}
-+		priv->freq = clk_get_rate(priv->clk[0]);
-+		priv->clock_count = 1;
-+	}
-+	return 0;
-+}
-+
-+static int netsec_acpi_probe(struct platform_device *pdev,
-+			     struct netsec_priv *priv, u32 *phy_addr)
-+{
-+	int ret;
-+
-+	if (!IS_ENABLED(CONFIG_ACPI))
-+		return -ENODEV;
-+
-+	ret = device_property_read_u32(&pdev->dev, "phy-channel", phy_addr);
-+	if (ret) {
-+		dev_err(&pdev->dev,
-+			"missing required property 'phy-channel'\n");
-+		return ret;
-+	}
-+
-+	ret = device_property_read_u32(&pdev->dev,
-+				       "socionext,phy-clock-frequency",
-+				       &priv->freq);
-+	if (ret)
-+		dev_err(&pdev->dev,
-+			"missing required property 'socionext,phy-clock-frequency'\n");
-+	return ret;
-+}
-+
-+static int netsec_probe(struct platform_device *pdev)
-+{
-+	struct net_device *ndev;
-+	struct netsec_priv *priv;
-+	struct resource *mmio_res, *eeprom_res, *irq_res;
-+	u8 *mac, macbuf[ETH_ALEN];
-+	u32 hw_ver, phy_addr;
-+	int ret;
-+
-+	mmio_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+	if (!mmio_res) {
-+		dev_err(&pdev->dev, "No MMIO resource found.\n");
-+		return -ENODEV;
-+	}
-+
-+	eeprom_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+	if (!eeprom_res) {
-+		dev_info(&pdev->dev, "No EEPROM resource found.\n");
-+		return -ENODEV;
-+	}
-+
-+	irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+	if (!irq_res) {
-+		dev_err(&pdev->dev, "No IRQ resource found.\n");
-+		return -ENODEV;
-+	}
-+
-+	ndev = alloc_etherdev(sizeof(*priv));
-+	if (!ndev)
-+		return -ENOMEM;
-+
-+	priv = netdev_priv(ndev);
-+	priv->ndev = ndev;
-+	SET_NETDEV_DEV(ndev, &pdev->dev);
-+	platform_set_drvdata(pdev, priv);
-+	priv->dev = &pdev->dev;
-+
-+	priv->msg_enable = NETIF_MSG_TX_ERR | NETIF_MSG_HW | NETIF_MSG_DRV |
-+			   NETIF_MSG_LINK | NETIF_MSG_PROBE;
-+
-+	ndev->irq = irq_res->start;
-+
-+	priv->phy_interface = device_get_phy_mode(&pdev->dev);
-+	if (priv->phy_interface < 0) {
-+		dev_err(&pdev->dev, "missing required property 'phy-mode'\n");
-+		ret = -ENODEV;
-+		goto free_ndev;
-+	}
-+
-+	priv->ioaddr = devm_ioremap(&pdev->dev, mmio_res->start,
-+				    resource_size(mmio_res));
-+	if (!priv->ioaddr) {
-+		dev_err(&pdev->dev, "devm_ioremap() failed\n");
-+		ret = -ENXIO;
-+		goto free_ndev;
-+	}
-+
-+	priv->eeprom_base = devm_memremap(&pdev->dev, eeprom_res->start,
-+					  resource_size(eeprom_res),
-+					  MEMREMAP_WT);
-+	if (!priv->eeprom_base) {
-+		dev_err(&pdev->dev, "devm_memremap() failed for EEPROM\n");
-+		ret = -ENXIO;
-+		goto free_ndev;
-+	}
-+
-+	mac = device_get_mac_address(&pdev->dev, macbuf, sizeof(macbuf));
-+	if (mac)
-+		ether_addr_copy(ndev->dev_addr, mac);
-+
-+	if (priv->eeprom_base &&
-+	    (!mac || !is_valid_ether_addr(ndev->dev_addr))) {
-+		const u8 *macp = priv->eeprom_base + NETSEC_EEPROM_MAC_ADDRESS;
-+
-+		ndev->dev_addr[0] = macp[3];
-+		ndev->dev_addr[1] = macp[2];
-+		ndev->dev_addr[2] = macp[1];
-+		ndev->dev_addr[3] = macp[0];
-+		ndev->dev_addr[4] = macp[7];
-+		ndev->dev_addr[5] = macp[6];
-+	}
-+
-+	if (!is_valid_ether_addr(ndev->dev_addr)) {
-+		dev_warn(&pdev->dev, "No MAC address found, using random\n");
-+		eth_hw_addr_random(ndev);
-+	}
-+
-+	if (dev_of_node(&pdev->dev))
-+		ret = netsec_of_probe(pdev, priv);
-+	else
-+		ret = netsec_acpi_probe(pdev, priv, &phy_addr);
-+	if (ret)
-+		goto free_ndev;
-+
-+	if (!priv->freq) {
-+		dev_err(&pdev->dev, "missing PHY reference clock frequency\n");
-+		ret = -ENODEV;
-+		goto free_ndev;
-+	}
-+
-+	/* disable by default */
-+	priv->et_coalesce.rx_coalesce_usecs = 0;
-+	priv->et_coalesce.rx_max_coalesced_frames = 1;
-+	priv->et_coalesce.tx_coalesce_usecs = 0;
-+	priv->et_coalesce.tx_max_coalesced_frames = 1;
-+
-+	ret = device_property_read_u32(&pdev->dev, "max-frame-size",
-+				       &ndev->max_mtu);
-+	if (ret < 0)
-+		ndev->max_mtu = ETH_DATA_LEN;
-+
-+	priv->rx_pkt_buf_len = ndev->max_mtu + 22;
-+	priv->param.use_jumbo_pkt_flag = (ndev->max_mtu > ETH_DATA_LEN);
-+
-+	pm_runtime_enable(&pdev->dev);
-+	/* runtime_pm coverage just for probe, open/close also cover it */
-+	pm_runtime_get_sync(&pdev->dev);
-+
-+	hw_ver = netsec_readl(priv, NETSEC_REG_F_TAIKI_VER);
-+	/* this driver only supports F_TAIKI style NETSEC */
-+	if (NETSEC_F_NETSEC_VER_MAJOR_NUM(hw_ver) !=
-+	    NETSEC_F_NETSEC_VER_MAJOR_NUM(NETSEC_REG_NETSEC_VER_F_TAIKI)) {
-+		ret = -ENODEV;
-+		goto pm_disable;
-+	}
-+
-+	dev_info(&pdev->dev, "hardware revision %d.%d\n",
-+		 hw_ver >> 16, hw_ver & 0xffff);
-+
-+	priv->mac_mode.flow_start_th = NETSEC_FLOW_CONTROL_START_THRESHOLD;
-+	priv->mac_mode.flow_stop_th = NETSEC_FLOW_CONTROL_STOP_THRESHOLD;
-+	priv->mac_mode.pause_time = pause_time;
-+	priv->mac_mode.flow_ctrl_enable_flag = false;
-+
-+	netif_napi_add(ndev, &priv->napi, netsec_netdev_napi_poll, napi_weight);
-+
-+	ndev->netdev_ops = &netsec_netdev_ops;
-+	ndev->ethtool_ops = &netsec_ethtool_ops;
-+	ndev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
-+			 NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_GSO |
-+			 NETIF_F_HIGHDMA | NETIF_F_RXCSUM;
-+	ndev->hw_features = ndev->features;
-+
-+	priv->rx_cksum_offload_flag = true;
-+	spin_lock_init(&priv->tx_queue_lock);
-+
-+	ret = netsec_mii_register(priv);
-+	if (ret) {
-+		dev_err(&pdev->dev, "mii bus registration failed (%d)\n", ret);
-+		goto pm_disable;
-+	}
-+
-+	if (!dev_of_node(&pdev->dev)) { /* ACPI */
-+		priv->phydev = get_phy_device(priv->mii_bus, phy_addr, false);
-+		if (IS_ERR(priv->phydev)) {
-+			dev_err(&pdev->dev, "get_phy_device() failed (%ld)\n",
-+				PTR_ERR(priv->phydev));
-+			ret = PTR_ERR(priv->phydev);
-+			goto unregister_mii;
-+		}
-+
-+		ret = phy_device_register(priv->phydev);
-+		if (ret) {
-+			dev_err(&pdev->dev,
-+				"phy_device_register() failed (%d)\n", ret);
-+			phy_device_free(priv->phydev);
-+			goto unregister_mii;
-+		}
-+	}
-+
-+	/* disable all other interrupt sources */
-+	netsec_writel(priv, NETSEC_REG_INTEN_CLR, ~0);
-+	netsec_writel(priv, NETSEC_REG_INTEN_SET,
-+		      NETSEC_IRQ_TX | NETSEC_IRQ_RX);
-+
-+	if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)))
-+		dev_warn(&pdev->dev, "Failed to enable 64-bit DMA\n");
-+
-+	ret = register_netdev(ndev);
-+	if (ret) {
-+		netif_err(priv, probe, ndev, "register_netdev() failed\n");
-+		goto unregister_mii;
-+	}
-+
-+	pm_runtime_put_sync_suspend(&pdev->dev);
-+
-+	return 0;
-+
-+unregister_mii:
-+	netsec_mii_unregister(priv);
-+
-+pm_disable:
-+	pm_runtime_put_sync_suspend(&pdev->dev);
-+	pm_runtime_disable(&pdev->dev);
-+
-+free_ndev:
-+	free_netdev(ndev);
-+
-+	dev_err(&pdev->dev, "init failed\n");
-+
-+	return ret;
-+}
-+
-+static int netsec_remove(struct platform_device *pdev)
-+{
-+	struct netsec_priv *priv = platform_get_drvdata(pdev);
-+
-+	unregister_netdev(priv->ndev);
-+	if (!dev_of_node(&pdev->dev)) { /* ACPI */
-+		phy_device_remove(priv->phydev);
-+		phy_device_free(priv->phydev);
-+	}
-+	netsec_mii_unregister(priv);
-+	pm_runtime_disable(&pdev->dev);
-+	free_netdev(priv->ndev);
-+
-+	return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int netsec_runtime_suspend(struct device *dev)
-+{
-+	struct netsec_priv *priv = dev_get_drvdata(dev);
-+	int n;
-+
-+	netif_dbg(priv, drv, priv->ndev, "%s\n", __func__);
-+
-+	if (priv->irq_registered)
-+		disable_irq(priv->ndev->irq);
-+
-+	netsec_writel(priv, NETSEC_REG_CLK_EN, 0);
-+
-+	for (n = priv->clock_count - 1; n >= 0; n--)
-+		clk_disable_unprepare(priv->clk[n]);
-+
-+	return 0;
-+}
-+
-+static int netsec_runtime_resume(struct device *dev)
-+{
-+	struct netsec_priv *priv = dev_get_drvdata(dev);
-+	int n;
-+
-+	netif_dbg(priv, drv, priv->ndev, "%s\n", __func__);
-+
-+	/* first let the clocks back on */
-+
-+	for (n = 0; n < priv->clock_count; n++)
-+		clk_prepare_enable(priv->clk[n]);
-+
-+	netsec_writel(priv, NETSEC_REG_CLK_EN, NETSEC_CLK_EN_REG_DOM_D |
-+					       NETSEC_CLK_EN_REG_DOM_C |
-+					       NETSEC_CLK_EN_REG_DOM_G);
-+
-+	if (priv->irq_registered)
-+		enable_irq(priv->ndev->irq);
-+
-+	return 0;
-+}
-+
-+static int netsec_pm_suspend(struct device *dev)
-+{
-+	struct netsec_priv *priv = dev_get_drvdata(dev);
-+
-+	netif_dbg(priv, drv, priv->ndev, "%s\n", __func__);
-+
-+	if (pm_runtime_status_suspended(dev))
-+		return 0;
-+
-+	return netsec_runtime_suspend(dev);
-+}
-+
-+static int netsec_pm_resume(struct device *dev)
-+{
-+	struct netsec_priv *priv = dev_get_drvdata(dev);
-+
-+	netif_dbg(priv, drv, priv->ndev, "%s\n", __func__);
-+
-+	if (pm_runtime_status_suspended(dev))
-+		return 0;
-+
-+	return netsec_runtime_resume(dev);
-+}
-+#endif
-+
-+static const struct dev_pm_ops netsec_pm_ops = {
-+	SET_SYSTEM_SLEEP_PM_OPS(netsec_pm_suspend, netsec_pm_resume)
-+	SET_RUNTIME_PM_OPS(netsec_runtime_suspend, netsec_runtime_resume, NULL)
-+};
-+
-+static const struct of_device_id netsec_dt_ids[] = {
-+	{ .compatible = "socionext,synquacer-netsec" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(of, netsec_dt_ids);
-+
-+#ifdef CONFIG_ACPI
-+static const struct acpi_device_id netsec_acpi_ids[] = {
-+	{ "SCX0001" },
-+	{ }
-+};
-+MODULE_DEVICE_TABLE(acpi, netsec_acpi_ids);
-+#endif
-+
-+static struct platform_driver netsec_driver = {
-+	.probe				= netsec_probe,
-+	.remove				= netsec_remove,
-+	.driver.name			= "netsec",
-+	.driver.of_match_table		= netsec_dt_ids,
-+	.driver.acpi_match_table	= ACPI_PTR(netsec_acpi_ids),
-+	.driver.pm			= &netsec_pm_ops,
-+};
-+module_platform_driver(netsec_driver);
-+
-+MODULE_AUTHOR("Andy Green <andy.green@linaro.org>");
-+MODULE_AUTHOR("Jassi Brar <jaswinder.singh@linaro.org>");
-+MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
-+MODULE_DESCRIPTION("NETSEC Ethernet driver");
-+MODULE_LICENSE("GPL");
--- 
-cgit v1.1
-
-From 31a61532e7b859a797d36595ec5ab7485a9b24d5 Mon Sep 17 00:00:00 2001
-From: Jassi Brar <jassisinghbrar@gmail.com>
-Date: Wed, 30 Aug 2017 15:55:52 +0530
-Subject: dt-bindings: net: Add DT bindings for Socionext Netsec
-
-This patch adds documentation for Device-Tree bindings for the
-Socionext NetSec Controller driver.
-
-Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
-Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
----
- .../devicetree/bindings/net/socionext-netsec.txt   | 43 ++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/net/socionext-netsec.txt
-
-diff --git a/Documentation/devicetree/bindings/net/socionext-netsec.txt b/Documentation/devicetree/bindings/net/socionext-netsec.txt
-new file mode 100644
-index 0000000..4695969
---- /dev/null
-+++ b/Documentation/devicetree/bindings/net/socionext-netsec.txt
-@@ -0,0 +1,43 @@
-+* Socionext NetSec Ethernet Controller IP
-+
-+Required properties:
-+- compatible: Should be "socionext,synquacer-netsec"
-+- reg: Address and length of the control register area, followed by the
-+       address and length of the EEPROM holding the MAC address and
-+       microengine firmware
-+- interrupts: Should contain ethernet controller interrupt
-+- clocks: phandle to the PHY reference clock, and any other clocks to be
-+          switched by runtime_pm
-+- clock-names: Required only if more than a single clock is listed in 'clocks'.
-+               The PHY reference clock must be named 'phy_refclk'
-+- phy-mode: See ethernet.txt file in the same directory
-+- phy-handle: phandle to select child phy
-+
-+Optional properties: (See ethernet.txt file in the same directory)
-+- local-mac-address
-+- mac-address
-+- max-speed
-+- max-frame-size
-+
-+Required properties for the child phy:
-+- reg: phy address
-+
-+Example:
-+	eth0: netsec@522D0000 {
-+		compatible = "socionext,synquacer-netsec";
-+		reg = <0 0x522D0000 0x0 0x10000>, <0 0x10000000 0x0 0x10000>;
-+		interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;
-+		clocks = <&clk_netsec>;
-+		phy-mode = "rgmii";
-+		max-speed = <1000>;
-+		max-frame-size = <9000>;
-+		phy-handle = <&ethphy0>;
-+
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		ethphy0: ethernet-phy@1 {
-+			compatible = "ethernet-phy-ieee802.3-c22";
-+			reg = <1>;
-+		};
-+	};
--- 
-cgit v1.1
-
-From d2fc584f8237746a84e6ec8690d8884f148fc449 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 10 Oct 2017 11:35:51 +0100
-Subject: [PATCH] add interrupt.h, sort alphabetically
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- drivers/net/ethernet/socionext/netsec/netsec_platform.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/net/ethernet/socionext/netsec/netsec_platform.c b/drivers/net/ethernet/socionext/netsec/netsec_platform.c
-index 624f6a7093f6..79072bae917d 100644
---- a/drivers/net/ethernet/socionext/netsec/netsec_platform.c
-+++ b/drivers/net/ethernet/socionext/netsec/netsec_platform.c
-@@ -14,21 +14,22 @@
-  */
- 
- #include <linux/acpi.h>
--#include <linux/device.h>
--#include <linux/ctype.h>
--#include <linux/netdevice.h>
--#include <linux/types.h>
- #include <linux/bitops.h>
-+#include <linux/clk.h>
-+#include <linux/ctype.h>
-+#include <linux/device.h>
- #include <linux/dma-mapping.h>
-+#include <linux/io.h>
-+#include <linux/interrupt.h>
- #include <linux/module.h>
--#include <linux/sizes.h>
--#include <linux/platform_device.h>
--#include <linux/clk.h>
-+#include <linux/netdevice.h>
- #include <linux/of.h>
- #include <linux/of_device.h>
- #include <linux/of_net.h>
--#include <linux/io.h>
-+#include <linux/platform_device.h>
- #include <linux/pm_runtime.h>
-+#include <linux/sizes.h>
-+#include <linux/types.h>
- 
- #include "netsec.h"
- 
--- 
-2.14.2
-
diff --git a/configs/fedora/debug/CONFIG_BPF_KPROBE_OVERRIDE b/configs/fedora/debug/CONFIG_BPF_KPROBE_OVERRIDE
new file mode 100644
index 000000000..cf1d8d5bb
--- /dev/null
+++ b/configs/fedora/debug/CONFIG_BPF_KPROBE_OVERRIDE
@@ -0,0 +1 @@
+CONFIG_BPF_KPROBE_OVERRIDE=y
diff --git a/configs/fedora/debug/CONFIG_FAIL_FUNCTION b/configs/fedora/debug/CONFIG_FAIL_FUNCTION
new file mode 100644
index 000000000..f41816ded
--- /dev/null
+++ b/configs/fedora/debug/CONFIG_FAIL_FUNCTION
@@ -0,0 +1 @@
+CONFIG_FAIL_FUNCTION=y
diff --git a/configs/fedora/generic/CONFIG_ATH10K_SPECTRAL b/configs/fedora/generic/CONFIG_ATH10K_SPECTRAL
new file mode 100644
index 000000000..8bc1582c6
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH10K_SPECTRAL
@@ -0,0 +1 @@
+# CONFIG_ATH10K_SPECTRAL is not set
diff --git a/configs/fedora/generic/CONFIG_ATH9K_COMMON_SPECTRAL b/configs/fedora/generic/CONFIG_ATH9K_COMMON_SPECTRAL
new file mode 100644
index 000000000..48a795914
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ATH9K_COMMON_SPECTRAL
@@ -0,0 +1 @@
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
diff --git a/configs/fedora/generic/CONFIG_CHELSIO_IPSEC_INLINE b/configs/fedora/generic/CONFIG_CHELSIO_IPSEC_INLINE
new file mode 100644
index 000000000..729e6efde
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_CHELSIO_IPSEC_INLINE
@@ -0,0 +1 @@
+CONFIG_CHELSIO_IPSEC_INLINE=y
diff --git a/configs/fedora/generic/CONFIG_DM_UNSTRIPED b/configs/fedora/generic/CONFIG_DM_UNSTRIPED
new file mode 100644
index 000000000..27e4d2352
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DM_UNSTRIPED
@@ -0,0 +1 @@
+CONFIG_DM_UNSTRIPED=m
diff --git a/configs/fedora/generic/CONFIG_GPIO_PCIE_IDIO_24 b/configs/fedora/generic/CONFIG_GPIO_PCIE_IDIO_24
new file mode 100644
index 000000000..6313cc61d
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_GPIO_PCIE_IDIO_24
@@ -0,0 +1 @@
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
diff --git a/configs/fedora/generic/CONFIG_HID_JABRA b/configs/fedora/generic/CONFIG_HID_JABRA
new file mode 100644
index 000000000..c93fae8a6
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_HID_JABRA
@@ -0,0 +1 @@
+CONFIG_HID_JABRA=m
diff --git a/configs/fedora/generic/CONFIG_HW_RANDOM_TPM b/configs/fedora/generic/CONFIG_HW_RANDOM_TPM
index 51b6ac9cb..d991b3c93 100644
--- a/configs/fedora/generic/CONFIG_HW_RANDOM_TPM
+++ b/configs/fedora/generic/CONFIG_HW_RANDOM_TPM
@@ -1 +1 @@
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
diff --git a/configs/fedora/generic/CONFIG_IP6_NF_MATCH_SRH b/configs/fedora/generic/CONFIG_IP6_NF_MATCH_SRH
new file mode 100644
index 000000000..c90ba3ec7
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_IP6_NF_MATCH_SRH
@@ -0,0 +1 @@
+CONFIG_IP6_NF_MATCH_SRH=m
diff --git a/configs/fedora/generic/CONFIG_LEDS_LM3692X b/configs/fedora/generic/CONFIG_LEDS_LM3692X
new file mode 100644
index 000000000..f31f9cb8a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_LEDS_LM3692X
@@ -0,0 +1 @@
+CONFIG_LEDS_LM3692X=m
diff --git a/configs/fedora/generic/CONFIG_LEDS_TRIGGER_NETDEV b/configs/fedora/generic/CONFIG_LEDS_TRIGGER_NETDEV
new file mode 100644
index 000000000..890e0a4ba
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_LEDS_TRIGGER_NETDEV
@@ -0,0 +1 @@
+CONFIG_LEDS_TRIGGER_NETDEV=m
diff --git a/configs/fedora/generic/CONFIG_MT76x2E b/configs/fedora/generic/CONFIG_MT76x2E
new file mode 100644
index 000000000..9667d0d96
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_MT76x2E
@@ -0,0 +1 @@
+CONFIG_MT76x2E=m
diff --git a/configs/fedora/generic/CONFIG_NETDEVSIM b/configs/fedora/generic/CONFIG_NETDEVSIM
new file mode 100644
index 000000000..f7666c533
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NETDEVSIM
@@ -0,0 +1 @@
+# CONFIG_NETDEVSIM is not set
diff --git a/configs/fedora/generic/CONFIG_NET_DSA_LEGACY b/configs/fedora/generic/CONFIG_NET_DSA_LEGACY
new file mode 100644
index 000000000..76080523a
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_DSA_LEGACY
@@ -0,0 +1 @@
+# CONFIG_NET_DSA_LEGACY is not set
diff --git a/configs/fedora/generic/CONFIG_NET_VENDOR_CORTINA b/configs/fedora/generic/CONFIG_NET_VENDOR_CORTINA
new file mode 100644
index 000000000..3e188cd81
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_VENDOR_CORTINA
@@ -0,0 +1 @@
+# CONFIG_NET_VENDOR_CORTINA is not set
diff --git a/configs/fedora/generic/CONFIG_NET_VENDOR_SOCIONEXT b/configs/fedora/generic/CONFIG_NET_VENDOR_SOCIONEXT
new file mode 100644
index 000000000..7e4d43ba5
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NET_VENDOR_SOCIONEXT
@@ -0,0 +1 @@
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
diff --git a/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD b/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD
new file mode 100644
index 000000000..2960ce593
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NFT_FLOW_OFFLOAD
@@ -0,0 +1 @@
+CONFIG_NFT_FLOW_OFFLOAD=m
diff --git a/configs/fedora/generic/CONFIG_NF_FLOW_TABLE b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE
new file mode 100644
index 000000000..a2b5e03a7
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE
@@ -0,0 +1 @@
+CONFIG_NF_FLOW_TABLE=m
diff --git a/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET
new file mode 100644
index 000000000..f41129cf1
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_INET
@@ -0,0 +1 @@
+CONFIG_NF_FLOW_TABLE_INET=m
diff --git a/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4 b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4
new file mode 100644
index 000000000..413b7910e
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV4
@@ -0,0 +1 @@
+CONFIG_NF_FLOW_TABLE_IPV4=m
diff --git a/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6 b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6
new file mode 100644
index 000000000..d482fc459
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_NF_FLOW_TABLE_IPV6
@@ -0,0 +1 @@
+CONFIG_NF_FLOW_TABLE_IPV6=m
diff --git a/configs/fedora/generic/CONFIG_PINCTRL_AXP209 b/configs/fedora/generic/CONFIG_PINCTRL_AXP209
new file mode 100644
index 000000000..4e6ecd9bf
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_PINCTRL_AXP209
@@ -0,0 +1 @@
+# CONFIG_PINCTRL_AXP209 is not set
diff --git a/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET b/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET
new file mode 100644
index 000000000..2af33e19f
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_GEMINI_ETHERNET
@@ -0,0 +1 @@
+CONFIG_GEMINI_ETHERNET=m
diff --git a/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA b/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA
new file mode 100644
index 000000000..4dbaa1244
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_NET_VENDOR_CORTINA
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_CORTINA=y
diff --git a/configs/fedora/generic/arm/CONFIG_PINCTRL_AXP209 b/configs/fedora/generic/arm/CONFIG_PINCTRL_AXP209
new file mode 100644
index 000000000..6ccab1d44
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_PINCTRL_AXP209
@@ -0,0 +1 @@
+CONFIG_PINCTRL_AXP209=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_RAS_EXTN b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_RAS_EXTN
new file mode 100644
index 000000000..b664a0de1
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_RAS_EXTN
@@ -0,0 +1 @@
+CONFIG_ARM64_RAS_EXTN=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM_DSU_PMU b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_DSU_PMU
new file mode 100644
index 000000000..383292c89
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_DSU_PMU
@@ -0,0 +1 @@
+CONFIG_ARM_DSU_PMU=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ARM_SDE_INTERFACE b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_SDE_INTERFACE
new file mode 100644
index 000000000..b33609158
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARM_SDE_INTERFACE
@@ -0,0 +1 @@
+CONFIG_ARM_SDE_INTERFACE=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CAVIUM_PTP b/configs/fedora/generic/arm/aarch64/CONFIG_CAVIUM_PTP
new file mode 100644
index 000000000..271967f8a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CAVIUM_PTP
@@ -0,0 +1 @@
+CONFIG_CAVIUM_PTP=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SHA3_ARM64 b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SHA3_ARM64
new file mode 100644
index 000000000..52d5aeaab
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SHA3_ARM64
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA3_ARM64=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SHA512_ARM64_CE b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SHA512_ARM64_CE
new file mode 100644
index 000000000..3a159ef93
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SHA512_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SM3_ARM64_CE b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SM3_ARM64_CE
new file mode 100644
index 000000000..93a6a00f4
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_SM3_ARM64_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_SM3_ARM64_CE=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_SOCIONEXT b/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_SOCIONEXT
new file mode 100644
index 000000000..213e48587
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_SOCIONEXT
@@ -0,0 +1 @@
+CONFIG_NET_VENDOR_SOCIONEXT=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SNI_AVE b/configs/fedora/generic/arm/aarch64/CONFIG_SNI_AVE
new file mode 100644
index 000000000..d9f95b233
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SNI_AVE
@@ -0,0 +1 @@
+# CONFIG_SNI_AVE is not set
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_HW_RANDOM_EXYNOS b/configs/fedora/generic/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
new file mode 100644
index 000000000..87c25300c
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_HW_RANDOM_EXYNOS
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_EXYNOS=m
diff --git a/gitrev b/gitrev
index c5b4eceb3..edc667275 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-3da90b159b146672f830bcd2489dd3a1f4e9e089
+255442c93843f52b6891b21d0b485bf2c97f93c3
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0797264ac..78d9423b8 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -337,6 +337,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -350,6 +351,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -602,6 +604,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -771,6 +774,7 @@ CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 CONFIG_CAVIUM_ERRATUM_30115=y
+CONFIG_CAVIUM_PTP=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 # CONFIG_CC10001_ADC is not set
@@ -833,6 +837,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1078,11 +1083,14 @@ CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA3_ARM64=m
 CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
@@ -1251,6 +1259,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1567,6 +1576,7 @@ CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1736,6 +1746,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+CONFIG_GEMINI_ETHERNET=m
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -1790,6 +1801,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 CONFIG_GPIO_PL061=y
@@ -1869,6 +1881,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -2021,7 +2034,7 @@ CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM=y
@@ -2337,6 +2350,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2736,6 +2750,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2768,6 +2783,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3258,6 +3274,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -3417,9 +3434,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3604,6 +3623,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3637,6 +3657,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_SNI=y
+CONFIG_NET_VENDOR_SOCIONEXT=y
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3715,6 +3736,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3776,6 +3801,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4117,6 +4143,7 @@ CONFIG_PINCONF=y
 CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
@@ -5457,6 +5484,7 @@ CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+# CONFIG_SNI_AVE is not set
 CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 569e83004..051523b60 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -337,6 +337,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -350,6 +351,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -771,6 +773,7 @@ CONFIG_CAVIUM_ERRATUM_23144=y
 CONFIG_CAVIUM_ERRATUM_23154=y
 CONFIG_CAVIUM_ERRATUM_27456=y
 CONFIG_CAVIUM_ERRATUM_30115=y
+CONFIG_CAVIUM_PTP=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 # CONFIG_CC10001_ADC is not set
@@ -833,6 +836,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1077,11 +1081,14 @@ CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
+CONFIG_CRYPTO_SHA3_ARM64=m
 CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
+CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
@@ -1241,6 +1248,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1719,6 +1727,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+CONFIG_GEMINI_ETHERNET=m
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -1773,6 +1782,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 CONFIG_GPIO_PL061=y
@@ -1852,6 +1862,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -2004,7 +2015,7 @@ CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_HW_RANDOM=y
@@ -2320,6 +2331,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2717,6 +2729,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2749,6 +2762,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3237,6 +3251,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -3396,9 +3411,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3583,6 +3600,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3616,6 +3634,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_NET_VENDOR_SNI=y
+CONFIG_NET_VENDOR_SOCIONEXT=y
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3694,6 +3713,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3755,6 +3778,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4096,6 +4120,7 @@ CONFIG_PINCONF=y
 CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_APQ8084 is not set
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
@@ -5434,6 +5459,7 @@ CONFIG_SND_VIRMIDI=m
 CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_VX222=m
 CONFIG_SND_YMFPCI=m
+# CONFIG_SNI_AVE is not set
 CONFIG_SNI_NETSEC=m
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 0050d5985..829f99c07 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -362,6 +362,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -375,6 +376,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -639,6 +641,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -873,6 +876,7 @@ CONFIG_CHARGER_TWL4030=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1309,6 +1313,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1683,6 +1688,7 @@ CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1855,6 +1861,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -1913,6 +1920,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 CONFIG_GPIO_PL061=y
@@ -2001,6 +2009,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -2143,6 +2152,7 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
@@ -2151,7 +2161,7 @@ CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_ST=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK_OMAP=m
@@ -2486,6 +2496,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2907,6 +2918,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2943,6 +2955,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3467,6 +3480,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -3656,9 +3670,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3843,6 +3859,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3877,6 +3894,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3955,6 +3973,10 @@ CONFIG_NFC_WILINK=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -4016,6 +4038,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4411,6 +4434,7 @@ CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index cc1fc28f6..ee5aeeebb 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -348,6 +348,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -361,6 +362,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -615,6 +617,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -845,6 +848,7 @@ CONFIG_CHARGER_TPS65090=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1254,6 +1258,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1593,6 +1598,7 @@ CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1761,6 +1767,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -1815,6 +1822,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 CONFIG_GPIO_PL061=y
@@ -1896,6 +1904,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -2040,11 +2049,12 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -2356,6 +2366,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2772,6 +2783,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2806,6 +2818,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3299,6 +3312,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -3481,9 +3495,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3668,6 +3684,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3701,6 +3718,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3777,6 +3795,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3838,6 +3860,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4180,6 +4203,7 @@ CONFIG_PINCONF=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index fbbdb4ab1..d19927881 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -347,6 +347,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -360,6 +361,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -844,6 +846,7 @@ CONFIG_CHARGER_TPS65090=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1244,6 +1247,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1744,6 +1748,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -1798,6 +1803,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 CONFIG_GPIO_PL061=y
@@ -1879,6 +1885,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -2023,11 +2030,12 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -2339,6 +2347,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2753,6 +2762,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2787,6 +2797,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3278,6 +3289,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -3460,9 +3472,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3647,6 +3661,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3680,6 +3695,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3756,6 +3772,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3817,6 +3837,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4159,6 +4180,7 @@ CONFIG_PINCONF=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 9c861f4ce..422f452e1 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -361,6 +361,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -374,6 +375,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -872,6 +874,7 @@ CONFIG_CHARGER_TWL4030=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1299,6 +1302,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1838,6 +1842,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGINS is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+CONFIG_GEMINI_ETHERNET=m
 CONFIG_GENERIC_ADC_BATTERY=m
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -1896,6 +1901,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 CONFIG_GPIO_PL061=y
@@ -1984,6 +1990,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -2126,6 +2133,7 @@ CONFIG_HWMON=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
+CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
@@ -2134,7 +2142,7 @@ CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_ST=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK_OMAP=m
@@ -2469,6 +2477,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2888,6 +2897,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2924,6 +2934,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3446,6 +3457,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_MTD_AR7_PARTS is not set
@@ -3635,9 +3647,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3822,6 +3836,7 @@ CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_NET_VENDOR_CHELSIO=y
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_VENDOR_CORTINA=y
 # CONFIG_NET_VENDOR_DEC is not set
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3856,6 +3871,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3934,6 +3950,10 @@ CONFIG_NFC_WILINK=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3995,6 +4015,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4390,6 +4411,7 @@ CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
 CONFIG_PINCTRL_AS3722=y
+CONFIG_PINCTRL_AXP209=m
 # CONFIG_PINCTRL_BAYTRAIL is not set
 # CONFIG_PINCTRL_BROXTON is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 2bdfb56ff..012829ea6 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -250,6 +250,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -263,6 +264,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -720,6 +722,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1093,6 +1096,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1649,6 +1653,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1726,6 +1731,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1882,7 +1888,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
@@ -2224,6 +2230,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2623,6 +2630,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2655,6 +2663,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3120,6 +3129,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3266,9 +3276,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3452,6 +3464,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3484,6 +3497,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3563,6 +3577,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3624,6 +3642,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3943,6 +3962,7 @@ CONFIG_PHYSICAL_START=0x400000
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_AXP209 is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 8b4222bbf..7b22ee030 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -251,6 +251,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -264,6 +265,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -504,6 +506,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -721,6 +724,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1104,6 +1108,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1426,6 +1431,7 @@ CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F71808E_WDT=m
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1667,6 +1673,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1744,6 +1751,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1900,7 +1908,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
@@ -2242,6 +2250,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2643,6 +2652,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2675,6 +2685,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3140,6 +3151,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3286,9 +3298,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3472,6 +3486,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3504,6 +3519,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3583,6 +3599,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3644,6 +3664,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3963,6 +3984,7 @@ CONFIG_PHYSICAL_START=0x400000
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_AXP209 is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c412b5a58..98bac781b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -251,6 +251,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -264,6 +265,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -504,6 +506,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -721,6 +724,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1104,6 +1108,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1426,6 +1431,7 @@ CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F71808E_WDT=m
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1667,6 +1673,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1744,6 +1751,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1900,7 +1908,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
@@ -2242,6 +2250,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2643,6 +2652,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2675,6 +2685,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3140,6 +3151,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3286,9 +3298,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3472,6 +3486,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3504,6 +3519,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3583,6 +3599,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3644,6 +3664,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3963,6 +3984,7 @@ CONFIG_PHYSICAL_START=0x400000
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_AXP209 is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index f4cf253e8..26723361f 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -250,6 +250,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -263,6 +264,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -720,6 +722,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1093,6 +1096,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1649,6 +1653,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1726,6 +1731,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1882,7 +1888,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
@@ -2224,6 +2230,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2623,6 +2630,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2655,6 +2663,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3120,6 +3129,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3266,9 +3276,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3452,6 +3464,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3484,6 +3497,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3563,6 +3577,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3624,6 +3642,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3943,6 +3962,7 @@ CONFIG_PHYSICAL_START=0x400000
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_AXP209 is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 5df1c9858..79d20b755 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -199,6 +199,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -212,6 +213,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -489,6 +491,7 @@ CONFIG_BOOTX_TEXT=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -706,6 +709,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1071,6 +1075,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1343,6 +1348,7 @@ CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FA_DUMP=y
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 # CONFIG_FAIL_IOMMU is not set
 CONFIG_FAIL_IO_TIMEOUT=y
@@ -1572,6 +1578,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1647,6 +1654,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1796,7 +1804,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_POWERNV=m
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -2093,6 +2101,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2487,6 +2496,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2520,6 +2530,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -2969,6 +2980,7 @@ CONFIG_MSI_BITMAP_SELFTEST=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3105,9 +3117,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3290,6 +3304,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3324,6 +3339,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3402,6 +3418,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3463,6 +3483,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3745,6 +3766,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index d1aac271c..62d207cdf 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -198,6 +198,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -211,6 +212,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -705,6 +707,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 # CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1060,6 +1063,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1554,6 +1558,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1629,6 +1634,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1778,7 +1784,7 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_POWERNV=m
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -2075,6 +2081,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2467,6 +2474,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2500,6 +2508,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -2947,6 +2956,7 @@ CONFIG_MSI_BITMAP_SELFTEST=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3083,9 +3093,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3268,6 +3280,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3302,6 +3315,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3380,6 +3394,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3441,6 +3459,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3723,6 +3742,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 26dba50d6..31f68a2d9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -192,6 +192,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -205,6 +206,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -445,6 +447,7 @@ CONFIG_BOOTX_TEXT=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -662,6 +665,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1026,6 +1030,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1296,6 +1301,7 @@ CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 CONFIG_FA_DUMP=y
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 # CONFIG_FAIL_IOMMU is not set
 CONFIG_FAIL_IO_TIMEOUT=y
@@ -1525,6 +1531,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1600,6 +1607,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1748,7 +1756,7 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_POWERNV=m
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -2038,6 +2046,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2432,6 +2441,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2465,6 +2475,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -2913,6 +2924,7 @@ CONFIG_MSI_BITMAP_SELFTEST=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3049,9 +3061,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3234,6 +3248,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3268,6 +3283,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3346,6 +3362,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3407,6 +3427,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3687,6 +3708,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 7c37e3107..a34b10fb1 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -191,6 +191,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -204,6 +205,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -661,6 +663,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1015,6 +1018,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1507,6 +1511,7 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1582,6 +1587,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1730,7 +1736,7 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_POWERNV=m
 CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -2020,6 +2026,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2412,6 +2419,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2445,6 +2453,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -2891,6 +2900,7 @@ CONFIG_MSI_BITMAP_SELFTEST=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -3027,9 +3037,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3212,6 +3224,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3246,6 +3259,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3324,6 +3338,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3385,6 +3403,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3665,6 +3684,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 020520933..b4f7f944f 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -196,6 +196,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -209,6 +210,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -446,6 +448,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -664,6 +667,7 @@ CONFIG_CGROUPS=y
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CHECK_STACK=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1026,6 +1030,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1292,6 +1297,7 @@ CONFIG_F2FS_FS_SECURITY=y
 CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1500,6 +1506,7 @@ CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1571,6 +1578,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 # CONFIG_HID is not set
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1709,7 +1717,7 @@ CONFIG_HWLAT_TRACER=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_S390=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -1991,6 +1999,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2377,6 +2386,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2409,6 +2419,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -2853,6 +2864,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -2986,9 +2998,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3172,6 +3186,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
@@ -3204,6 +3219,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_SIS is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3280,6 +3296,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3341,6 +3361,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3621,6 +3642,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e32ea2d8c..69b2c366b 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -195,6 +195,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -208,6 +209,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -663,6 +665,7 @@ CONFIG_CGROUPS=y
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CHECK_STACK=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1015,6 +1018,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1482,6 +1486,7 @@ CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1553,6 +1558,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_ICADE=m
 # CONFIG_HID is not set
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1691,7 +1697,7 @@ CONFIG_HWLAT_TRACER=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_S390=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
 CONFIG_HWSPINLOCK=y
@@ -1973,6 +1979,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2357,6 +2364,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2389,6 +2397,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -2831,6 +2840,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_BLKDEVS is not set
@@ -2964,9 +2974,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3150,6 +3162,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CHELSIO is not set
 # CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_CORTINA is not set
 # CONFIG_NET_VENDOR_DEC is not set
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
@@ -3182,6 +3195,7 @@ CONFIG_NET_VENDOR_AQUANTIA=y
 # CONFIG_NET_VENDOR_SIS is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
@@ -3258,6 +3272,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3319,6 +3337,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3599,6 +3618,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_IPQ8074 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index a0e49099d..db7c4aead 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -254,6 +254,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -267,6 +268,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -516,6 +518,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_BOUNCE=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_BPF_JIT=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPQETHER=m
@@ -735,6 +738,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1150,6 +1154,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1474,6 +1479,7 @@ CONFIG_F2FS_FS_XATTR=y
 # CONFIG_F2FS_IO_TRACE is not set
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F71808E_WDT=m
+CONFIG_FAIL_FUNCTION=y
 # CONFIG_FAIL_FUTEX is not set
 CONFIG_FAIL_IO_TIMEOUT=y
 CONFIG_FAIL_MAKE_REQUEST=y
@@ -1710,6 +1716,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1789,6 +1796,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1942,7 +1950,7 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
@@ -2299,6 +2307,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2701,6 +2710,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2733,6 +2743,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3190,6 +3201,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
@@ -3331,9 +3343,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3517,6 +3531,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3549,6 +3564,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3628,6 +3644,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3689,6 +3709,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -4011,6 +4032,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_AXP209 is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 133d3ced5..31f5eee6d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -253,6 +253,7 @@ CONFIG_ATH10K_DEBUGFS=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
 CONFIG_ATH10K_SDIO=m
+# CONFIG_ATH10K_SPECTRAL is not set
 # CONFIG_ATH10K_TRACING is not set
 CONFIG_ATH10K_USB=m
 CONFIG_ATH5K_DEBUG=y
@@ -266,6 +267,7 @@ CONFIG_ATH6KL_USB=m
 CONFIG_ATH9K_AHB=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
 CONFIG_ATH9K_DEBUGFS=y
 # CONFIG_ATH9K_DEBUG is not set
 # CONFIG_ATH9K_DYNACK is not set
@@ -734,6 +736,7 @@ CONFIG_CHARGER_SMB347=m
 # CONFIG_CHASH_SELFTEST is not set
 # CONFIG_CHASH_STATS is not set
 CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_CHELSIO_IPSEC_INLINE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T3=m
@@ -1139,6 +1142,7 @@ CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
+CONFIG_DM_UNSTRIPED=m
 CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_ZERO=y
@@ -1692,6 +1696,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_PISOSR is not set
 # CONFIG_GPIO_RDC321X is not set
@@ -1771,6 +1776,7 @@ CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_ICADE=m
 CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
@@ -1924,7 +1930,7 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_TPM=m
+CONFIG_HW_RANDOM_TPM=y
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_HW_RANDOM=y
@@ -2281,6 +2287,7 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
 CONFIG_IP6_NF_NAT=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
@@ -2681,6 +2688,7 @@ CONFIG_LEDS_IS31FL32XX=m
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_LM3642 is not set
+CONFIG_LEDS_LM3692X=m
 # CONFIG_LEDS_LOCOMO is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP3952=m
@@ -2713,6 +2721,7 @@ CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGERS=y
@@ -3170,6 +3179,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8994 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT76x2E=m
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AR7_PARTS is not set
 CONFIG_MTD_BLKDEVS=m
@@ -3311,9 +3321,11 @@ CONFIG_NET_CORE=y
 # CONFIG_NET_DCCPPROBE is not set
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=m
+# CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_HWMON=y
+# CONFIG_NET_DSA_LEGACY is not set
 CONFIG_NET_DSA_LOOP=m
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_MT7530=m
@@ -3497,6 +3509,7 @@ CONFIG_NET_VENDOR_BROCADE=y
 # CONFIG_NET_VENDOR_CAVIUM is not set
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_NET_VENDOR_CISCO=y
+# CONFIG_NET_VENDOR_CORTINA is not set
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_VENDOR_DLINK=y
 CONFIG_NET_VENDOR_EMULEX=y
@@ -3529,6 +3542,7 @@ CONFIG_NET_VENDOR_SILAN=y
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_NET_VENDOR_SMSC=y
 # CONFIG_NET_VENDOR_SNI is not set
+# CONFIG_NET_VENDOR_SOCIONEXT is not set
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_NET_VENDOR_SUN=y
@@ -3608,6 +3622,10 @@ CONFIG_NFC_TRF7970A=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_FLOW_TABLE=m
 CONFIG_NF_LOG_ARP=m
 CONFIG_NF_LOG_BRIDGE=m
 CONFIG_NF_LOG_IPV4=m
@@ -3669,6 +3687,7 @@ CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_FIB_IPV4=m
 CONFIG_NFT_FIB_IPV6=m
 CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_HASH=m
 CONFIG_NFT_LIMIT=m
@@ -3991,6 +4010,7 @@ CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PID_NS=y
 CONFIG_PINCONF=y
 # CONFIG_PINCTRL_AMD is not set
+# CONFIG_PINCTRL_AXP209 is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 # CONFIG_PINCTRL_CANNONLAKE is not set
diff --git a/kernel.spec b/kernel.spec
index 146bc67c5..558b39075 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -591,9 +591,6 @@ Patch307: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
 # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
 Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
 
-# https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=synquacer-netsec
-Patch330: arm64-socionext-96b-enablement.patch
-
 # 400 - IBM (ppc/s390x) patches
 
 # 500 - Temp fixes/CVEs etc
@@ -611,23 +608,9 @@ Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 # rhbz 1509461
 Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
 
-# For https://fedoraproject.org/wiki/Changes/ImprovedLaptopBatteryLife
-# Queued in bluetooth-next for merging into 4.16
-Patch628: 0001-Bluetooth-btusb-Add-a-Kconfig-option-to-enable-USB-a.patch
-
-# Fix left-button not working with some hid-multitouch touchpads
-# Adding these suggested by Benjamin Tissoires
-# Queued in hid.git/for-4.16/hid-quirks-cleanup/multitouch for merging into 4.16
-Patch630: 0001-HID-multitouch-Properly-deal-with-Win8-PTP-reports-w.patch
-Patch631: 0002-HID-multitouch-Only-look-at-non-touch-fields-in-firs.patch
-Patch632: 0003-HID-multitouch-Combine-all-left-button-events-in-a-f.patch
-
 # rhbz1514969, submitted upstream
 Patch640: 0001-platform-x86-dell-laptop-Filter-out-spurious-keyboar.patch
 
-# rhbz1514836, submitted upstream
-Patch641: 0001-Bluetooth-btusb-Disable-autosuspend-on-QCA-Rome-devi.patch
-
 # Speculative Execution patches
 Patch642: prevent-bounds-check-bypass-via-speculative-execution.patch
 
@@ -1895,6 +1878,9 @@ fi
 #
 #
 %changelog
+* Thu Feb 01 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc0.git3.1
+- Linux v4.15-6064-g255442c93843
+
 * Wed Jan 31 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc0.git2.1
 - Linux v4.15-2341-g3da90b159b14
 
diff --git a/sources b/sources
index e9ebac8e6..e01bab3c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
-SHA512 (patch-4.15-git2.xz) = 1846ed5cb0c256126b87435f2e8708931abf6aaac8f76c4f4e96da70329308ba27d15bae5a7d049d583cd480b4258748bee92ae390743fcc2d9925523f26bcbf
+SHA512 (patch-4.15-git3.xz) = 17b5f3214e1f39352e499fa6744013b5d676d07edcb99b437ec835b2f8b36d9de245ab5567f0fad1e80575f78a420be608f48bfd53bffa5d429bb7791ec0a719