lkml.org 
[lkml]   [2015]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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


\
 
 \ /
  Last update: 2015-12-07 23:41    [W:0.029 / U:0.676 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site