lkml.org 
[lkml]   [2015]   [May]   [31]   [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 uml tree
Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/hppfs/hppfs.c between commit f74a14e870c8 ("um: Remove hppfs") from
the uml tree and commits 680baacbca69 ("new ->follow_link() and
->put_link() calling conventions"), 6e77137b363b ("don't pass nameidata
to ->follow_link()") and 5f2c4179e129 ("switch ->put_link() from dentry
to inode") from the vfs tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-06-01 04:41    [W:0.031 / U:1.940 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site