From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Theodore Ts'o <tytso@mit•edu>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Mel Gorman <mgorman@techsingularity•net>,
Christoph Hellwig <hch@lst•de>,
Andreas Gruenbacher <agruenba@redhat•com>
Subject: linux-next: manual merge of the akpm-current tree with the ext4 tree
Date: Thu, 2 Nov 2017 18:43:18 +1100 [thread overview]
Message-ID: <20171102184318.736bac24@canb.auug.org.au> (raw)
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
fs/ext4/file.c
between commit:
545052e9e35a ("ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA")
from the ext4 tree and commit:
f7d4010a3383 ("mm, pagevec: remove cold parameter for pagevecs")
from the akpm-current tree.
I fixed it up (the former removed the reference to pagevec_init that
was updated in the latter) 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:[~2017-11-02 7:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 7:43 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-07-01 5:35 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=20171102184318.736bac24@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agruenba@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mgorman@techsingularity$(echo .)net \
--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