From: Jan Kara <jack@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jan Kara <jack@suse.cz>
Subject: Re: linux-next: manual merge of the akpm tree with the vfs tree
Date: Thu, 4 Apr 2013 14:33:47 +0200 [thread overview]
Message-ID: <20130404123347.GB26535@quack.suse.cz> (raw)
In-Reply-To: <20130404171211.3d359e39ca54e074f122d541@canb.auug.org.au>
On Thu 04-04-13 17:12:11, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c,
> fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c,
> fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit
> 36bd5dc0c4e2 ("lift sb_start_write/sb_end_write out of ->aio_write()")
> from the vfs tree and commit "fs: return EAGAIN when O_NONBLOCK write
> should block on frozen fs" from the akpm tree.
>
> The former was removing the code modified by the letter, so I just
> dropped the akpm tree patch and the following "ocfs2: add freeze
> protection to ocfs2_file_splice_write()".
Yeah, Al has been changing the area significantly. Andrew, you can drop
the three relevant patches from -mm since they'll have to be redone. ocfs2
should be actually fixed by Al's changes, psacct freeze remains but fixing
it will become trivial...
Honza
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
next prev parent reply other threads:[~2013-04-04 12:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-04 6:12 linux-next: manual merge of the akpm tree with the vfs tree Stephen Rothwell
2013-04-04 12:33 ` Jan Kara [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-15 11:33 Stephen Rothwell
2019-04-11 6:21 Stephen Rothwell
2018-05-17 6:36 Stephen Rothwell
2018-01-02 6:46 Stephen Rothwell
2016-12-12 5:52 Stephen Rothwell
2016-12-12 8:14 ` Ian Kent
2014-08-08 6:20 Stephen Rothwell
2013-09-10 4:41 Stephen Rothwell
2013-09-05 8:56 Stephen Rothwell
2013-04-30 5:54 Stephen Rothwell
2013-04-29 8:34 Stephen Rothwell
2013-04-29 8:25 Stephen Rothwell
2013-04-04 6:26 Stephen Rothwell
2013-04-04 6:56 ` Andrew Morton
2013-04-04 7:02 ` Andrew Morton
2013-04-04 8:10 ` Al Viro
2013-04-04 23:18 ` Stephen Rothwell
2013-04-04 8:02 ` Al Viro
2013-04-04 15:43 ` Nathan Zimmer
2013-04-04 6:17 Stephen Rothwell
2013-04-04 6:04 Stephen Rothwell
2013-02-25 3:40 Stephen Rothwell
2012-09-24 13:40 Stephen Rothwell
2012-09-24 13:12 Stephen Rothwell
2012-09-24 13:06 Stephen Rothwell
2012-07-22 5:44 Stephen Rothwell
2011-07-18 8:55 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=20130404123347.GB26535@quack.suse.cz \
--to=jack@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).