aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-08-26 06:29:39 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-30 19:44:47 +0200
commit05b8e84362b8455dec6db9b862826f21e8f24341 (patch)
treefc8ec494e6ca0531225d94be7346713d91e65893 /target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
parentf589bd9283457f0bfddfeb2af468a413a3802b9b (diff)
downloadupstream-05b8e84362b8455dec6db9b862826f21e8f24341.tar.gz
upstream-05b8e84362b8455dec6db9b862826f21e8f24341.tar.bz2
upstream-05b8e84362b8455dec6db9b862826f21e8f24341.zip
kernel: bump 5.4 to 5.4.61
Manually merged: backport-5.4 011-kbuild-export-SUBARCH.patch layerscape 701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch All other modifications made by update_kernel.sh Build-tested: x86/64, lantiq/xrx200, ramips/mt7621 Run-tested: ipq806x (R7800), lantiq/xrx200, x86/64, ramips (RT-AC57U) No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [minor commit message adjustments] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch b/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
index 079932d025..3c729498a9 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0263-net-dsa-ocelot-add-driver-for-Felix-switch-family.patch
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -17359,6 +17359,7 @@ M: Vladimir Oltean <vladimir.oltean@nxp.
+@@ -17360,6 +17360,7 @@ M: Vladimir Oltean <vladimir.oltean@nxp.
M: Claudiu Manoil <claudiu.manoil@nxp.com>
L: netdev@vger.kernel.org
S: Maintained