Hi Martin, Heiko,
Today's linux-next merge of the s390 tree got conflicts in
drivers/s390/net/qeth_l2_main.c and drivers/s390/net/qeth_l3_main.c
between commit 0f5623c9ebfc6576c5682ab3b335c57812f6c87e ("qeth: remove
non-recover-thread checkings") from the net-current tree and commit
fef944b54d0cf71d1f775532439f2e1c3ff3d29b ("[S390] convert qeth printks to
dev_xxx and pr_xxx macros.") from the s390 tree.
Overlapping removals. So I removed the whole sections i.e. used the
net-current version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpk8ODjjcSQg.pgp
Description: PGP signature
