linux-next: manual merge of the driver-core tree with the reset tree
Mark Brown
maintainerHi 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
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.cbetween commit:
0e8b3bca280a7("reset: meson-audio-arb: Usedevm_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
No diff for the conflict?
thanks,
greg k-h
Mark Brown
maintainerQuoted 8 lines · Greg KH
drivers/reset/reset-meson-audio-arb.c
Quoted 4 lines · Mark Brown
drivers/reset/reset-meson-audio-arb.c +0
-0No diff for the conflict?
That's what happens when the merge winds up bringing in no changes.
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.cbetween commit:
0e8b3bca280a7("reset: meson-audio-arb: Usedevm_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
This is now a conflict between the driver-core tree and Linus' tree.
Signature · 2 lines
Cheers, Stephen Rothwell