Received-SPF: pass (google.com: domain of linux-kernel+bounces-19071-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: Mon, 8 Jan 2024 14:36:27 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Yury Norov <yury.norov@gmail.com>, Greg KH <greg@kroah.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Hugo Villeneuve
 <hvilleneuve@dimonoff.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the bitmap tree with the tty tree
Message-ID: <20240108143627.29ac91fe@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/joe/0VJoWKMra3/TtN=Q_XD";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/joe/0VJoWKMra3/TtN=Q_XD
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 bitfield in=
 case of probe error")
  3837a0379533 ("serial: sc16is7xx: improve regmap debugfs by using one reg=
map 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-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
Cheers,
Stephen Rothwell

--Sig_/joe/0VJoWKMra3/TtN=Q_XD
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWbbbsACgkQAVBC80lX
0GwWIwf/UTC0V4/vsfmGBdLPKQTKU10BciR19F+wmCfF5gbfHpjHabEzVPVK8HIF
C2pEfpFYfsm2dmMooUvcd3cnxYHyynq94U2omzBgPTgtXUjbSpDDH34eylehQHc3
nPFeUtvfkxhLCcoBAf3O6W5ubwzo1rNNLsJIP23/Sk2eDJJem/u4D9hH/Dxky6iU
Y2zuL7s0lCtLqiM15by9STcKUJjiSkDG2LUuIP5SULbool2XGcvGC0nKrGgRHE3P
7pFkO1/r6AUN6NXthYlqVOPzSroupqKu/HQ0klvsXpdaLcBLh3/+UUkEILBIDMRP
2gnN8vJVua9XmtOO7lX4z8l8Dq9yVw==
=s768
-----END PGP SIGNATURE-----

--Sig_/joe/0VJoWKMra3/TtN=Q_XD--