* linux-next: manual merge of the userns tree with the nfs tree
@ 2014-09-09 5:36 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-09-09 5:36 UTC (permalink / raw)
To: Eric W. Biederman, Trond Myklebust; +Cc: linux-next, linux-kernel, Cong Wang
[-- Attachment #1: Type: text/plain, Size: 529 bytes --]
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in
fs/nfs/client.c between commit 21e81002f978 ("nfs: fix kernel warning
when removing proc entry") from the nfs tree and commit a1998908ba46
("nfs: fix kernel warning when removing proc entry") from the userns
tree. Slightly different version of the same fix.
I fixed it up (I used the version from the nfs tree) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-09-09 5:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-09 5:36 linux-next: manual merge of the userns tree with the nfs 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