Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 27 Jul 2021 19:14:58 +0530
From:   Vinod Koul <vkoul@kernel.org>
To:     Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= 
        <u.kleine-koenig@pengutronix.de>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>, Greg KH <greg@kroah.com>,
        Dave Jiang <dave.jiang@intel.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
Message-ID: <YQAN2o+msGGpYWLG@matsya>
References: <20210723155354.082a62d8@canb.auug.org.au>
 <20210723091641.zse42sotjt2pqiif@pengutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20210723091641.zse42sotjt2pqiif@pengutronix.de>
Precedence: bulk

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

-- 
~Vinod