* linux-next: manual merge of the gpio tree with the watchdog tree
@ 2016-03-02 4:22 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2016-03-02 4:22 UTC (permalink / raw)
To: Linus Walleij, Wim Van Sebroeck
Cc: linux-next, linux-kernel, William Breathitt Gray
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
MAINTAINERS
between commit:
c36a483d8007 ("watchdog: Add watchdog timer support for the WinSystems EBC-C384")
from the watchdog tree and commit:
9c26df9b27b6 ("gpio: Add GPIO support for the WinSystems WS16C48")
from the gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index e3bb7755763a,6ec2be8ff68d..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11972,12 -11870,12 +11982,18 @@@ M: David Härdeman <david@hardeman.nu
S: Maintained
F: drivers/media/rc/winbond-cir.c
+WINSYSTEMS EBC-C384 WATCHDOG DRIVER
+M: William Breathitt Gray <vilhelm.gray@gmail.com>
+L: linux-watchdog@vger.kernel.org
+S: Maintained
+F: drivers/watchdog/ebc-c384_wdt.c
+
+ WINSYSTEMS WS16C48 GPIO DRIVER
+ M: William Breathitt Gray <vilhelm.gray@gmail.com>
+ L: linux-gpio@vger.kernel.org
+ S: Maintained
+ F: drivers/gpio/gpio-ws16c48.c
+
WIMAX STACK
M: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
M: linux-wimax@intel.com
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-02 4:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-02 4:22 linux-next: manual merge of the gpio tree with the watchdog tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).