* linux-next: manual merge of the watchdog tree with the mvebu tree
@ 2014-02-25 4:25 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-02-25 4:25 UTC (permalink / raw)
To: Wim Van Sebroeck, Jason Cooper, andrew, gregory.clement,
linux-arm-kernel
Cc: linux-next, linux-kernel, Ezequiel Garcia
[-- Attachment #1: Type: text/plain, Size: 982 bytes --]
Hi Wim,
Today's linux-next merge of the watchdog tree got a conflict in
drivers/watchdog/orion_wdt.c between commit e97662e1e28d ("watchdog:
orion: Handle the interrupt so it's properly acked") from the mvebu tree
and commit 2e9a2ff49520 ("watchdog: delete non-required instances of
include <linux/init.h>") from the watchdog tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/watchdog/orion_wdt.c
index 15321aa0bb94,498163497c1c..000000000000
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@@ -18,9 -18,8 +18,8 @@@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
- #include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/io.h>
-#include <linux/spinlock.h>
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/of.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-02-25 4:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-25 4:25 linux-next: manual merge of the watchdog tree with the mvebu 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).