Messages in this thread | | | Date | Wed, 14 Sep 2011 12:50:08 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the s390 tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in drivers/s390/cio/qdio_main.c between commit 003184781fea ("[S390] s390: fix mismatch in summation of I/O IRQ statistics") from the s390 tree and commit 104ea556ee7f ("qdio: support asynchronous delivery of storage blocks") from the net 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/s390/cio/qdio_main.c index a122c1c,9a12228..0000000 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@@ -14,6 -14,8 +14,7 @@@ #include <linux/timer.h> #include <linux/delay.h> #include <linux/gfp.h> + #include <linux/io.h> -#include <linux/kernel_stat.h> #include <linux/atomic.h> #include <asm/debug.h> #include <asm/qdio.h>
| |