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 C7760C3DA78 for ; Mon, 16 Jan 2023 00:54:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231665AbjAPAyq (ORCPT ); Sun, 15 Jan 2023 19:54:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231716AbjAPAyo (ORCPT ); Sun, 15 Jan 2023 19:54:44 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2EF093C3; Sun, 15 Jan 2023 16:54:43 -0800 (PST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NwD7k0tyQz4x1N; Mon, 16 Jan 2023 11:54:41 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1673830482; bh=EBOGXbwcbb87Bkp7IUfdt93GV/AbQEitRGQA5HtmKFU=; h=Date:From:To:Cc:Subject:From; b=oJ5HwAS6D8VskXVQyfXHC9iSwWR/ng1ZsGp98X9D41XHaL0kNmJBoosp4LauIVKe5 /Odr3TLjuztOGG9/ppHwpCCK1ctwA7JUgr3f+85q4WIpXUysNhl0rA1wOFnTpriPRV m4yEIzW1mfHIkx8Zcvk7BNZAkEOOdlYdnCJrJPOF0atyWylcMFoOX1pwBQuye+j7DS 9HkNFHzQsVFjw8/OhL783hTz2BJdnPcckqnr5QyFCfd2owobJhzFkMPbXsztoWOz6Z q1eioKhMzMUz/KFWhA/xQv+6x3s8utsE3iGrGTWEizcthGgnJeDQbcHdRPmLFDGa9r wCTJ2BS//OKDg== Date: Mon, 16 Jan 2023 11:54:40 +1100 From: Stephen Rothwell To: Helge Deller , Daniel Vetter Cc: Intel Graphics , DRI , Kees Cook , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann Subject: linux-next: manual merge of the fbdev tree with the drm-misc tree Message-ID: <20230116115440.3f1909cd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/4891LzL3eq9V4IvMn8hdC4+"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/4891LzL3eq9V4IvMn8hdC4+ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the fbdev tree got a conflict in: include/linux/fb.h between commit: 5b6373de4351 ("drm/fbdev: Remove aperture handling and FBINFO_MISC_FIRMWA= RE") from the drm-misc tree and commit: 72ac3535c2c5 ("fbdev: fb.h: Replace 0-length array with flexible array") from the fbdev tree. I fixed it up (I just used the former version) 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_/4891LzL3eq9V4IvMn8hdC4+ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPEoFAACgkQAVBC80lX 0GwwrAf/VA6njrNk/Uny48sFLu68N7KA/wk8F+LOOsqSaxr8SOzUmTPpvqt/PTWE z3An1Zji4W/3xtyQfqgi7QzYLosWd4lKkBHvNwvGmdYopxSR10DbGetPVwZV1zPN GV3W5yKWRH/Rn5LiZwnDcwRJ/QqNjjUzSYpF98tKOMiqseWV2VxdPNs3W3Np9czM cszbizauJXQy/AMssUu0Cv5OYcs6ALvK0WRrQyQHBl99V2w9zJi7q5j8BfGIcfUO KafAjIOE27a0BUOzg2gluGBvrNOHAV2Th5Hjv9+Rfhu/C66iSjcwXmzWyxd+kTu/ ZBXkHKYcVCwbal4pmWUxg48Qh10KIw== =+9UO -----END PGP SIGNATURE----- --Sig_/4891LzL3eq9V4IvMn8hdC4+--