Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5015767rdb; Tue, 12 Dec 2023 16:56:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IF6CoX7vcbVQkuQ9rsJgIciwwunQS9J5g/w79tbpWtFF8MktNaAFcsQW4UsZvUXA7y0ib/G X-Received: by 2002:a05:6a00:2311:b0:6ce:f74e:ff4f with SMTP id h17-20020a056a00231100b006cef74eff4fmr3363338pfh.50.1702429009462; Tue, 12 Dec 2023 16:56:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702429009; cv=none; d=google.com; s=arc-20160816; b=LXNVuzQZ+gu92jKraJemXtvSDtVBPEfjmJOSj8+CYn+0olvomgQEAD/GVgXmWnT/XG aeBb5rlSiKxN9tH0/EkQ9Sd/xP4I3xr6WQYB5IUAZxaYGr/xigCsG4BzX/L5+Bg3nYC9 iNlwvz6uYRmZAR8sy57LKSSN8y4Oyz4gIgbVhhhPfH//g7sstGcSXIJPTteMqxq3czqN 2OmMqzcDeLZK4qio9+c6hiS4Rm9x/vuIo3eMhN97yt5rlq1oslpb0VjuYeGEUYAJ6MrR Aq7DuUNUDQK7a3o0UTtpBfUAEfSbAQ97BDlGaV/XlkdGKQ4UCc44ggsn0VFLDJ2ESo98 SiTA== 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=fSqpKJ8HzYbAkrw0VUdBtWY8LU2YCqW2PJ/MneJimZ8=; fh=Nv1JACpKoN32kfjjzzz944XIKlQYjbp6YreaoGQGQIc=; b=ea3greFLlP3EpoX4A8QJi7J/X3BRvYjtA/kvcX96omiAQRWH2P4bVF8p7jhVcgPl4V gaycBF3uHTsBfnnck+3MQ+ZjtLAC2hl3tBiucvEwonilgg724iNlJz0vwiNDj/qx73Eh qAkQrdUdO8OcWcSP4N7NFPX99D3xGmRyVIPFASqOtgKdrnr+BTZAkDFpXkwmJV0elxbD XZDq0Cc85mzdnaRjHJByfM8HP/MN+UiQgzQr7BbJHCpXHIOOaOprUjM1AJqCeu/z9OlU iyxaFwZzl3Qwda5cXtdmUQHBS4YIyOK840DSMO3qjG8hyixs0VJsAyCmp+QM9MnKfN17 NRug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hlrYCOgr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id q12-20020a056a00088c00b006cb997ac3eesi8573400pfj.290.2023.12.12.16.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 16:56:49 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hlrYCOgr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id EEE8980B1A06; Tue, 12 Dec 2023 16:56:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235184AbjLMA4Q (ORCPT + 99 others); Tue, 12 Dec 2023 19:56:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232683AbjLMA4P (ORCPT ); Tue, 12 Dec 2023 19:56:15 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2021AA1; Tue, 12 Dec 2023 16:56:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702428975; bh=fSqpKJ8HzYbAkrw0VUdBtWY8LU2YCqW2PJ/MneJimZ8=; h=Date:From:To:Cc:Subject:From; b=hlrYCOgriJbNl/PCfw7psBgKitg9EBSXb32sDi6+T+evyD7IUAfPW5V4FmEfrMYDS a7gJ5j8zsg25K4kKRYdIwuTvakYnaFZa7npr2J12dQHj/EyidnuDat4Osmri25Wro6 8FbliHyugZbz9Hc2gJDrHM7Sf49OK17QULaHYl5l41Beuf0RAWAwH/S5nOZAsD8mco bG/k3bdHFTmYBW51zNZOZtJYLgkPScivEoyeh64og8lLg4obBgacHahIurCfhTjZtc nfhBONXJ4rokiFeSUWRqFao75J6pq1THuWeM3wtzRw7L/ekYWRU67Odx7HT7oHRQiW q+ncKVGqxQjrg== 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 4SqcVk2y7pz4wcj; Wed, 13 Dec 2023 11:56:13 +1100 (AEDT) Date: Wed, 13 Dec 2023 11:56:12 +1100 From: Stephen Rothwell To: Helge Deller , Dave Airlie Cc: DRI , Linus Walleij , 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: <20231213115612.4bbe3258@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Qh.ZrrYP3RXclK0Ec5S7dUz"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Tue, 12 Dec 2023 16:56:40 -0800 (PST) --Sig_/Qh.ZrrYP3RXclK0Ec5S7dUz 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/amba-clcd.c between commit: 76f92201b821 ("fbdev: Push pgprot_decrypted() into mmap implementations") from the drm tree and commit: 13366c25125e ("fbdev: amba-clcd: Delete the old CLCD driver") from the fbdev tree. I fixed it up (I just deleted 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_/Qh.ZrrYP3RXclK0Ec5S7dUz Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV5ASwACgkQAVBC80lX 0GzITwf+MprCy8he3YkNyx3AutdZX9UZCaE1PsKoYCXUJ+6TN/DGXy+L0GLCPp0r ExVDHecQbKwp58pFqiXPDpaiGc1Lz2x7QgKmzsArhvWAI79wLt/7Y0OYkDAMoynu gUQzK0xs5R8zobLqRTmlkO0MXfTewTFF7aUruoK+U08ZkhVnHSHMbousESPwWEH3 aO88up1U4UWwN/vDwZ5IvxP6+osu5W8+EI1/f0NZZG7TFzPyPfeBRh1nMWDtvQtv Fe19x+pCjBt3duB/u9/YLFsxzKdCw7OhBMR3ChqYfu9kxxWTnw41HPjARVxjMqpv whNp7OEFtTcxir5CZwAlpb7EnbaJbw== =HR3/ -----END PGP SIGNATURE----- --Sig_/Qh.ZrrYP3RXclK0Ec5S7dUz--