From patchwork Tue Aug 27 01:16:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13778683 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 D5330C5321D for ; Tue, 27 Aug 2024 01:16:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 53AD510E254; Tue, 27 Aug 2024 01:16:55 +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="ap/3qJJL"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5CD2D10E254 for ; Tue, 27 Aug 2024 01:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1724721408; bh=tqmAPvnAzaEIKis2MDMTjtpVaSeJDxe21zSxrryH++M=; h=Date:From:To:Cc:Subject:From; b=ap/3qJJL65r61EYmAFVTBzx2QotEK4CWaPXMyXk4zK8BD4cCdRnMjsRV0029XA7rF 103S3zCpM3M5xZ+KapcDVU8zUmb2t4WEX4MRoZD5PCgKI+GIxe3fifhoR9MeM+dNA2 WyhacyawgODawp2Z7GHzoqkMd775gZdbT0u9Qs4/u57CVoW4v0+xnTRtbAgatBpCVd WrcqxebD7FSdLPO1juGmKYjbWMq/kwNa15IK5Dz9gLYiilWiaUXmMiVvvjGyOjgq+v 487cVnI7XnsadyttLljkZAEe/54QGPTru9UvNdZmvH8n1oxXzlgEXqOGlZk/45pDEf j2QlZ27m0eubQ== 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 4Wt8lM4lWTz4wnx; Tue, 27 Aug 2024 11:16:47 +1000 (AEST) Date: Tue, 27 Aug 2024 11:16:47 +1000 From: Stephen Rothwell To: Dave Airlie , Kees Cook Cc: Jocelyn Falempe , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Wen Yang Subject: linux-next: manual merge of the drm tree with the pstore tree Message-ID: <20240827111647.5b127414@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: fs/pstore/platform.c between commit: 1bf8012fc699 ("pstore: replace spinlock_t by raw_spinlock_t") from the pstore tree and commit: e1a261ba599e ("printk: Add a short description string to kmsg_dump()") 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 fs/pstore/platform.c index 84719e2bcbc4,9c6b7c97fa3c..000000000000 --- a/fs/pstore/platform.c