Re: linux-next: manual merge of the driver-core tree with the modules tree

[Greg KH]

On Fri, Jan 10, 2025 at 02:40:51PM +1100, Stephen Rothwell wrote:
> 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;
>   	}

Looks good to me, thanks.

greg k-h