Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp5016459rdb; Tue, 12 Dec 2023 16:59:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IGLM/Ph72CM+fmV9VwuD7HzZTqKCRdDR6QfaUP59jYO6B7WBuTYp3iJVLdW8Jw/HDuEwBpO X-Received: by 2002:a05:6a21:27a9:b0:191:60f5:2a9 with SMTP id rn41-20020a056a2127a900b0019160f502a9mr3093858pzb.80.1702429149831; Tue, 12 Dec 2023 16:59:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702429149; cv=none; d=google.com; s=arc-20160816; b=qhKrcHSyh11ogWtvCAuKvh+F1KFRjVXSkfOqbfo4qIsXm3I7Qv5HHs2JKv1EHwPpX3 uF/Kx6e+eh/De/5M5eMFjr0K0V1rN4gE/xQX/HIYUy8e4LyeJm7HgmXw0qD2EMKNzSlT Nwb7RikdzJIRAq9DEzuwb4Uu9+o3AfLFvSmrcPAjkQA0N0kKvX8hHWN9B42CpZN13FaV ngrHSsw6Vx6zo+AIqBamzYw0eTqU4SNtVcpHwHvUHXRCwh3Zhfu8/XmVWPvgLj1FEjiZ CrSHfTgbudoNNeOngeOfe6s0dnDFmPhiI34oFXulRs+n9ijui8obVhrdZe0iyhhKHwDW krVw== 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=KcEqEn+eIG9TyLxj3OVh5E9T+Hs/nxFado6LxKaKrPQ=; fh=7h42lSAy6ak7fHKoNqEe+EA8MQvI0n765BLgyq2cHWM=; b=0HOKt5UnFKSighGoT0WYJq27j8+rW1gyA7V7yuiEv15F2NDDQ3ctPb1L1gxjXSZzZs YEuA68MhPPv2kEWRCR87IdRZCfHcH2nq8eairQOqVS9MDlsxrsGORxBIyOlHDhgu2VX2 aNQOPtdtQ1uWuzsnEA/cd1bp7Cqdw9ZLLcT59Q2dTDgsKWVa666yDlmGaEZcmyCr1TYr e/Cpu7fxP1BIynZ1rqu/2VcCfaSTezYk5yxvScWk4KijEpWUjTxGC6dfnN4bT7ESAYFy Cxd3+ZBVPuO/kUQ90NE3EC8YPX1e1vxHJQ7xMzF9sqRNOMxodOdiu7G040Z4nEEG8KIX s1IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WKCLTH0H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id c9-20020a63d509000000b0057d7cff25besi8371765pgg.829.2023.12.12.16.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 16:59:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=WKCLTH0H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 202D8801B424; Tue, 12 Dec 2023 16:59:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232701AbjLMA6x (ORCPT + 99 others); Tue, 12 Dec 2023 19:58:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232621AbjLMA6v (ORCPT ); Tue, 12 Dec 2023 19:58:51 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F28999; Tue, 12 Dec 2023 16:58:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1702429137; bh=KcEqEn+eIG9TyLxj3OVh5E9T+Hs/nxFado6LxKaKrPQ=; h=Date:From:To:Cc:Subject:From; b=WKCLTH0HtmkVLSur7gjjjqAm5L8veTQ1vcKsOcOIBpyZynJwpqNeonzymS2vNtLm0 DfjvF18d+jsdHMQQ7yUWjgk9bmWDn8MG8EDyoD1Gy4k7tF+04F6fBKIk7fb6CyyodQ 2R2LN6LBpuETe87+Fl7Jz143Ed+BiToHXzEkWhxhXwsVYOHPh6CFWnsnRBpVefno8g hn+W55zY5nFP+/BQ0NFHo6X2oygcRummYKPK4WIsCFymp2bvbUiKIBePVpon3gOzu7 ul5D6rBFZKdVeGkUZWfxMQxhK9HMl29lSbXoWJhj3ylsQhVT75CJoT/L7ROsQmhzNp q+PhAzzpnQzPA== 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 4SqcYr2wCXz4wb1; Wed, 13 Dec 2023 11:58:56 +1100 (AEDT) Date: Wed, 13 Dec 2023 11:58:55 +1100 From: Stephen Rothwell To: Helge Deller , Dave Airlie Cc: DRI , Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" , Thomas Zimmermann Subject: linux-next: manual merge of the fbdev tree with the drm tree Message-ID: <20231213115855.561eb665@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/dzRJDCs.Qr4lbbREaDsnb0F"; 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 howler.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 (howler.vger.email [0.0.0.0]); Tue, 12 Dec 2023 16:59:07 -0800 (PST) --Sig_/dzRJDCs.Qr4lbbREaDsnb0F 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/vermilion/vermilion.c between commit: 76f92201b821 ("fbdev: Push pgprot_decrypted() into mmap implementations") from the drm tree and commit: d8a47ee16884 ("fbdev: Remove support for Carillo Ranch 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_/dzRJDCs.Qr4lbbREaDsnb0F Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmV5Ac8ACgkQAVBC80lX 0GyqyAf/SwpnR7NZupcNT8Vq8VYWkt96reqewgclKlkqI6dwoCp9RFu+44jrKJBz akVfNlJS0mIRyR85j0E9BsikCqZ8Y/a3KJaZ7zJNP8bCEc+1GiG92EAiJgBLq21r 0lsoUUhddX6+e3A3sxfB3TXkUAmuL2GTaXEfosI7wt36D9snHXboQlo81/zTNapj beXF6P9aM6TuRXjD64mkzS0GkfM3DvHSuxp65DQqH16KyQzUS+7aWuWQjlRbiqo0 VAgbTDkAGJPP37cbD31C5Iy5ke2NRxs88WmK+YNueZnNqfd6CNFDGCfHUM7Z6ZSF g1YnvnEjTCfOVi5pLLaWzcEbUaxtSg== =O0pK -----END PGP SIGNATURE----- --Sig_/dzRJDCs.Qr4lbbREaDsnb0F--