linux-kernel - Re: linux-next: manual merge of the driver-core tree with the drivers-x86 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2024110719-detective-directly-fbcf@gregkh>
Date: Thu, 7 Nov 2024 09:51:28 +0100
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Hans de Goede <hdegoede@...hat.com>, Mark Gross <markgross@...nel.org>,
	Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Suma Hegde <suma.hegde@....com>,
	Thomas Weißschuh <linux@...ssschuh.net>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 drivers-x86 tree

On Thu, Nov 07, 2024 at 07:40:07PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/platform/x86/amd/hsmp.c
> 
> between commit:
> 
>   9df193087b9e ("platform/x86/amd/hsmp: Create hsmp/ directory")
> 
> from the drivers-x86 tree and commit:
> 
>   b626816fdd7f ("sysfs: treewide: constify attribute callback of bin_is_visible()")
> 
> from the driver-core tree.
> 
> I fixed it up (I deleted the file and applied the following patch) 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.
> 
> From: Stephen Rothwell <sfr@...b.auug.org.au>
> Date: Thu, 7 Nov 2024 19:36:12 +1100
> Subject: [PATCH] fix up for "sysfs: treewide: constify attribute callback of
>  bin_is_visible()"
> 
> interacting with "platform/x86/amd/hsmp: Create hsmp/ directory" from
> the drivers-x86 tree.
> 
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> ---
>  drivers/platform/x86/amd/hsmp/plat.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c
> index f8e74c0392ba..748bbc356484 100644
> --- a/drivers/platform/x86/amd/hsmp/plat.c
> +++ b/drivers/platform/x86/amd/hsmp/plat.c
> @@ -75,7 +75,7 @@ static ssize_t hsmp_metric_tbl_plat_read(struct file *filp, struct kobject *kobj
>  }
>  
>  static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj,
> -					 struct bin_attribute *battr, int id)
> +					 const struct bin_attribute *battr, int id)
>  {
>  	u16 sock_ind;
>  

Change looks good, thanks!

greg k-h