From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A652DCDB483 for ; Wed, 18 Oct 2023 01:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229507AbjJRBqp (ORCPT ); Tue, 17 Oct 2023 21:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjJRBqn (ORCPT ); Tue, 17 Oct 2023 21:46:43 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65FDCC6; Tue, 17 Oct 2023 18:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697593598; bh=sK387LiYhZZbkHvAzGKdwmMCDSjgPgBjg6FV5LLzqpI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Zt2G0UiaO/1mn+X0nXtIwgkgTNsiZBffL3n0N05NwIK5isp1EjNvo3c76MQ/neNtB hc6VP5VVpeoeVkRTyy/UyH/bbfC3vHMeExB349w263/PeTAn3EIpIhz9y2k1XdwGCm vJuUykPIY9VV2fMvjvJYC3/1l6uMjNGB/9v1rAJBeYA/6VmHVgMXa5roiATUiek365 fjWy5Sc6+FIGzDhpaTjzwyne/u7U8nIoA9aEedmF4XvTCNtcXUZ0Ckqu59kmw74HFC OIXDrZs/uJ3gKjhUecSC8yIz1/PGyfY/BxdE4SESAmcQI+xGXEqbjHDEDe4qNZIFoQ sK2Yzr4q8c4Zw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S9DGj1v2pz4xNq; Wed, 18 Oct 2023 12:46:36 +1100 (AEDT) Date: Wed, 18 Oct 2023 12:46:36 +1100 From: Stephen Rothwell To: Arnd Bergmann , Dave Airlie Cc: Daniel Vetter , Intel Graphics , DRI , Ard Biesheuvel , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --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 = 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--