linux-kernel - linux-next: manual merge of the driver-core tree with the modules 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20250110144051.36796c49@canb.auug.org.au>
Date: Fri, 10 Jan 2025 14:40:51 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Luis Chamberlain <mcgrof@...nel.org>, Petr
 Pavlu <petr.pavlu@...e.com>, Sami Tolvanen <samitolvanen@...gle.com>,
 Daniel Gomez <da.gomez@...sung.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Thomas Weißschuh
 <linux@...ssschuh.net>
Subject: linux-next: manual merge of the driver-core tree with the modules
 tree

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  kernel/module/sysfs.c

between commit:

  9953f4227850 ("module: sysfs: Add notes attributes through attribute_group")

from the modules tree and commit:

  3675a926feef ("sysfs: constify bin_attribute argument of sysfs_bin_attr_simple_read()")

from the driver-core 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 kernel/module/sysfs.c
index f99616499e2e,254017b58b64..000000000000
--- a/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@@ -190,8 -196,8 +190,8 @@@ static int add_notes_attrs(struct modul
  			nattr->attr.mode = 0444;
  			nattr->size = info->sechdrs[i].sh_size;
  			nattr->private = (void *)info->sechdrs[i].sh_addr;
- 			nattr->read = sysfs_bin_attr_simple_read;
+ 			nattr->read_new = sysfs_bin_attr_simple_read;
 -			++nattr;
 +			*(gattr++) = nattr++;
  		}
  		++loaded;
  	}

Content of type "application/pgp-signature" skipped