* linux-next: manual merge of the sysctl tree with the hyperv tree
@ 2023-04-24 15:47 broonie
2023-04-24 17:42 ` Wei Liu
0 siblings, 1 reply; 2+ messages in thread
From: broonie @ 2023-04-24 15:47 UTC (permalink / raw)
To: Luis Chamberlain
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Long Li,
Wei Liu
Hi all,
Today's linux-next merge of the sysctl tree got a conflict in:
drivers/hv/vmbus_drv.c
between commit:
9c318a1d9b500 ("Drivers: hv: move panic report code from vmbus to hv early init code")
from the hyperv tree and commit:
525f23fe58b59 ("hv: simplify sysctl registration")
from the sysctl 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/hv/vmbus_drv.c
index 1c65a6dfb9fae,229353f1e9c29..0000000000000
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the sysctl tree with the hyperv tree
2023-04-24 15:47 linux-next: manual merge of the sysctl tree with the hyperv tree broonie
@ 2023-04-24 17:42 ` Wei Liu
0 siblings, 0 replies; 2+ messages in thread
From: Wei Liu @ 2023-04-24 17:42 UTC (permalink / raw)
To: broonie
Cc: Luis Chamberlain, Linux Kernel Mailing List,
Linux Next Mailing List, Long Li, Wei Liu
On Mon, Apr 24, 2023 at 04:47:42PM +0100, broonie@kernel.org wrote:
> Hi all,
>
> Today's linux-next merge of the sysctl tree got a conflict in:
>
> drivers/hv/vmbus_drv.c
>
> between commit:
>
> 9c318a1d9b500 ("Drivers: hv: move panic report code from vmbus to hv early init code")
>
> from the hyperv tree and commit:
>
> 525f23fe58b59 ("hv: simplify sysctl registration")
>
> from the sysctl 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/hv/vmbus_drv.c
> index 1c65a6dfb9fae,229353f1e9c29..0000000000000
> --- a/drivers/hv/vmbus_drv.c
> +++ b/drivers/hv/vmbus_drv.c
Although this empty diff looks strange but it is indeed the correct
resolution, since Long's patch made the same changes as 525f23fe58b59.
Thanks,
Wei.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-04-24 17:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-24 15:47 linux-next: manual merge of the sysctl tree with the hyperv tree broonie
2023-04-24 17:42 ` Wei Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox