From: Christoph Hellwig <hch@lst•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Greg Ungerer <gerg@snapgear•com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>,
YueHaibing <yuehaibing@huawei•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the m68knommu tree
Date: Fri, 14 Jun 2019 11:32:18 +0200 [thread overview]
Message-ID: <20190614093218.GA17214@lst.de> (raw)
In-Reply-To: <20190614190606.559dc8dc@canb.auug.org.au>
On Fri, Jun 14, 2019 at 07:06:06PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/binfmt_flat.c
>
> between commit:
>
> 6071ecd874ac ("binfmt_flat: add endianess annotations")
>
> from the m68knommu tree and commit:
>
> db543c385059 ("fs/binfmt_flat.c: remove set but not used variable 'inode'")
Maybe this should better be added to the maintainer tree as well..
next prev parent reply other threads:[~2019-06-14 9:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 9:06 linux-next: manual merge of the akpm-current tree with the m68knommu tree Stephen Rothwell
2019-06-14 9:32 ` Christoph Hellwig [this message]
2019-07-08 23:21 ` 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=20190614093218.GA17214@lst.de \
--to=hch@lst$(echo .)de \
--cc=akpm@linux-foundation$(echo .)org \
--cc=gerg@snapgear$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=yuehaibing@huawei$(echo .)com \
/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