From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Theodore Ts'o <tytso@mit•edu>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jan Kara <jack@suse•cz>, Fabian Frederick <fabf@skynet•be>,
Christoph Hellwig <hch@infradead•org>,
Lukas Czerner <lczerner@redhat•com>
Subject: linux-next: manual merge of the akpm-current tree with the ext4 tree
Date: Fri, 1 Jul 2016 15:35:24 +1000 [thread overview]
Message-ID: <20160701153524.16bc4757@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/ext4/fsync.c
between commit:
78d962510796 ("ext4: respect the nobarrier mount option in nojournal mode")
from the ext4 tree and commit:
045d9e206ac0 ("fs/ext4/fsync.c: generic_file_fsync call based on barrier flag")
from the akpm-current tree.
I fixed it up (I used the ext4 tree version) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-07-01 5:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 5:35 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-02 7:43 linux-next: manual merge of the akpm-current tree with the ext4 tree Stephen Rothwell
2014-05-27 8:09 Stephen Rothwell
2013-08-19 7:06 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=20160701153524.16bc4757@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=fabf@skynet$(echo .)be \
--cc=hch@infradead$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=lczerner@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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