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

[Stephen Rothwell]

Hi all,

On Thu, 7 Nov 2024 19:40:07 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
> ---
>  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;
>  
> -- 
> 2.45.2

It also required this:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 7 Nov 2024 19:57:41 +1100
Subject: [PATCH] another fix 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@xxxxxxxxxxxxxxxx>
---
 drivers/platform/x86/amd/hsmp/acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c
index 4aa4d66f491a..dd5b5773328a 100644
--- a/drivers/platform/x86/amd/hsmp/acpi.c
+++ b/drivers/platform/x86/amd/hsmp/acpi.c
@@ -236,7 +236,7 @@ static ssize_t hsmp_metric_tbl_acpi_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)
 {
 	if (hsmp_pdev->proto_ver == HSMP_PROTO_VER6)
 		return battr->attr.mode;
-- 
2.45.2

-- 
Cheers,
Stephen Rothwell

Attachment: pgp4lexOU34LD.pgp
Description: OpenPGP digital signature