[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20150702142617.4e6cec01@canb.auug.org.au>
Date: Thu, 2 Jul 2015 14:26:17 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>,
"Eric W. Biederman" <ebiederm@...ssion.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the akpm tree with the userns tree
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in:
fs/nsfs.c
between the userns tree and patch
"nsfs: fix for seq_printf() API change"
from the akpm tree.
The commit ed2ffc74eee8 ("nsfs: Add a show_path method to fix mountinfo")
that was being fixed by the akpm tree patch was dropped from the usernsn
tree, so I dropped the akpm tree patch as well.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists