* linux-next: manual merge of the vfs tree with the uml tree
@ 2015-06-01 2:05 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-06-01 2:05 UTC (permalink / raw)
To: Al Viro, Richard Weinberger; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-01 2:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-01 2:05 linux-next: manual merge of the vfs tree with the uml tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox