From: Andrew Morton <akpm@linux-foundation•org>
To: Jeff Layton <jlayton@poochiereds•net>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: manual merge of the akpm tree with the wberr tree
Date: Tue, 1 Aug 2017 15:32:30 -0700 [thread overview]
Message-ID: <20170801153230.4ac75584959f3f5391c2341c@linux-foundation.org> (raw)
In-Reply-To: <1501587093.4702.6.camel@poochiereds.net>
On Tue, 01 Aug 2017 07:31:33 -0400 Jeff Layton <jlayton@poochiereds•net> wrote:
> On Tue, 2017-08-01 at 06:59 -0400, Jeff Layton wrote:
> > On Tue, 2017-08-01 at 15:46 +1000, Stephen Rothwell wrote:
> > > Hi Andrew,
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in:
> > >
> > > include/linux/fs.h
> > >
> > > between commit:
> > >
> > > 9dcc0577f2a4 ("mm: remove optimizations based on i_size in mapping writeback waits")
> > >
> > > from the wberr tree and patch:
> > >
> > > "mm: remove optimizations based on i_size in mapping writeback waits"
> > >
> > > from the akpm tree.
> > >
> > > I fixed it up (I just dropped the akpm tree patch) 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.
> > >
> >
> > I didn't realize that Andrew was going to pick that one up. I'll drop it
> > from my tree.
Please don't do that. When a patch turns up in linux-next I'll drop my
copy. If you then drop your copy, the patch is lost.
> > Thanks!
>
> Actually, I take it back. Jan had some comments about the commit message
> and I'd like to revise this. Andrew, do you mind dropping this patch
> instead?
Yes, do that ;)
prev parent reply other threads:[~2017-08-01 22:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 5:46 linux-next: manual merge of the akpm tree with the wberr tree Stephen Rothwell
2017-08-01 10:59 ` Jeff Layton
2017-08-01 11:31 ` Jeff Layton
2017-08-01 22:32 ` Andrew Morton [this message]
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=20170801153230.4ac75584959f3f5391c2341c@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=jlayton@poochiereds$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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