From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Theodore Ts'o" <tytso@mit.edu>
Subject: Re: linux-next: manual merge of the vfs tree with the ext4 tree
Date: Wed, 21 Dec 2011 11:43:44 +1100 [thread overview]
Message-ID: <20111221114344.dbe58177e02e83e572811e9e@canb.auug.org.au> (raw)
In-Reply-To: <20111221111801.75611ea16ad03f68e9856bd2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
Hi Al,
On Wed, 21 Dec 2011 11:18:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/ext4/ioctl.c between commit 5e8af306ef80 ("ext4: fix potential
> deadlock with setuid files and EXT4_IOC_MOVE_EXT") from theext4 tree and
> commit 99b4f71273d9 ("vfs: mnt_drop_write_file()") from the vfs tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Of course, the build still failed (see yesterday's report) :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2011-12-21 0:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-21 0:18 linux-next: manual merge of the vfs tree with the ext4 tree Stephen Rothwell
2011-12-21 0:43 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-27 22:51 Stephen Rothwell
2016-05-17 0:23 Stephen Rothwell
2016-05-17 3:16 ` Theodore Ts'o
2016-05-18 14:25 ` Arnd Bergmann
2016-05-19 1:26 ` Stephen Rothwell
2015-06-09 2:47 Stephen Rothwell
2015-05-11 0:49 Stephen Rothwell
2015-04-15 1:35 Stephen Rothwell
2015-04-14 1:30 Stephen Rothwell
2015-04-14 1:48 ` Al Viro
2015-04-14 17:00 ` Theodore Ts'o
2015-04-14 17:17 ` Al Viro
2015-04-14 21:02 ` Theodore Ts'o
2015-04-14 21:14 ` Al Viro
2015-04-13 1:48 Stephen Rothwell
2015-04-13 1:43 Stephen Rothwell
2015-04-07 4:00 Stephen Rothwell
2015-04-07 7:02 ` Christoph Hellwig
2015-04-07 7:36 ` Stephen Rothwell
2015-04-08 3:26 ` Theodore Ts'o
2015-04-14 16:18 ` Christoph Hellwig
2015-04-14 20:43 ` Theodore Ts'o
2014-05-27 2:07 Stephen Rothwell
2014-04-22 1:13 Stephen Rothwell
2012-01-06 2:54 Stephen Rothwell
2012-01-06 20:46 ` Djalal Harouni
2011-07-18 3:36 Stephen Rothwell
2011-07-25 2:38 ` Stephen Rothwell
2009-05-19 4:23 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111221114344.dbe58177e02e83e572811e9e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).