From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dexuan Cui <decui@microsoft.com>,
"K. Y. Srinivasan" <kys@microsoft.com>
Subject: Re: linux-next: manual merge of the char-misc tree with the char-misc.current tree
Date: Tue, 4 Dec 2018 08:42:41 +0100 [thread overview]
Message-ID: <20181204074241.GB27141@kroah.com> (raw)
In-Reply-To: <20181204153513.1e799336@canb.auug.org.au>
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
next prev parent reply other threads:[~2018-12-04 7:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 4:35 linux-next: manual merge of the char-misc tree with the char-misc.current tree Stephen Rothwell
2018-12-04 7:42 ` Greg KH [this message]
2018-12-04 8:46 ` Dexuan Cui
2018-12-10 9:47 ` Greg KH
2018-12-10 18:51 ` Dexuan Cui
2019-04-03 3:56 Stephen Rothwell
2019-04-03 5:06 ` Srinivas Kandagatla
2019-04-03 6:39 ` Bo YU
2019-10-18 3:26 Stephen Rothwell
2019-10-18 10:06 ` Greg KH
2021-12-06 3:49 Stephen Rothwell
2021-12-06 13:43 ` Andy Shevchenko
2021-12-06 16:17 ` Ralph Siemsen
2021-12-06 16:44 ` Andy Shevchenko
2021-12-13 9:18 ` Greg KH
2022-01-07 23:18 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181204074241.GB27141@kroah.com \
--to=greg@kroah.com \
--cc=arnd@arndb.de \
--cc=decui@microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).