Received-SPF: pass (google.com: domain of linux-kernel+bounces-28662-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Wed, 17 Jan 2024 19:49:34 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: Yury Norov <yury.norov@gmail.com>, Hugo Villeneuve <hugo@hugovil.com>,
 Hugo Villeneuve <hvilleneuve@dimonoff.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 bitmap tree with the tty tree
Message-ID: <20240117194934.1c7ac90a@canb.auug.org.au>
In-Reply-To: <2024011734-subside-attach-53ea@gregkh>
References: <20240108143627.29ac91fe@canb.auug.org.au>
	<2024010830-swimsuit-ferment-8b88@gregkh>
	<20240108115155.f2d2f1e5789d74b90d1b7426@hugovil.com>
	<CAAH8bW-eLNebwabvvJeos4XbB77p4vGsutkwGtKMxR5-HpzTDA@mail.gmail.com>
	<2024011734-subside-attach-53ea@gregkh>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/D7+sg75vTuE57uKI9Usmd+S";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/D7+sg75vTuE57uKI9Usmd+S
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 17 Jan 2024 09:14:57 +0100 Greg KH <greg@kroah.com> wrote:
>
> On Thu, Jan 11, 2024 at 06:39:49AM -0800, Yury Norov wrote:
> > On Mon, Jan 8, 2024 at 8:52=E2=80=AFAM Hugo Villeneuve <hugo@hugovil.co=
m> wrote: =20
> > >
> > > On Mon, 8 Jan 2024 08:53:40 +0100
> > > Greg KH <greg@kroah.com> wrote:
> > > =20
> > > > On Mon, Jan 08, 2024 at 02:36:27PM +1100, Stephen Rothwell wrote: =
=20
> > > > > 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 b=
itfield in case of probe error")
> > > > >   3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by usi=
ng one 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 lat=
ter) 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 t=
o your
> > > > > upstream maintainer when your tree is submitted for merging.  You=
 may
> > > > > also want to consider cooperating with the maintainer of the conf=
licting
> > > > > tree to minimise any particularly complex conflicts. =20
> > > >
> > > > Fix looks coks correct, thanks. =20
> > >
> > > 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") =20
> >=20
> > Hi guys,
> >=20
> > I've already sent a pull request that includes the e63a961be48f. If I'l=
l have to
> > re-send it, I'll exclude the obsolete patch. Otherwise, can you adjust =
the
> > 8a1060ce9749? =20
>=20
> We can not "adjust" anything, as I can't rebase a public tree, sorry.

Right, just leave both branches as they are and mention the conflict to
Linus when you send the pull request.  This is the normal way to sort
these out.  It only needs more work when the conflict is a particularly
difficult one.

--=20
Cheers,
Stephen Rothwell

--Sig_/D7+sg75vTuE57uKI9Usmd+S
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWnlJ4ACgkQAVBC80lX
0GxQPwf+JelOnb+aHPaf7OX5eKcYPydrSrYX07F0jRR5e5LWyuSUH9Qsiol+kLlb
7aM6P9x4btPe6dPITIsoSt6huU2m1lu+v5MPnIp2sE1rmRVqPD9zgA33l6S1Hirz
47IufgQU/z4aS291KDb7LoBIHBeDfID2g3EfaWiiI1rHjkmZ770v6kYdkjphkc9Z
W35p3GFrVNkRaELOEl257JMqsGWhwNCBvBtYUYN3QNwVpk5+IinyAIPt+yLTXADr
iBUe3vpelh3io3BPDYprLdpBMNt932IhxnmEEjQZppR3+OGa5p0Q3cXhP993p02b
dv7iUykTij+NRcc6BAFXX0EiRB2HBA==
=TlAX
-----END PGP SIGNATURE-----

--Sig_/D7+sg75vTuE57uKI9Usmd+S--