Skip to contentSkip to conversation

linux-next: manual merge of the tip tree with the pm tree

DISCUSSION Stephen Rothwell 2 participants 3 messages Feb 17, 2021 – Feb 22, 2021 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

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

arch/x86/platform/intel-mid/device_libs/platform_bt.c

between commit:

4590d98f5a4f ("sfi: Remove framework for deprecated firmware")

from the pm tree and commit:

bdb154f074a6 ("x86/platform/intel-mid: Convert comma to semicolon")

from the tip tree.

I fixed it up (the former removed the file, so I did that) 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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#1 lore raw
Quoted 15 lines · Stephen Rothwell

Hi all,

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

arch/x86/platform/intel-mid/device_libs/platform_bt.c

between commit:

4590d98f5a4f ("sfi: Remove framework for deprecated firmware")

from the pm tree and commit:

bdb154f074a6 ("x86/platform/intel-mid: Convert comma to semicolon")

Quoted 8 lines

from the tip tree.

I fixed it up (the former removed the file, so I did that) 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.

Yes, the file removal is the right thing to do.
Thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
In reply to Stephen Rothwell

Hi all,

Quoted 13 lines · On Wed, 17 Feb 2021 16:07:14 +1100 Stephen Rothwell <[email protected]>…

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

arch/x86/platform/intel-mid/device_libs/platform_bt.c

between commit:

4590d98f5a4f ("sfi: Remove framework for deprecated firmware")

from the pm tree and commit:

bdb154f074a6 ("x86/platform/intel-mid: Convert comma to semicolon")

Quoted 8 lines

from the tip tree.

I fixed it up (the former removed the file, so I did that) 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.

This is now a conflict between the pm tree and Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell