From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Christoph Hellwig <hch@lst•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Martin Liu <liumartin@google•com>
Subject: linux-next: manual merge of the driver-core tree with the dma-mapping tree
Date: Fri, 1 Jun 2018 17:08:25 +1000 [thread overview]
Message-ID: <20180601170825.622c7084@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2018-06-01 7:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 7:08 Stephen Rothwell [this message]
2018-06-01 7:37 ` linux-next: manual merge of the driver-core tree with the dma-mapping tree Greg KH
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=20180601170825.622c7084@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=liumartin@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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