linux-next: manual merge of the vfs tree with the s390 tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the vfs tree with the s390 tree
Date	2015-12-07 23:40 +0100
Message-ID	<qDcBQ-2jb-17@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  drivers/s390/char/zcore.c

between commit:

  ffa52d02c50e ("s390/zcore: remove /sys/kernel/debug/zcore/mem")

from the s390 tree and commit:

  41fb31e4f962 ("new helper: no_seek_end_llseek()")

from the vfs tree.

I fixed it up (the former removed the code modifie by the latter, so I
did that) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the vfs tree with the s390 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 23:40 +0100

csiph-web