Date:   Mon, 20 Mar 2023 22:40:56 -0700
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
Message-ID: <ZBlDaMh023N20uuo@bombadil.infradead.org>
References: <20230321132052.7d12fd7d@canb.auug.org.au>
 <20230321132227.5f63cd43@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20230321132227.5f63cd43@canb.auug.org.au>
Sender: Luis Chamberlain <mcgrof@infradead.org>
Precedence: bulk

On Tue, Mar 21, 2023 at 01:22:27PM +1100, Stephen Rothwell wrote:
> Hi all,
>=20
> 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:
> >=20
> >   mm/memory-failure.c
> >=20
> > between commit:
> >=20
> >   44b8f8bf2438 ("mm: memory-failure: add memory failure stats to sysfs")
> >=20
> > from Linus' tree and commit:
> >=20
> >   cfe7e6ea5ee2 ("mm: memory-failure: Move memory failure sysctls to its=
 own file")
> >=20
> > from the sysctl tree.
> >=20
> > 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.
>=20
> 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