* linux-next: manual merge of the moduleh tree with the scsi-rc-fixes tree
@ 2011-08-30 5:48 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-08-30 5:48 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, Vasu Dev
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
drivers/scsi/libfc/fc_lport.c between commit 77a2b73a7805 ("[SCSI] libfc:
fix fc_eh_host_reset") from the scsi-rc-fixes tree and commit
84211284f18e ("scsi: Add module.h to drivers/scsi users who really need
it") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/scsi/libfc/fc_lport.c
index 628f347,f4e4885..0000000
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@@ -88,7 -88,7 +88,8 @@@
*/
#include <linux/timer.h>
+#include <linux/delay.h>
+ #include <linux/module.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-30 5:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-30 5:48 linux-next: manual merge of the moduleh tree with the scsi-rc-fixes 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).