Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp5153759rwb; Mon, 31 Jul 2023 19:53:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlFl12gayxOwwb1zye8FQn1HiWwxpYLo5ei2agrDHHSWEAWc5OU7O2nMTB2XAcTCxu7e44nY X-Received: by 2002:a05:6a00:2185:b0:682:4ef7:9b17 with SMTP id h5-20020a056a00218500b006824ef79b17mr11429479pfi.32.1690858397872; Mon, 31 Jul 2023 19:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690858397; cv=none; d=google.com; s=arc-20160816; b=m5y9timpAoXAjIdBXuHgyF0dS5YB7Hg5imEJ6hqElaW7z5zokp2oY+uefWV4IO28Vy iO3WxAdaMfB2rbOhucddj5fxTt3eBxiO51x4TZvTD4N1sDZY1kb1ywVwbTgBbbacjZcw 6+RQRWpTD7CAWLe96S3cr6GqZhBx/VxNVOgDMCxY3RYbJ1Yj2q2/QMAHHpQTOKBVV32C KaGRmecB01jjqVLBjVR8SbcOHHSRj+9UoUTEAyAsONt2Bb2Lr1SoI1L9vcxSzXPVdYhE aj+/o1iCuGu0wQ0G7WAIMxThJYNVklwL6Rx4z5Dafz5o6Eoe8ODxFDjCW4hFar9j/FOH +JVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=UOeoP6o8nLk2lubr/P1iUVA7r8c0igQrDiDRg7uhqck=; fh=l2B0XAGAJt7pSKjCMGB/xQuAHBNM0aCSsuu2Pyd3LRA=; b=sXyBoe1mV0UrT+gkVaPt0gxS57gXxqfnvQososhItT7SgliljOBLuZvzsGlpwsqMQy q2xaHmZJ5gGuf8SRDwjAcocA5ttid26vlaSPjAMpjtfmOpA5dhcYS/KgxszVxnNbLFja yPZFBZSPjn/Umn6KE8Sas30L2MAr75LJxkzBff1HbkdD6Y26o7WftaYkT+5uekk5wsuo zHNb+iXsjydhsSltUxIseYNyPkOlO/dB0j+z6CKjYEjIEZgtkOc7Ksa/m2JbvM+B53hA 0DSFCsuqESM2iRcMEoPjS/hQiHnBFgiakSOOteCwiNXCPJmLr31+8Biyn9w09vEItz7+ SmuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=i8z5gH1T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ct20-20020a056a000f9400b006870ad022d2si6602782pfb.34.2023.07.31.19.53.05; Mon, 31 Jul 2023 19:53:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=i8z5gH1T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231271AbjHAAnR (ORCPT + 99 others); Mon, 31 Jul 2023 20:43:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjHAAnN (ORCPT ); Mon, 31 Jul 2023 20:43:13 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D2D319B7; Mon, 31 Jul 2023 17:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690850590; bh=UOeoP6o8nLk2lubr/P1iUVA7r8c0igQrDiDRg7uhqck=; h=Date:From:To:Cc:Subject:From; b=i8z5gH1ThEM/rpQyDHxRuBInnpf+wCP6sPpqztCO0IaUtGkv6KeoVxamg3ajLb4vI BnNN3EXXCzkkXn83i6eBI+WGyWh0hP+4jPyER2KHwcFA7a0Sgo3HXnm1ZEgps29+uq C+1hUTrBIcK1UcSOFelKuehFvBda+6pT/zpTYoXx9CaNjZIKBXWxFoqblCatzXhrEK qD6A2yYXC+oBmBf2LWPPDboDaKXNxBhX6PW+ttqlK9NsNgVN17AaKHQeTk5eVayHrR KkzwGAhkHx+cskKKC2Q3E3yVmfjSUL6p4zbYYrvQ4A7+0F2FmLc2UeTkJsgwjLGcZJ 0jv2Cu4eM0vbg== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RFGYT4X65z4wbj; Tue, 1 Aug 2023 10:43:09 +1000 (AEST) Date: Tue, 1 Aug 2023 10:43:08 +1000 From: Stephen Rothwell To: Helge Deller , Dave Airlie Cc: DRI , Fabio Estevam , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann Subject: linux-next: manual merge of the fbdev tree with the drm tree Message-ID: <20230801104308.0de7f835@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qc/9R..mTUGHjsXvnE7TEIt"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/qc/9R..mTUGHjsXvnE7TEIt 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: drivers/video/fbdev/mx3fb.c between commit: 8a4675ebbd30 ("fbdev: Remove FBINFO_FLAG_DEFAULT from framebuffer_alloc()= 'ed structs") from the drm tree and commit: 87ac8777d424 ("fbdev: mx3fb: Remove the driver") from the fbdev tree. 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. --=20 Cheers, Stephen Rothwell --Sig_/qc/9R..mTUGHjsXvnE7TEIt Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTIVRwACgkQAVBC80lX 0GweYQf+Luz0E8dd76dHdVBilRIJ/GhTDZ2mwr+kQ3IkvjiFx3pT+rQPiS4HZiz9 g0SQtwEYQKKFip2scQ5O6B8kcmcNGvd1cEVSnEBVlJ0EFl3e56x/ikwXUq7YeHP7 5BdZe/6EcneTovS4S6NZS9RoxVklwnyQvChPzgtpMSqUN79uk5DBF/GdJdbC14qR KLChDMDtR5D0teGj/nMi1e/wnuhh5fI97kU9xfFZw9Vn1NbN5ZFT3MlbkB8w3LK8 vLQhq19rTvKbRJnm+aYIuNgO2zst5VGfxUj1KAm3Ghsca6q+A1Q9WuX4Yr+EKP26 0zTMp6DamHhlmiS/vJbYaJxMojw7HQ== =ITek -----END PGP SIGNATURE----- --Sig_/qc/9R..mTUGHjsXvnE7TEIt--