Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5;
Date:   Wed, 18 Oct 2023 12:46:36 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Arnd Bergmann <arnd@arndb.de>, Dave Airlie <airlied@redhat.com>
Cc:     Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>,
        Ard Biesheuvel <ardb@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>
Subject: Re: linux-next: manual merge of the drm-misc tree with the
 asm-generic tree
Message-ID: <20231018124636.4a973762@canb.auug.org.au>
In-Reply-To: <20231013114602.4cea19d1@canb.auug.org.au>
References: <20231013114602.4cea19d1@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/IaZJTkHQNzxrMSOcD/.Bq6C";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

On Fri, 13 Oct 2023 11:46:02 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>=20
>   arch/ia64/include/asm/fb.h
>=20
> between commit:
>=20
>   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
>=20
> from the asm-generic tree and commit:
>=20
>   052ddf7b86d2 ("fbdev: Replace fb_pgprotect() with pgprot_framebuffer()")
>=20
> from the drm-misc tree.
>=20
> I fixed it up (I just removed the file) 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.

This is now a conflict between the asm-generic tree and the drm tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/IaZJTkHQNzxrMSOcD/.Bq6C
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUvOPwACgkQAVBC80lX
0GyvuwgAhp29SLuWA6DctRnsz791475JBOZwVFWtpwyBBs03kxF/2WpuKEKnUwNI
+NzfxlCwLtWwn6JE/Ef68oAO14GEVTZ2HFBtjTsxuUPaDdZmyPlq44569hMUPPmC
UXzXoeA1fFExegOG4xVHptitX7Jcm/+d1I/N1wrlHoFLoLUzll0WI9qKmlETH7sQ
oEwmcfSWCJAz67IQ8HlQoCALtXrpXgPHVcbq3+bocBJUecxqhSPdwRHhPdrSKp2G
0cOAjznwgJWPuP9JEbbpmDrMJhi5n6CNuemBO+6U+QqhPbQ7Vsn5ZM6v2fDdnKVq
9SeNy9GSuaMT2pbLFr2Tn0VqTa/NSw==
=cjeL
-----END PGP SIGNATURE-----

--Sig_/IaZJTkHQNzxrMSOcD/.Bq6C--