From patchwork Mon Oct 28 02:29:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13852858 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63208D13592 for ; Mon, 28 Oct 2024 02:29:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA51410E28D; Mon, 28 Oct 2024 02:29:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Ho1cZ+ll"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BB5210E28D for ; Mon, 28 Oct 2024 02:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1730082569; bh=DtCkAVAEc3Y0s+qaAQzJ7S7dJ/qpMzYRGAoTLAgQp5c=; h=Date:From:To:Cc:Subject:From; b=Ho1cZ+llhAulgCfkrsBVpVXa5KeAf/tMBFWzrPsX5u0mSgfclatJPVfuQRyf2sCBg 4RiUOuD2B5xlcfVOD5RjygFf+3QBYU5Ah8yGZ1Wyv0zvv6yZaimNriCs0gGoR3V9Ol trog6I3q7cIkfOlAZhST/w6MX8CpVKWjDJ9XOcDVLo6PCqjMF1VeDiJgP3xhIHVc1c mva3qTV+ApWy9iy3PTZayRTFbZrsFiF7gSOgMwJnsGACtANOsbZ/qIb8hr22JpEH88 lCNY8I+A3N+BXjys0qhakOvh/g/AF+qUjcA/awf3qfBpiM/swuvkky309obPh3K8CQ U55I6vrq99+dQ== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XcHQc6jvHz4w2L; Mon, 28 Oct 2024 13:29:28 +1100 (AEDT) Date: Mon, 28 Oct 2024 13:29:29 +1100 From: Stephen Rothwell To: Dave Airlie , Arnd Bergmann Cc: DRI , Arnd Bergmann , Linux Kernel Mailing List , Linux Next Mailing List , Niklas Schnelle , Thomas Zimmermann Subject: linux-next: manual merge of the drm tree with the asm-generic tree Message-ID: <20241028132929.3786e425@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/qxl/Kconfig between commit: 65f5bf96750f ("drm: handle HAS_IOPORT dependencies") from the asm-generic tree and commit: 92c13542e878 ("drm/qxl: Run DRM default client setup") from the drm tree. I fixed it up (see below) 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. diff --cc drivers/gpu/drm/qxl/Kconfig index 17d6927e5e23,1992df4a82d2..000000000000 --- a/drivers/gpu/drm/qxl/Kconfig