linux-next: manual merge of the usb tree with the modules tree

linux-next: manual merge of the usb tree with the modules tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

Hi all,

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

  drivers/thunderbolt/tb.c

between commit:

  08abfa5a161e1 ("drivers: Replace __MODULE_STRING() with __stringify()")

from the modules tree and commit:

  41d5a1fc28100 ("thunderbolt: Move tb_apple_add_links() to pci.c")

from the usb 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.

diff --cc drivers/thunderbolt/tb.c
index 9537110a5aa8b,4da608ccbccbf..0000000000000
--- a/drivers/thunderbolt/tb.c
+++ b/drivers/thunderbolt/tb.c
@@@ -10,8 -10,6 +10,7 @@@
  #include <linux/errno.h>
  #include <linux/delay.h>
  #include <linux/pm_runtime.h>
- #include <linux/platform_data/x86/apple.h>
 +#include <linux/stringify.h>
  
  #include "tb.h"
  #include "tb_regs.h"

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Greg KH]

On Wed, Oct 14, 2026 at 04:01:37PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/thunderbolt/tb.c
> 
> between commit:
> 
>   08abfa5a161e1 ("drivers: Replace __MODULE_STRING() with __stringify()")
> 
> from the modules tree and commit:
> 
>   41d5a1fc28100 ("thunderbolt: Move tb_apple_add_links() to pci.c")
> 
> from the usb 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.
> 
> diff --cc drivers/thunderbolt/tb.c
> index 9537110a5aa8b,4da608ccbccbf..0000000000000
> --- a/drivers/thunderbolt/tb.c
> +++ b/drivers/thunderbolt/tb.c
> @@@ -10,8 -10,6 +10,7 @@@
>   #include <linux/errno.h>
>   #include <linux/delay.h>
>   #include <linux/pm_runtime.h>
> - #include <linux/platform_data/x86/apple.h>
>  +#include <linux/stringify.h>
>   
>   #include "tb.h"
>   #include "tb_regs.h"

Looks good to me, thanks!

greg k-h