linux-kernel - linux-next: manual merge of the drm tree with the pstore tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240827111647.5b127414@canb.auug.org.au>
Date: Tue, 27 Aug 2024 11:16:47 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dave Airlie <airlied@...hat.com>, Kees Cook <kees@...nel.org>
Cc: Jocelyn Falempe <jfalempe@...hat.com>, DRI
 <dri-devel@...ts.freedesktop.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Wen Yang <wen.yang@...ux.dev>
Subject: linux-next: manual merge of the drm tree with the pstore tree

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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/pstore/platform.c
index 84719e2bcbc4,9c6b7c97fa3c..000000000000
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@@ -285,10 -285,10 +285,10 @@@ static void pstore_dump(struct kmsg_dum
  	int		saved_ret = 0;
  	int		ret;
  
- 	why = kmsg_dump_reason_str(reason);
+ 	why = kmsg_dump_reason_str(detail->reason);
  
- 	if (pstore_cannot_block_path(reason)) {
+ 	if (pstore_cannot_block_path(detail->reason)) {
 -		if (!spin_trylock_irqsave(&psinfo->buf_lock, flags)) {
 +		if (!raw_spin_trylock_irqsave(&psinfo->buf_lock, flags)) {
  			pr_err("dump skipped in %s path because of concurrent dump\n",
  					in_nmi() ? "NMI" : why);
  			return;

Content of type "application/pgp-signature" skipped