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 [email protected]
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
