From: Luis Chamberlain <mcgrof@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Jiaqi Yan <jiaqiyan@google.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the sysctl tree with Linus' tree
Date: Mon, 20 Mar 2023 22:40:56 -0700 [thread overview]
Message-ID: <ZBlDaMh023N20uuo@bombadil.infradead.org> (raw)
In-Reply-To: <20230321132227.5f63cd43@canb.auug.org.au>
On Tue, Mar 21, 2023 at 01:22:27PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> On Tue, 21 Mar 2023 13:20:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the sysctl tree got a conflict in:
> >
> > mm/memory-failure.c
> >
> > between commit:
> >
> > 44b8f8bf2438 ("mm: memory-failure: add memory failure stats to sysfs")
> >
> > from Linus' tree and commit:
> >
> > cfe7e6ea5ee2 ("mm: memory-failure: Move memory failure sysctls to its own file")
> >
> > from the sysctl tree.
> >
> > I fixed it up (see below) 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.
>
> Sorry, I forgot the resolution - see below.
Oh sorry, its on Linus' tree, so I can just rebase too. Did that and
addressed the conflict as you did, thanks!
Luis
next prev parent reply other threads:[~2023-03-21 5:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-21 2:20 linux-next: manual merge of the sysctl tree with Linus' tree Stephen Rothwell
2023-03-21 2:22 ` Stephen Rothwell
2023-03-21 5:40 ` Luis Chamberlain [this message]
2023-03-21 14:42 ` Jiaqi Yan
-- strict thread matches above, loose matches on Subject: below --
2023-12-06 2:49 Stephen Rothwell
2009-11-17 8:04 Stephen Rothwell
2009-11-17 8:21 ` Eric W. Biederman
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=ZBlDaMh023N20uuo@bombadil.infradead.org \
--to=mcgrof@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=jiaqiyan@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wangkefeng.wang@huawei.com \
/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).