Skip to contentSkip to conversation

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

PATCH Mark Brown 3 participants 4 messages Jun 24, 2024 – Jul 23, 2024

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

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

drivers/reset/reset-meson-audio-arb.c

between commit:

0e8b3bca280a7 ("reset: meson-audio-arb: Use devm_clk_get_enabled()")

from the reset tree and commit:

b99e9c096148f ("reset: meson-audio-arb: Convert to platform remove callback returning void")

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.

drivers/reset/reset-meson-audio-arb.c +0 -0
diff --cc drivers/reset/reset-meson-audio-arb.c
index 894ad9d37a665,8740f5f6abf80..0000000000000
#1 lore raw

drivers/reset/reset-meson-audio-arb.c

Quoted 27 lines · Mark Brown

Hi all,

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

drivers/reset/reset-meson-audio-arb.c

between commit:

0e8b3bca280a7 ("reset: meson-audio-arb: Use devm_clk_get_enabled()")

from the reset tree and commit:

b99e9c096148f ("reset: meson-audio-arb: Convert to platform remove callback returning void")

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.

drivers/reset/reset-meson-audio-arb.c +0 -0
diff --cc drivers/reset/reset-meson-audio-arb.c
index 894ad9d37a665,8740f5f6abf80..0000000000000

No diff for the conflict?

thanks,

greg k-h

author maintainer
#2 lore raw
Quoted 8 lines · Greg KH

drivers/reset/reset-meson-audio-arb.c

Quoted 4 lines · Mark Brown
drivers/reset/reset-meson-audio-arb.c +0 -0
diff --cc drivers/reset/reset-meson-audio-arb.c
index 894ad9d37a665,8740f5f6abf80..0000000000000

No diff for the conflict?

That's what happens when the merge winds up bringing in no changes.

#3 lore raw
In reply to Mark Brown

Hi Mark,

drivers/reset/reset-meson-audio-arb.c

Quoted 26 lines · On Mon, 24 Jun 2024 18:35:57 +0100 Mark Brown <[email protected]> wrote:

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

drivers/reset/reset-meson-audio-arb.c

between commit:

0e8b3bca280a7 ("reset: meson-audio-arb: Use devm_clk_get_enabled()")

from the reset tree and commit:

b99e9c096148f ("reset: meson-audio-arb: Convert to platform remove callback returning void")

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.

drivers/reset/reset-meson-audio-arb.c +0 -0
diff --cc drivers/reset/reset-meson-audio-arb.c
index 894ad9d37a665,8740f5f6abf80..0000000000000

This is now a conflict between the driver-core tree and Linus' tree.

Signature · 2 lines
Cheers,
Stephen Rothwell