From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Christoph Hellwig <hch@lst.de>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Martin Liu <liumartin@google.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the dma-mapping tree
Date: Fri, 1 Jun 2018 09:37:00 +0200 [thread overview]
Message-ID: <20180601073700.GA12809@kroah.com> (raw)
In-Reply-To: <20180601170825.622c7084@canb.auug.org.au>
On Fri, Jun 01, 2018 at 05:08:25PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> include/linux/device.h
>
> between commit:
>
> 3d6ce86ee794 ("drivers: remove force dma flag from buses")
>
> from the dma-mapping tree and commit:
>
> 8c97a46af04b ("driver core: hold dev's parent lock when needed")
>
> from the driver-core 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.
Fix looks great to me, thanks for this.
greg k-h
prev parent reply other threads:[~2018-06-01 7:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 7:08 linux-next: manual merge of the driver-core tree with the dma-mapping tree Stephen Rothwell
2018-06-01 7:37 ` Greg KH [this message]
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=20180601073700.GA12809@kroah.com \
--to=greg@kroah.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=liumartin@google.com \
--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