LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* linux-next: manual merge of the driver-core tree with the dma-mapping tree
@ 2018-06-01  7:08 Stephen Rothwell
  2018-06-01  7:37 ` Greg KH
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-06-01  7:08 UTC (permalink / raw)
  To: Greg KH, Christoph Hellwig
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Martin Liu

[-- Attachment #1: Type: text/plain, Size: 1799 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/device.h
index 00b6c3b42437,beca424395dd..000000000000
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@@ -98,6 -96,10 +98,8 @@@ extern void bus_remove_file(struct bus_
   * @p:		The private data of the driver core, only the driver core can
   *		touch this.
   * @lock_key:	Lock class key for use by the lock validator
 - * @force_dma:	Assume devices on this bus should be set up by dma_configure()
 - * 		even if DMA capability is not explicitly described by firmware.
+  * @need_parent_lock:	When probing or removing a device on this bus, the
+  *			device core should lock the device's parent.
   *
   * A bus is a channel between the processor and one or more devices. For the
   * purposes of the device model, all devices are connected via a bus, even if
@@@ -138,6 -138,9 +140,8 @@@ struct bus_type 
  
  	struct subsys_private *p;
  	struct lock_class_key lock_key;
+ 
 -	bool force_dma;
+ 	bool need_parent_lock;
  };
  
  extern int __must_check bus_register(struct bus_type *bus);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: linux-next: manual merge of the driver-core tree with the dma-mapping tree
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2018-06-01  7:37 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Christoph Hellwig, Linux-Next Mailing List,
	Linux Kernel Mailing List, Martin Liu

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-06-01  7:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).