linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Jiang <dave.jiang@intel.com>
To: "Vinod Koul" <vkoul@kernel.org>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the dmaengine tree with the driver-core tree
Date: Tue, 27 Jul 2021 11:02:08 -0700	[thread overview]
Message-ID: <f79920e9-52d5-82e2-e8aa-5e5e3096ac79@intel.com> (raw)
In-Reply-To: <YQAN2o+msGGpYWLG@matsya>


On 7/27/2021 6:44 AM, Vinod Koul wrote:
> On 23-07-21, 11:16, Uwe Kleine-König wrote:
>> Hello,
>>
>> On Fri, Jul 23, 2021 at 03:53:54PM +1000, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the dmaengine tree got a conflict in:
>>>
>>>    drivers/dma/idxd/sysfs.c
>>>
>>> between commit:
>>>
>>>    fc7a6209d571 ("bus: Make remove callback return void")
>>>
>>> from the driver-core tree and commit:
>>>
>>>    d9e5481fca74 ("dmaengine: dsa: move dsa_bus_type out of idxd driver to standalone")
>>>
>>> from the dmaengine tree.
>> Greg provided a tag for this case at
>>
>> 	git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git tags/bus_remove_return_void-5.15
>>
>> . Vinod might want to rebase on top of this or merge it into his tree
>> with Stephen's conflict resolution.
> Thanks I have merged the tag and resolved conflict as above.
>
> Dave pls test

Tested. Looks good. Thx.


>

  reply	other threads:[~2021-07-27 18:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-23  5:53 Stephen Rothwell
2021-07-23  9:16 ` Uwe Kleine-König
2021-07-27 13:44   ` Vinod Koul
2021-07-27 18:02     ` Dave Jiang [this message]
2021-07-28  7:10 ` Improvement suggestion for creation of next [Was: linux-next: manual merge of the dmaengine tree with the driver-core tree] Uwe Kleine-König
2021-09-16  6:27   ` Stephen Rothwell
2021-09-16  9:52     ` Uwe Kleine-König
2021-09-16 12:23       ` Stephen Rothwell

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=f79920e9-52d5-82e2-e8aa-5e5e3096ac79@intel.com \
    --to=dave.jiang@intel.com \
    --cc=greg@kroah.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=u.kleine-koenig@pengutronix.de \
    --cc=vkoul@kernel.org \
    --subject='Re: linux-next: manual merge of the dmaengine tree with the driver-core tree' \
    /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

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).