e52f3e9b13
Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From a018141970d80677d2822fef9d391b85bf9cf99f Mon Sep 17 00:00:00 2001
|
|
From: Joe Perches <joe@perches.com>
|
|
Date: Tue, 6 Feb 2018 15:42:33 -0800
|
|
Subject: [PATCH 2/3] MAINTAINERS: update "ARM/OXNAS platform support" patterns
|
|
|
|
Commit 9e6c62b05c1b ("ARM: dts: rename oxnas dts files") renamed the
|
|
files, update the patterns.
|
|
|
|
[akpm@linux-foundation.org: crunch into a single globbed term, per Arnd]
|
|
Link: http://lkml.kernel.org/r/b39d779e143b3c0a4e7dff827346e509447e3e8e.1517147485.git.joe@perches.com
|
|
Signed-off-by: Joe Perches <joe@perches.com>
|
|
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
|
|
Cc: Daniel Golle <daniel@makrotopia.org>
|
|
Cc: Arnd Bergmann <arnd@arndb.de>
|
|
Cc: Neil Armstrong <narmstrong@baylibre.com>
|
|
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
|
---
|
|
MAINTAINERS | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/MAINTAINERS
|
|
+++ b/MAINTAINERS
|
|
@@ -1677,9 +1677,7 @@ L: linux-arm-kernel@lists.infradead.org
|
|
L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
|
|
S: Maintained
|
|
F: arch/arm/mach-oxnas/
|
|
-F: arch/arm/boot/dts/ox8*.dtsi
|
|
-F: arch/arm/boot/dts/wd-mbwe.dts
|
|
-F: arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
|
|
+F: arch/arm/boot/dts/ox8*.dts*
|
|
N: oxnas
|
|
|
|
ARM/PALM TREO SUPPORT
|