Received-SPF: pass (google.com: domain of linux-kernel+bounces-23723-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240108143627.29ac91fe@canb.auug.org.au> <2024010830-swimsuit-ferment-8b88@gregkh>
 <20240108115155.f2d2f1e5789d74b90d1b7426@hugovil.com>
In-Reply-To: <20240108115155.f2d2f1e5789d74b90d1b7426@hugovil.com>
From: Yury Norov <yury.norov@gmail.com>
Date: Thu, 11 Jan 2024 06:39:49 -0800
Message-ID: <CAAH8bW-eLNebwabvvJeos4XbB77p4vGsutkwGtKMxR5-HpzTDA@mail.gmail.com>
Subject: Re: linux-next: manual merge of the bitmap tree with the tty tree
To: Hugo Villeneuve <hugo@hugovil.com>
Cc: Greg KH <greg@kroah.com>, Stephen Rothwell <sfr@canb.auug.org.au>, 
	Hugo Villeneuve <hvilleneuve@dimonoff.com>, 
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, 
	Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 8, 2024 at 8:52=E2=80=AFAM Hugo Villeneuve <hugo@hugovil.com> w=
rote:
>
> On Mon, 8 Jan 2024 08:53:40 +0100
> Greg KH <greg@kroah.com> wrote:
>
> > On Mon, Jan 08, 2024 at 02:36:27PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the bitmap tree got a conflict in:
> > >
> > >   drivers/tty/serial/sc16is7xx.c
> > >
> > > between commits:
> > >
> > >   8a1060ce9749 ("serial: sc16is7xx: fix invalid sc16is7xx_lines bitfi=
eld in case of probe error")
> > >   3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using o=
ne regmap per port")
> > >
> > > from the tty tree and commit:
> > >
> > >   e63a961be48f ("serial: sc12is7xx: optimize sc16is7xx_alloc_line()")
> > >
> > > from the bitmap tree.
> > >
> > > I fixed it up (the former removed the function updated by the latter)=
 and
> > > can carry the fix as necessary. This is now fixed as far as linux-nex=
t
> > > is concerned, but any non trivial conflicts should be mentioned to yo=
ur
> > > upstream maintainer when your tree is submitted for merging.  You may
> > > also want to consider cooperating with the maintainer of the conflict=
ing
> > > tree to minimise any particularly complex conflicts.
> >
> > Fix looks coks correct, thanks.
>
> Yes, I confirm patch:
>     e63a961be48f ("serial: sc12is7xx: optimize sc16is7xx_alloc_line()")
>
> is now obsoleted by patch:
>     8a1060ce9749 ("serial: sc16is7xx: fix invalid sc16is7xx_lines
> bitfield in case of probe error")

Hi guys,

I've already sent a pull request that includes the e63a961be48f. If I'll ha=
ve to
re-send it, I'll exclude the obsolete patch. Otherwise, can you adjust the
8a1060ce9749?

Thanks,
Yury