diff mbox series

linux-next: manual merge of the sysctl tree with the hyperv tree

Message ID 20230424154742.131094-1-broonie@kernel.org
State New
Headers
Series linux-next: manual merge of the sysctl tree with the hyperv tree |

Commit Message

Mark Brown April 24, 2023, 3:47 p.m. UTC 
  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.

+++ b/drivers/hv/vmbus_drv.c

Comments

Wei Liu April 24, 2023, 5:42 p.m. UTC | #1 
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.
diff mbox series

Patch

diff --cc drivers/hv/vmbus_drv.c
index 1c65a6dfb9fae,229353f1e9c29..0000000000000
--- a/drivers/hv/vmbus_drv.c