From patchwork Mon Oct 28 02:34:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13852859 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 0E68CD13592 for ; Mon, 28 Oct 2024 02:34:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7348A10E30C; Mon, 28 Oct 2024 02:34:45 +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="qxUBRCO+"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A01010E30C for ; Mon, 28 Oct 2024 02:34:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1730082881; bh=JDHWiN9NAo9LuoaCbWhzdDJS6nLwTnW098dN72JlDqM=; h=Date:From:To:Cc:Subject:From; b=qxUBRCO+aRZLSN3VKXR1G0fii3naedy+ScP32TccCRGfBwohPT0A9MQENaTtnzLci J4YK9vKzbvdy+99v/Un/ZGKHjmkFqEDsHpBFrgsOowdirY01PJFkv2WzglWx6kdHKp c5wmBqohMbAq0/PsfXAs0CPk0H6XzKqvVfPZVnOzf2/7+CSsbDJh6qhW4N1M8pTDyM SunNPo1JVo7v8F5Gml+osSLt3vjP8p499V0ZEgiDF8fFvQAxjFru12+fQUxOlfhD1+ 0DJx2TaS0qeLU2x8Ouk4coNt8PSmRFaA1RVt3KIFZ59LQD2deRplaCuensQD8yRh+V 725OqvAnaiW2w== 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 4XcHXc3s41z4x6k; Mon, 28 Oct 2024 13:34:40 +1100 (AEDT) Date: Mon, 28 Oct 2024 13:34:41 +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: <20241028133441.7b92ee4f@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/tiny/bochs.c between commit: 65f5bf96750f ("drm: handle HAS_IOPORT dependencies") from the asm-generic tree and commit: 7934a1c25097 ("drm/bochs: Use video aperture helpers") 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/tiny/bochs.c index e738bb858316,447989bb8201..000000000000 --- a/drivers/gpu/drm/tiny/bochs.c