Linux v5.0-3452-g3717f613f48d

34 files changed, 152 insertions, 391 deletions

diff --git a/Allwinner-A64-timer-workaround.patch b/Allwinner-A64-timer-workaround.patch
index 4e5c3482d..c56049073 100644
--- a/Allwinner-A64-timer-workaround.patch
+++ b/Allwinner-A64-timer-workaround.patch
@@ -1,376 +1,3 @@
-From patchwork Sun Jan 13 02:17:18 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-X-Patchwork-Submitter: Samuel Holland <samuel@sholland.org>
-X-Patchwork-Id: 10761197
-Return-Path: 
- <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
-Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
- [172.30.200.125])
-	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7438D14E5
-	for <patchwork-linux-arm@patchwork.kernel.org>;
- Sun, 13 Jan 2019 02:18:08 +0000 (UTC)
-Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6324429093
-	for <patchwork-linux-arm@patchwork.kernel.org>;
- Sun, 13 Jan 2019 02:18:08 +0000 (UTC)
-Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
-	id 572B929097; Sun, 13 Jan 2019 02:18:08 +0000 (UTC)
-X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
-	pdx-wl-mail.web.codeaurora.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
-	DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1
-Received: from bombadil.infradead.org (bombadil.infradead.org
- [198.137.202.133])
-	(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
-	(No client certificate requested)
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5F83A29093
-	for <patchwork-linux-arm@patchwork.kernel.org>;
- Sun, 13 Jan 2019 02:18:07 +0000 (UTC)
-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-	d=lists.infradead.org; s=bombadil.20170209; h=Sender:
-	Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:
-	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
-	Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description:
-	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
-	List-Owner; bh=dQUQoZ0HK445Sd69SbjwJYcQyzVbBeZDboYvSLP8Vdw=; b=crafG7dY4EnzgC
-	DsGSbEccC3W+IWHZ1IT48gptWAu7uAA+F8UlCxFhZjbnIWLSyJJ45p0OPLEpGqbXcAVG1b5PKktc2
-	fccU3caHf3SodUNh3vGg0xGPPIpak0a3bFcU3kJ2b2HU31TCK7d8u5PPsELEX1044dKRGgelnShpT
-	bWP3zCyZ2BsTJyX72XpZ3xDZTHA6vx0Pk+n6vuRPylDfGX0CIZrDlGFh6szWORsn0emEN+IJOPiXc
-	qhc3Ba3yzsS7ImYjmBkrPlaQpDO15afdFm+LuEx3i0RN9ErPfdG0edtJjd95n/PA7UashuXX2b/5Q
-	TygDejejoCnuJQ1meYBg==;
-Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
-	by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
-	id 1giVLf-0001hn-TG; Sun, 13 Jan 2019 02:18:03 +0000
-Received: from out1-smtp.messagingengine.com ([66.111.4.25])
- by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
- id 1giVLA-0001BU-Qo
- for linux-arm-kernel@lists.infradead.org; Sun, 13 Jan 2019 02:17:36 +0000
-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45])
- by mailout.nyi.internal (Postfix) with ESMTP id 663DB23174;
- Sat, 12 Jan 2019 21:17:23 -0500 (EST)
-Received: from mailfrontend2 ([10.202.2.163])
- by compute5.internal (MEProxy); Sat, 12 Jan 2019 21:17:23 -0500
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h=
- from:to:cc:subject:date:message-id:in-reply-to:references
- :mime-version:content-type:content-transfer-encoding; s=fm1; bh=
- jKlMXS7XKvXn/szdGKBQgG32+kZpvO4uOo39QB1bolU=; b=mvmCKr9tLbEvZJbP
- pDROAd6IVm3H+tyjyvewON4VHOYfu+/+ArBujiVhfDXn37l0VEuv9+CnihXwQJz6
- 4joEh2OkDUy/Q32KvZzaH2GCqpcfAXUzqg4gMHL3z2eF+krzqNFd9EfXRZH4p3zO
- HP0pa3tHrmZHsG9mnCbzz1JaRXVli6vxQKF/5KOoxpz++tQTllf25u0GpIbfKaOx
- Z4eKMXxSZvDpYbsxPhgdBnlBZfvOfhsSvTgphvpKdchneqyKUYVjwO68c7ajBeK9
- PGEo6YPH30QIE71YUD80IG8ZMrQOWYdlNLKocWTel4ZaJpkw4CIA1H+gnDmSKutJ
- VDRgYA==
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
- messagingengine.com; h=cc:content-transfer-encoding:content-type
- :date:from:in-reply-to:message-id:mime-version:references
- :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
- :x-sasl-enc; s=fm1; bh=jKlMXS7XKvXn/szdGKBQgG32+kZpvO4uOo39QB1bo
- lU=; b=Upeefp0OZATDpZxWgrtHSzR2/FFiAwyRjS0PC/HWQehfO8m3OS4/AkyP1
- L96BnIrJ3Uk4WRUTblFAJvE+dJAiQeJ1WmOsJ+Dkgshp5OGZ0pUhxf/n45Ro4BuL
- VTC4QqUzoYnFC/ut2gfaL91yRN5tZmU+2ik5O+8E1vvF/IwhZcLDw6tcR/JX6Ixa
- X+EWoETX3GQC1Dbwzf9yMctarPw5mxJ8ERUyGHtDuFyzr0v0ReMlCfWqdBd0Ekca
- /EA5D9Um8kl6S9wVk6XgFvZm2vyzRIhfmLQqoEzcCKywrMv2qiCquAYqWMUFIdM+
- 3TkvJqkWkNjRz6J6Dbd2i15CpL/Sw==
-X-ME-Sender: <xms:sp86XLgZgR-OuGupvTKImnW3geoxWw9AmBdt1C0DGN-t7owcwWYflg>
-X-ME-Proxy-Cause: 
- gggruggvucftvghtrhhoucdtuddrgedtledrfeekgdduvdcutefuodetggdotefrodftvf
- curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt
- tdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojg
- hfgggtgfesthekredtredtjeenucfhrhhomhepufgrmhhuvghlucfjohhllhgrnhguuceo
- shgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuffhomhgrihhnpegrrhhmsghirg
- hnrdgtohhmpdhgihhthhhusgdrtghomhdpfihhihhtvghquhgrrhhkrdhorhhgnecukfhp
- peejtddrudefhedrudegkedrudehudenucfrrghrrghmpehmrghilhhfrhhomhepshgrmh
- huvghlsehshhholhhlrghnugdrohhrghenucevlhhushhtvghrufhiiigvpedt
-X-ME-Proxy: <xmx:sp86XClRnRqP6qey5otmmQUXhLScRlq2lYK8B3cn0kI6EqlMQuByFg>
- <xmx:sp86XHpy0uQ1V3qD29APOD9ngWzb5KHgeV3vOBV4LioAvt-bR0k-rg>
- <xmx:sp86XLGPLYL3h3AW4JPSnrVuevGIGc3rsQVzKchjHOk5g30XwDbN5g>
- <xmx:s586XDRmlHkvg3iGQmu4ZPLH-3nA609xxZWSVf6vR2Xqp8dt6ACFxw>
-Received: from titanium.stl.sholland.net
- (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151])
- by mail.messagingengine.com (Postfix) with ESMTPA id 6F2A31026D;
- Sat, 12 Jan 2019 21:17:21 -0500 (EST)
-From: Samuel Holland <samuel@sholland.org>
-To: Catalin Marinas <catalin.marinas@arm.com>,
- Will Deacon <will.deacon@arm.com>,
- Maxime Ripard <maxime.ripard@bootlin.com>, Chen-Yu Tsai <wens@csie.org>,
- Rob Herring <robh+dt@kernel.org>, Mark Rutland <Mark.Rutland@arm.com>,
- Daniel Lezcano <daniel.lezcano@linaro.org>,
- Thomas Gleixner <tglx@linutronix.de>, Marc Zyngier <marc.zyngier@arm.com>
-Subject: [PATCH v3 1/2] arm64: arch_timer: Workaround for Allwinner A64 timer
- instability
-Date: Sat, 12 Jan 2019 20:17:18 -0600
-Message-Id: <20190113021719.46457-2-samuel@sholland.org>
-X-Mailer: git-send-email 2.19.2
-In-Reply-To: <20190113021719.46457-1-samuel@sholland.org>
-References: <20190113021719.46457-1-samuel@sholland.org>
-MIME-Version: 1.0
-X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20190112_181733_065120_A96E9A2B 
-X-CRM114-Status: GOOD (  19.89  )
-X-BeenThere: linux-arm-kernel@lists.infradead.org
-X-Mailman-Version: 2.1.21
-Precedence: list
-List-Id: <linux-arm-kernel.lists.infradead.org>
-List-Unsubscribe: 
- <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
-List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
-List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
-List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
-List-Subscribe: 
- <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
- <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
-Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com,
- linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
- Samuel Holland <samuel@sholland.org>
-Content-Type: text/plain; charset="utf-8"
-Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
-Errors-To: 
- linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
-X-Virus-Scanned: ClamAV using ClamSMTP
-
-The Allwinner A64 SoC is known[1] to have an unstable architectural
-timer, which manifests itself most obviously in the time jumping forward
-a multiple of 95 years[2][3]. This coincides with 2^56 cycles at a
-timer frequency of 24 MHz, implying that the time went slightly backward
-(and this was interpreted by the kernel as it jumping forward and
-wrapping around past the epoch).
-
-Investigation revealed instability in the low bits of CNTVCT at the
-point a high bit rolls over. This leads to power-of-two cycle forward
-and backward jumps. (Testing shows that forward jumps are about twice as
-likely as backward jumps.) Since the counter value returns to normal
-after an indeterminate read, each "jump" really consists of both a
-forward and backward jump from the software perspective.
-
-Unless the kernel is trapping CNTVCT reads, a userspace program is able
-to read the register in a loop faster than it changes. A test program
-running on all 4 CPU cores that reported jumps larger than 100 ms was
-run for 13.6 hours and reported the following:
-
- Count | Event
--------+---------------------------
-  9940 | jumped backward      699ms
-   268 | jumped backward     1398ms
-     1 | jumped backward     2097ms
- 16020 | jumped forward       175ms
-  6443 | jumped forward       699ms
-  2976 | jumped forward      1398ms
-     9 | jumped forward    356516ms
-     9 | jumped forward    357215ms
-     4 | jumped forward    714430ms
-     1 | jumped forward   3578440ms
-
-This works out to a jump larger than 100 ms about every 5.5 seconds on
-each CPU core.
-
-The largest jump (almost an hour!) was the following sequence of reads:
-    0x0000007fffffffff → 0x00000093feffffff → 0x0000008000000000
-
-Note that the middle bits don't necessarily all read as all zeroes or
-all ones during the anomalous behavior; however the low 10 bits checked
-by the function in this patch have never been observed with any other
-value.
-
-Also note that smaller jumps are much more common, with backward jumps
-of 2048 (2^11) cycles observed over 400 times per second on each core.
-(Of course, this is partially explained by lower bits rolling over more
-frequently.) Any one of these could have caused the 95 year time skip.
-
-Similar anomalies were observed while reading CNTPCT (after patching the
-kernel to allow reads from userspace). However, the CNTPCT jumps are
-much less frequent, and only small jumps were observed. The same program
-as before (except now reading CNTPCT) observed after 72 hours:
-
- Count | Event
--------+---------------------------
-    17 | jumped backward      699ms
-    52 | jumped forward       175ms
-  2831 | jumped forward       699ms
-     5 | jumped forward      1398ms
-
-Further investigation showed that the instability in CNTPCT/CNTVCT also
-affected the respective timer's TVAL register. The following values were
-observed immediately after writing CNVT_TVAL to 0x10000000:
-
- CNTVCT             | CNTV_TVAL  | CNTV_CVAL          | CNTV_TVAL Error
---------------------+------------+--------------------+-----------------
- 0x000000d4a2d8bfff | 0x10003fff | 0x000000d4b2d8bfff | +0x00004000
- 0x000000d4a2d94000 | 0x0fffffff | 0x000000d4b2d97fff | -0x00004000
- 0x000000d4a2d97fff | 0x10003fff | 0x000000d4b2d97fff | +0x00004000
- 0x000000d4a2d9c000 | 0x0fffffff | 0x000000d4b2d9ffff | -0x00004000
-
-The pattern of errors in CNTV_TVAL seemed to depend on exactly which
-value was written to it. For example, after writing 0x10101010:
-
- CNTVCT             | CNTV_TVAL  | CNTV_CVAL          | CNTV_TVAL Error
---------------------+------------+--------------------+-----------------
- 0x000001ac3effffff | 0x1110100f | 0x000001ac4f10100f | +0x1000000
- 0x000001ac40000000 | 0x1010100f | 0x000001ac5110100f | -0x1000000
- 0x000001ac58ffffff | 0x1110100f | 0x000001ac6910100f | +0x1000000
- 0x000001ac66000000 | 0x1010100f | 0x000001ac7710100f | -0x1000000
- 0x000001ac6affffff | 0x1110100f | 0x000001ac7b10100f | +0x1000000
- 0x000001ac6e000000 | 0x1010100f | 0x000001ac7f10100f | -0x1000000
-
-I was also twice able to reproduce the issue covered by Allwinner's
-workaround[4], that writing to TVAL sometimes fails, and both CVAL and
-TVAL are left with entirely bogus values. One was the following values:
-
- CNTVCT             | CNTV_TVAL  | CNTV_CVAL
---------------------+------------+--------------------------------------
- 0x000000d4a2d6014c | 0x8fbd5721 | 0x000000d132935fff (615s in the past)
-
-========================================================================
-
-Because the CPU can read the CNTPCT/CNTVCT registers faster than they
-change, performing two reads of the register and comparing the high bits
-(like other workarounds) is not a workable solution. And because the
-timer can jump both forward and backward, no pair of reads can
-distinguish a good value from a bad one. The only way to guarantee a
-good value from consecutive reads would be to read _three_ times, and
-take the middle value only if the three values are 1) each unique and
-2) increasing. This takes at minimum 3 counter cycles (125 ns), or more
-if an anomaly is detected.
-
-However, since there is a distinct pattern to the bad values, we can
-optimize the common case (1022/1024 of the time) to a single read by
-simply ignoring values that match the error pattern. This still takes no
-more than 3 cycles in the worst case, and requires much less code. As an
-additional safety check, we still limit the loop iteration to the number
-of max-frequency (1.2 GHz) CPU cycles in three 24 MHz counter periods.
-
-For the TVAL registers, the simple solution is to not use them. Instead,
-read or write the CVAL and calculate the TVAL value in software.
-
-Although the manufacturer is aware of at least part of the erratum[4],
-there is no official name for it. For now, use the kernel-internal name
-"UNKNOWN1".
-
-[1]: https://github.com/armbian/build/commit/a08cd6fe7ae9
-[2]: https://forum.armbian.com/topic/3458-a64-datetime-clock-issue/
-[3]: https://irclog.whitequark.org/linux-sunxi/2018-01-26
-[4]: https://github.com/Allwinner-Homlet/H6-BSP4.9-linux/blob/master/drivers/clocksource/arm_arch_timer.c#L272
-
-Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
-Tested-by: Andre Przywara <andre.przywara@arm.com>
-Signed-off-by: Samuel Holland <samuel@sholland.org>
----
- Documentation/arm64/silicon-errata.txt |  2 +
- drivers/clocksource/Kconfig            | 10 +++++
- drivers/clocksource/arm_arch_timer.c   | 55 ++++++++++++++++++++++++++
- 3 files changed, 67 insertions(+)
-
-diff --git a/Documentation/arm64/silicon-errata.txt b/Documentation/arm64/silicon-errata.txt
-index 8f9577621144..4a269732d2a0 100644
---- a/Documentation/arm64/silicon-errata.txt
-+++ b/Documentation/arm64/silicon-errata.txt
-@@ -44,6 +44,8 @@ stable kernels.
- 
- | Implementor    | Component       | Erratum ID      | Kconfig                     |
- +----------------+-----------------+-----------------+-----------------------------+
-+| Allwinner      | A64/R18         | UNKNOWN1        | SUN50I_ERRATUM_UNKNOWN1     |
-+|                |                 |                 |                             |
- | ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |
- | ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |
- | ARM            | Cortex-A53      | #824069         | ARM64_ERRATUM_824069        |
-diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
-index 55c77e44bb2d..d20ff4da07c3 100644
---- a/drivers/clocksource/Kconfig
-+++ b/drivers/clocksource/Kconfig
-@@ -364,6 +364,16 @@ config ARM64_ERRATUM_858921
- 	  The workaround will be dynamically enabled when an affected
- 	  core is detected.
- 
-+config SUN50I_ERRATUM_UNKNOWN1
-+	bool "Workaround for Allwinner A64 erratum UNKNOWN1"
-+	default y
-+	depends on ARM_ARCH_TIMER && ARM64 && ARCH_SUNXI
-+	select ARM_ARCH_TIMER_OOL_WORKAROUND
-+	help
-+	  This option enables a workaround for instability in the timer on
-+	  the Allwinner A64 SoC. The workaround will only be active if the
-+	  allwinner,erratum-unknown1 property is found in the timer node.
-+
- config ARM_GLOBAL_TIMER
- 	bool "Support for the ARM global timer" if COMPILE_TEST
- 	select TIMER_OF if OF
-diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
-index 9a7d4dc00b6e..a8b20b65bd4b 100644
---- a/drivers/clocksource/arm_arch_timer.c
-+++ b/drivers/clocksource/arm_arch_timer.c
-@@ -326,6 +326,48 @@ static u64 notrace arm64_1188873_read_cntvct_el0(void)
- }
- #endif
- 
-+#ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1
-+/*
-+ * The low bits of the counter registers are indeterminate while bit 10 or
-+ * greater is rolling over. Since the counter value can jump both backward
-+ * (7ff -> 000 -> 800) and forward (7ff -> fff -> 800), ignore register values
-+ * with all ones or all zeros in the low bits. Bound the loop by the maximum
-+ * number of CPU cycles in 3 consecutive 24 MHz counter periods.
-+ */
-+#define __sun50i_a64_read_reg(reg) ({					\
-+	u64 _val;							\
-+	int _retries = 150;						\
-+									\
-+	do {								\
-+		_val = read_sysreg(reg);				\
-+		_retries--;						\
-+	} while (((_val + 1) & GENMASK(9, 0)) <= 1 && _retries);	\
-+									\
-+	WARN_ON_ONCE(!_retries);					\
-+	_val;								\
-+})
-+
-+static u64 notrace sun50i_a64_read_cntpct_el0(void)
-+{
-+	return __sun50i_a64_read_reg(cntpct_el0);
-+}
-+
-+static u64 notrace sun50i_a64_read_cntvct_el0(void)
-+{
-+	return __sun50i_a64_read_reg(cntvct_el0);
-+}
-+
-+static u32 notrace sun50i_a64_read_cntp_tval_el0(void)
-+{
-+	return read_sysreg(cntp_cval_el0) - sun50i_a64_read_cntpct_el0();
-+}
-+
-+static u32 notrace sun50i_a64_read_cntv_tval_el0(void)
-+{
-+	return read_sysreg(cntv_cval_el0) - sun50i_a64_read_cntvct_el0();
-+}
-+#endif
-+
- #ifdef CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND
- DEFINE_PER_CPU(const struct arch_timer_erratum_workaround *, timer_unstable_counter_workaround);
- EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround);
-@@ -423,6 +465,19 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = {
- 		.read_cntvct_el0 = arm64_1188873_read_cntvct_el0,
- 	},
- #endif
-+#ifdef CONFIG_SUN50I_ERRATUM_UNKNOWN1
-+	{
-+		.match_type = ate_match_dt,
-+		.id = "allwinner,erratum-unknown1",
-+		.desc = "Allwinner erratum UNKNOWN1",
-+		.read_cntp_tval_el0 = sun50i_a64_read_cntp_tval_el0,
-+		.read_cntv_tval_el0 = sun50i_a64_read_cntv_tval_el0,
-+		.read_cntpct_el0 = sun50i_a64_read_cntpct_el0,
-+		.read_cntvct_el0 = sun50i_a64_read_cntvct_el0,
-+		.set_next_event_phys = erratum_set_next_event_tval_phys,
-+		.set_next_event_virt = erratum_set_next_event_tval_virt,
-+	},
-+#endif
- };
- 
- typedef bool (*ate_match_fn_t)(const struct arch_timer_erratum_workaround *,
-
 From patchwork Sun Jan 13 02:17:19 2019
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_MANAGER_EXTRA_TESTS b/configs/fedora/generic/CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
new file mode 100644
index 000000000..b27d3dbb7
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_CRYPTO_MANAGER_EXTRA_TESTS
@@ -0,0 +1 @@
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC b/configs/fedora/generic/CONFIG_FSL_ENETC
new file mode 100644
index 000000000..cbb37c22c
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FSL_ENETC
@@ -0,0 +1 @@
+# CONFIG_FSL_ENETC is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK b/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK
new file mode 100644
index 000000000..bbc51f2b6
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FSL_ENETC_PTP_CLOCK
@@ -0,0 +1 @@
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_VF b/configs/fedora/generic/CONFIG_FSL_ENETC_VF
new file mode 100644
index 000000000..3501beeab
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_FSL_ENETC_VF
@@ -0,0 +1 @@
+# CONFIG_FSL_ENETC_VF is not set
diff --git a/configs/fedora/generic/CONFIG_MDIO_BUS_MUX_MULTIPLEXER b/configs/fedora/generic/CONFIG_MDIO_BUS_MUX_MULTIPLEXER
new file mode 100644
index 000000000..c2786fc08
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_MDIO_BUS_MUX_MULTIPLEXER
@@ -0,0 +1 @@
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
diff --git a/configs/fedora/generic/CONFIG_MT7603E b/configs/fedora/generic/CONFIG_MT7603E
new file mode 100644
index 000000000..d7cf13c3f
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_MT7603E
@@ -0,0 +1 @@
+CONFIG_MT7603E=m
diff --git a/configs/fedora/generic/CONFIG_NET_DEVLINK b/configs/fedora/generic/CONFIG_NET_DEVLINK
index 175ec12ca..a27d13004 100644
--- a/configs/fedora/generic/CONFIG_NET_DEVLINK
+++ b/configs/fedora/generic/CONFIG_NET_DEVLINK
@@ -1 +1 @@
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
diff --git a/configs/fedora/generic/CONFIG_PHY_MVEBU_A38X_COMPHY b/configs/fedora/generic/CONFIG_PHY_MVEBU_A38X_COMPHY
new file mode 100644
index 000000000..333616248
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_PHY_MVEBU_A38X_COMPHY
@@ -0,0 +1 @@
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
diff --git a/configs/fedora/generic/CONFIG_XDP_SOCKETS_DIAG b/configs/fedora/generic/CONFIG_XDP_SOCKETS_DIAG
new file mode 100644
index 000000000..99fbcd095
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_XDP_SOCKETS_DIAG
@@ -0,0 +1 @@
+CONFIG_XDP_SOCKETS_DIAG=m
diff --git a/configs/fedora/generic/arm/CONFIG_MDIO_BUS_MUX_MULTIPLEXER b/configs/fedora/generic/arm/CONFIG_MDIO_BUS_MUX_MULTIPLEXER
new file mode 100644
index 000000000..235a74c4e
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MDIO_BUS_MUX_MULTIPLEXER
@@ -0,0 +1 @@
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_QCOM_ETHQOS b/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_QCOM_ETHQOS
new file mode 100644
index 000000000..23a96ddad
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_QCOM_ETHQOS
@@ -0,0 +1 @@
+CONFIG_DWMAC_QCOM_ETHQOS=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC
new file mode 100644
index 000000000..f8d3ed1be
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC
@@ -0,0 +1 @@
+CONFIG_FSL_ENETC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_PTP_CLOCK b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_PTP_CLOCK
new file mode 100644
index 000000000..b29fc36ea
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_PTP_CLOCK
@@ -0,0 +1 @@
+CONFIG_FSL_ENETC_PTP_CLOCK=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_VF b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_VF
new file mode 100644
index 000000000..bf6634502
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_VF
@@ -0,0 +1 @@
+CONFIG_FSL_ENETC_VF=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MVEBU_A38X_COMPHY b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MVEBU_A38X_COMPHY
new file mode 100644
index 000000000..0c968500a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MVEBU_A38X_COMPHY
@@ -0,0 +1 @@
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DWMAC_QCOM_ETHQOS b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DWMAC_QCOM_ETHQOS
new file mode 100644
index 000000000..23a96ddad
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DWMAC_QCOM_ETHQOS
@@ -0,0 +1 @@
+CONFIG_DWMAC_QCOM_ETHQOS=m
diff --git a/gitrev b/gitrev
index a2d8f0965..e63efc715 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-cd2a3bf02625ffad02a6b9f7df758ee36cf12769
+3717f613f48df0222311f974cf8a06c8a6c97bae
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 32dce8954..5a0bdfe89 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1129,6 +1129,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1575,6 +1576,7 @@ CONFIG_DW_DMAC_PCI=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SUN8I=m
 CONFIG_DWMAC_SUNXI=m
@@ -1815,6 +1817,9 @@ CONFIG_FSL_DPAA2=y
 CONFIG_FSL_DPAA_ETH=m
 CONFIG_FSL_DPAA=y
 CONFIG_FSL_EDMA=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+CONFIG_FSL_ENETC_VF=m
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_FSL_FMAN=m
 CONFIG_FSL_MC_BUS=y
@@ -3090,6 +3095,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
@@ -3446,6 +3452,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3591,7 +3598,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4291,6 +4298,7 @@ CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -6926,6 +6934,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0272ba576..d4697e370 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1129,6 +1129,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1567,6 +1568,7 @@ CONFIG_DW_DMAC_PCI=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SUN8I=m
 CONFIG_DWMAC_SUNXI=m
@@ -1799,6 +1801,9 @@ CONFIG_FSL_DPAA2=y
 CONFIG_FSL_DPAA_ETH=m
 CONFIG_FSL_DPAA=y
 CONFIG_FSL_EDMA=m
+CONFIG_FSL_ENETC=m
+CONFIG_FSL_ENETC_PTP_CLOCK=m
+CONFIG_FSL_ENETC_VF=m
 CONFIG_FSL_ERRATUM_A008585=y
 CONFIG_FSL_FMAN=m
 CONFIG_FSL_MC_BUS=y
@@ -3071,6 +3076,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 CONFIG_MDIO_HISI_FEMAC=m
@@ -3426,6 +3432,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3571,7 +3578,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4271,6 +4278,7 @@ CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
+CONFIG_PHY_MVEBU_A38X_COMPHY=m
 CONFIG_PHY_MVEBU_CP110_COMPHY=m
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -6904,6 +6912,7 @@ CONFIG_WLCORE_SPI=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index adeeb1c4c..3ddfd540e 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1134,6 +1134,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1626,6 +1627,7 @@ CONFIG_DW_DMAC_PCI=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_STI=m
 CONFIG_DWMAC_SUN8I=m
@@ -1868,6 +1870,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
@@ -3189,6 +3194,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3558,6 +3564,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3724,7 +3731,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4455,6 +4462,7 @@ CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MIPHY28LP=m
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -7299,6 +7307,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index c50703939..4af15dd6c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1092,6 +1092,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1789,6 +1790,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
@@ -3063,6 +3067,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3408,6 +3413,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3570,7 +3576,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4262,6 +4268,7 @@ CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -6881,6 +6888,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 45c88811e..50086f651 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1092,6 +1092,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1774,6 +1775,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
@@ -3045,6 +3049,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3389,6 +3394,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3551,7 +3557,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4243,6 +4249,7 @@ CONFIG_PHYLINK=m
 CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -6860,6 +6867,7 @@ CONFIG_WLCORE_SPI=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 36c54402b..7cd748782 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1134,6 +1134,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1619,6 +1620,7 @@ CONFIG_DW_DMAC_PCI=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
 CONFIG_DWMAC_MESON=m
+CONFIG_DWMAC_QCOM_ETHQOS=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_STI=m
 CONFIG_DWMAC_SUN8I=m
@@ -1853,6 +1855,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
@@ -3171,6 +3176,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3539,6 +3545,7 @@ CONFIG_MSM_MMCC_8974=m
 CONFIG_MSM_MMCC_8996=m
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3705,7 +3712,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4436,6 +4443,7 @@ CONFIG_PHY_MESON8B_USB2=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MIPHY28LP=m
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_OCELOT_SERDES is not set
@@ -7278,6 +7286,7 @@ CONFIG_WLCORE_SPI=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 2e99bcfb1..2234b852d 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -937,6 +937,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1614,6 +1615,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -2915,6 +2919,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3236,6 +3241,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3368,7 +3374,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4056,6 +4062,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -6434,6 +6441,7 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 # CONFIG_X86_SYSFB is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 64662e8a6..7ea03b5f9 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -936,6 +936,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1597,6 +1598,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -2896,6 +2900,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3217,6 +3222,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3349,7 +3355,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4037,6 +4043,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -6413,6 +6420,7 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_X86_SPEEDSTEP_SMI=y
 # CONFIG_X86_SYSFB is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_ACPI_PROCESSOR=m
 CONFIG_XEN_BACKEND=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 031876519..619a0155f 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -863,6 +863,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 # CONFIG_CRYPTO_MD5_PPC is not set
@@ -1466,6 +1467,9 @@ CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_LBC is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
@@ -2667,6 +2671,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2974,6 +2979,7 @@ CONFIG_MSI_BITMAP_SELFTEST=y
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3098,7 +3104,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -3753,6 +3759,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -6005,6 +6012,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index b37166c43..26ffd0c70 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -862,6 +862,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 # CONFIG_CRYPTO_MD5_PPC is not set
@@ -1449,6 +1450,9 @@ CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_LBC is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
@@ -2647,6 +2651,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2953,6 +2958,7 @@ CONFIG_MSI_BITMAP_SELFTEST=y
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3077,7 +3083,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -3732,6 +3738,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -5982,6 +5989,7 @@ CONFIG_WLCORE_SPI=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 3e3c82f81..f59e9d32e 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -866,6 +866,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1466,6 +1467,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -2641,6 +2645,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2947,6 +2952,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3069,7 +3075,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -3720,6 +3726,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -5947,6 +5954,7 @@ CONFIG_WQ_WATCHDOG=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_PTDUMP=y
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index be3e28d6b..65036ee0e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -865,6 +865,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1449,6 +1450,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -2621,6 +2625,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -2926,6 +2931,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3048,7 +3054,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -3699,6 +3705,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -5924,6 +5931,7 @@ CONFIG_WLCORE_SPI=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_MCELOG_LEGACY=y
 # CONFIG_X86_PTDUMP is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 # CONFIG_XEN_GRANT_DMA_ALLOC is not set
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 1db050abe..9314c8601 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -964,6 +964,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1651,6 +1652,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -2953,6 +2957,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3272,6 +3277,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3400,7 +3406,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4087,6 +4093,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -6469,6 +6476,7 @@ CONFIG_X86_UV=y
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_X2APIC=y
 # CONFIG_X86_X32 is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_512GB=y
 CONFIG_XEN_ACPI_PROCESSOR=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 42ba73784..34619e3eb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -963,6 +963,7 @@ CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZO=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -1634,6 +1635,9 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_ENETC is not set
+# CONFIG_FSL_ENETC_PTP_CLOCK is not set
+# CONFIG_FSL_ENETC_VF is not set
 # CONFIG_FSL_PQ_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
@@ -2934,6 +2938,7 @@ CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
@@ -3253,6 +3258,7 @@ CONFIG_MSI_WMI=m
 # CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
+CONFIG_MT7603E=m
 CONFIG_MT76x0E=m
 CONFIG_MT76x0U=m
 CONFIG_MT76x2E=m
@@ -3381,7 +3387,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETCONSOLE=m
 CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_DEVLINK=m
+CONFIG_NET_DEVLINK=y
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_DROP_MONITOR=y
 CONFIG_NET_DSA_BCM_SF2=m
@@ -4068,6 +4074,7 @@ CONFIG_PHY_CADENCE_SIERRA=m
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
 # CONFIG_PHY_MVEBU_CP110_COMPHY is not set
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@@ -6448,6 +6455,7 @@ CONFIG_X86_UV=y
 # CONFIG_X86_VSMP is not set
 CONFIG_X86_X2APIC=y
 # CONFIG_X86_X32 is not set
+CONFIG_XDP_SOCKETS_DIAG=m
 CONFIG_XDP_SOCKETS=y
 CONFIG_XEN_512GB=y
 CONFIG_XEN_ACPI_PROCESSOR=m
diff --git a/kernel.spec b/kernel.spec
index 582f5baca..964caa316 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 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -1885,6 +1885,9 @@ fi
 #
 #
 %changelog
+* Wed Mar 06 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git2.1
+- Linux v5.0-3452-g3717f613f48d
+
 * Tue Mar 05 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc0.git1.1
 - Linux v5.0-510-gcd2a3bf02625
 
diff --git a/sources b/sources
index 1b4af5040..28f8b4115 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
-SHA512 (patch-5.0-git1.xz) = 1c415781370137e68fe38d5f2435e291587b8d0444e5d59da0f0e38a084bd142a02f61b19155b62127a704652866f43f00930c05574443133468d85cf25fb981
+SHA512 (patch-5.0-git2.xz) = cc89b8a009990188582b30a4ed0fea717dd977c51be117daecf7afd13c92cb153d52c14598ccea503fb60a9f822cfe0b66fbb567894f44f296a34aee557bd255