Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Date:   Wed, 11 Oct 2023 12:16:49 -0700
From:   Luis Chamberlain <mcgrof@kernel.org>
To:     Joel Granados <j.granados@samsung.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Jens Axboe <axboe@kernel.dk>,
        Phillip Potter <phil@philpotter.co.uk>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: duplicate patch in the sysctl tree
Message-ID: <ZSb0oRABk03KOTKU@bombadil.infradead.org>
References: <CGME20231011052057eucas1p2876288636c2eaaf61a36985cffb29f8e@eucas1p2.samsung.com>
 <20231011162050.773ebb15@canb.auug.org.au>
 <20231011083612.4hymwsvc43hrwm6h@localhost>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20231011083612.4hymwsvc43hrwm6h@localhost>
Sender: Luis Chamberlain <mcgrof@infradead.org>
Precedence: bulk

On Wed, Oct 11, 2023 at 10:36:12AM +0200, Joel Granados wrote:
> On Wed, Oct 11, 2023 at 04:20:50PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >=20
> > The following commit is also in the block tree as a different commit
> > (but the same patch):
> >=20
> >   80f3c6cfab37 ("cdrom: Remove now superfluous sentinel element from ct=
l_table array")
> >=20
> > This is commit
> >=20
> >   114b0ff62a65 ("cdrom: Remove now superfluous sentinel element from ct=
l_table array")
> >=20
> > in the block tree.
> Is this a warning on the merge? or did it actually error out? if it is a
> wraning and one of the two was skipped, it can be safely ignored as they
> are the same. I can also remove that commit from my set and send another
> version. @luis: How do you want to handle it?

I just removed the cdrom patch from my tree.

  Luis