Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Mon, 23 Oct 2023 14:43:27 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Arnd Bergmann <arnd@arndb.de>
Cc:     Ard Biesheuvel <ardb@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        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 tty tree with the asm-generic tree
Message-ID: <20231023144327.7d18a847@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lY6zbmuHc_NYgREe9GwRz7g";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/lY6zbmuHc_NYgREe9GwRz7g
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the tty tree got conflicts in:

  arch/ia64/kernel/setup.c
  drivers/firmware/pcdp.c

between commit:

  cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")

from the asm-generic tree and commits:

  8a736ddfc861 ("vgacon: rework screen_info #ifdef checks")
  acfc78823326 ("vgacon: remove screen_info dependency")
  555624c0d10b ("vgacon: clean up global screen_info instances")

from the tty tree.

I fixed it up (I deleted the files) 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_/lY6zbmuHc_NYgREe9GwRz7g
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU1698ACgkQAVBC80lX
0Gzw6Af8CwiYTjOWYSB1KYDeZ3mWFgbZuLbzIwoB3Xcacx63y7xOTE3kE8IwIJXY
M356nrLmbipWG+aly01ofbSO+2qO7/P2/mLnzCrNpYWLxS/46m9EWBKtvIYMqgfO
n1P+St/S5Zo85qVACqMyuQlYNvRCoOlTXiiTCyXFgZNfmOqyQQWi+FSN6qnNhS1k
FpNiVwm+e6ZPkOFU+YCdfWeOjxdwl0DHd7NmSGwX6D+CHw8m0IoxBVfh+CUWBcNA
JEkgU95/LjbG9pvCXOUPGjN5i/FJbgnu9OS35AfI7bZDOPEmtK+JmqJu3IQmvxvS
EKv++w9a3XwcGj3LBxms9fOUNueEog==
=GwjP
-----END PGP SIGNATURE-----

--Sig_/lY6zbmuHc_NYgREe9GwRz7g--