Messages in this thread | | | Date | Tue, 8 Dec 2015 09:31:44 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the s390 tree |
| |
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
| |