Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/hv/channel_mgmt.c
between commit:
37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two workqueues")
from the char-misc.current tree and commit:
4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API vmbus_get_outgoing_channel()")
from the char-misc tree.
I fixed it up (I used the former version where they conflicted) 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.
--
Cheers,
Stephen Rothwell
On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/hv/channel_mgmt.c
>
> between commit:
>
> 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two workqueues")
>
> from the char-misc.current tree and commit:
>
> 4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API vmbus_get_outgoing_channel()")
>
> from the char-misc tree.
>
> I fixed it up (I used the former version where they conflicted) 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.
Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
fixup patch for handling this merge issue, as they know it is happening
:(
thanks,
greg k-h
> From: Greg KH <[email protected]>
> Sent: Monday, December 3, 2018 11:43 PM
> On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the char-misc tree got a conflict in:
> >
> > drivers/hv/channel_mgmt.c
> >
> > between commit:
> >
> > 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to
> two workqueues")
> >
> > from the char-misc.current tree and commit:
> >
> > 4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API
> vmbus_get_outgoing_channel()")
> >
> > from the char-misc tree.
> >
> > I fixed it up (I used the former version where they conflicted) and can
> > carry the fix as necessary. This is now fixed as far as linux-next is
Hi Stephen,
Thank you! I can confirm your rebase for next-20181204 is correct:
37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two workqueues")
> > 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.
>
> Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
> fixup patch for handling this merge issue, as they know it is happening
> :(
>
> greg k-h
Since Stephen has fixed the merge issue correctly, I guess I may not need to send a fixup
patch for linux-next.git. If I didn't get it right, please let me know which tree/branch I
should work on to send a fixup patch.
It looks the conflict here happened because the two related patches, which modify
the same functions, went into different branches of char-misc.git. I didn't realize this
could happen... Sorry. The lesson I learnt is that I should not submit an urgent fix
with an unimportant clean-up patch at the same time, when they can cause a conflict.
Thanks,
-- Dexuan
On Tue, Dec 04, 2018 at 08:46:41AM +0000, Dexuan Cui wrote:
> > From: Greg KH <[email protected]>
> > Sent: Monday, December 3, 2018 11:43 PM
> > On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Today's linux-next merge of the char-misc tree got a conflict in:
> > >
> > > drivers/hv/channel_mgmt.c
> > >
> > > between commit:
> > >
> > > 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to
> > two workqueues")
> > >
> > > from the char-misc.current tree and commit:
> > >
> > > 4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API
> > vmbus_get_outgoing_channel()")
> > >
> > > from the char-misc tree.
> > >
> > > I fixed it up (I used the former version where they conflicted) and can
> > > carry the fix as necessary. This is now fixed as far as linux-next is
> Hi Stephen,
> Thank you! I can confirm your rebase for next-20181204 is correct:
> 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two workqueues")
>
> > > 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.
> >
> > Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
> > fixup patch for handling this merge issue, as they know it is happening
> > :(
> >
> > greg k-h
>
> Since Stephen has fixed the merge issue correctly, I guess I may not need to send a fixup
> patch for linux-next.git. If I didn't get it right, please let me know which tree/branch I
> should work on to send a fixup patch.
>
> It looks the conflict here happened because the two related patches, which modify
> the same functions, went into different branches of char-misc.git. I didn't realize this
> could happen... Sorry. The lesson I learnt is that I should not submit an urgent fix
> with an unimportant clean-up patch at the same time, when they can cause a conflict.
I have done the merge in my char-misc-next branch, can you verify that I
got it correct?
thanks,
greg k-h
> From: Greg KH <[email protected]>
> Sent: Monday, December 10, 2018 1:47 AM
> On Tue, Dec 04, 2018 at 08:46:41AM +0000, Dexuan Cui wrote:
> > > From: Greg KH <[email protected]>
> > > Sent: Monday, December 3, 2018 11:43 PM
> > > On Tue, Dec 04, 2018 at 03:35:13PM +1100, Stephen Rothwell wrote:
> > > > Hi all,
> > > >
> > > > Today's linux-next merge of the char-misc tree got a conflict in:
> > > >
> > > > drivers/hv/channel_mgmt.c
> > > >
> > > > between commit:
> > > >
> > > > 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels
> to
> > > two workqueues")
> > > >
> > > > from the char-misc.current tree and commit:
> > > >
> > > > 4d3c5c69191f ("Drivers: hv: vmbus: Remove the useless API
> > > vmbus_get_outgoing_channel()")
> > > >
> > > > from the char-misc tree.
> > > >
> > > > I fixed it up (I used the former version where they conflicted) and can
> > > > carry the fix as necessary. This is now fixed as far as linux-next is
> > Hi Stephen,
> > Thank you! I can confirm your rebase for next-20181204 is correct:
> > 37c2578c0c40 ("Drivers: hv: vmbus: Offload the handling of channels to two
> workqueues")
> >
> > > > 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.
> > >
> > > Yeah, this is a mess, I'll wait for the hyper-v developers to send me a
> > > fixup patch for handling this merge issue, as they know it is happening
> > > :(
> > >
> > > greg k-h
> >
> > Since Stephen has fixed the merge issue correctly, I guess I may not need to
> send a fixup
> > patch for linux-next.git. If I didn't get it right, please let me know which
> tree/branch I
> > should work on to send a fixup patch.
> >
> > It looks the conflict here happened because the two related patches, which
> modify
> > the same functions, went into different branches of char-misc.git. I didn't
> realize this
> > could happen... Sorry. The lesson I learnt is that I should not submit an urgent
> fix
> > with an unimportant clean-up patch at the same time, when they can cause a
> conflict.
>
> I have done the merge in my char-misc-next branch, can you verify that I
> got it correct?
>
> greg k-h
I checked the branch and everything is correct. Thanks a lot!
Thanks,
-- Dexuan