From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Suzuki K Poulose <suzuki.poulose@arm•com>,
Mathieu Poirier <mathieu.poirier@linaro•org>
Subject: linux-next: manual merge of the char-misc tree with the driver-core tree
Date: Mon, 1 Jul 2019 19:09:40 +1000 [thread overview]
Message-ID: <20190701190940.7f23ac15@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/hwtracing/coresight/of_coresight.c
between commit:
418e3ea157ef ("bus_find_device: Unify the match callback with class_find_device")
from the driver-core tree and commits:
22aa495a6477 ("coresight: Rename of_coresight to coresight-platform")
20961aea982e ("coresight: platform: Use fwnode handle for device search")
from the char-misc tree.
I fixed it up (I removed the file and added the following merge fix patch)
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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Jul 2019 19:07:20 +1000
Subject: [PATCH] coresight: fix for "bus_find_device: Unify the match callback
with class_find_device"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/hwtracing/coresight/coresight-platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
index 3c5ceda8db24..fc67f6ae0b3e 100644
--- a/drivers/hwtracing/coresight/coresight-platform.c
+++ b/drivers/hwtracing/coresight/coresight-platform.c
@@ -37,7 +37,7 @@ static int coresight_alloc_conns(struct device *dev,
return 0;
}
-int coresight_device_fwnode_match(struct device *dev, void *fwnode)
+int coresight_device_fwnode_match(struct device *dev, const void *fwnode)
{
return dev_fwnode(dev) == fwnode;
}
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-07-01 9:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 9:09 Stephen Rothwell [this message]
2019-07-01 18:39 ` linux-next: manual merge of the char-misc tree with the driver-core tree Nathan Chancellor
2019-07-01 21:53 ` Stephen Rothwell
2019-07-01 20:04 ` Nathan Chancellor
2019-07-01 21:58 ` Stephen Rothwell
2019-07-02 14:18 ` Jean-Philippe Brucker
2019-07-02 15:18 ` Joerg Roedel
2019-07-02 15:23 ` Michael S. Tsirkin
2019-07-02 15:58 ` Joerg Roedel
2019-07-02 17:05 ` Michael S. Tsirkin
2019-07-02 21:41 ` Stephen Rothwell
2019-07-03 8:41 ` Suzuki K Poulose
2019-07-12 0:53 ` Stephen Rothwell
2019-07-15 20:22 ` Mathieu Poirier
-- strict thread matches above, loose matches on Subject: below --
2025-09-08 6:25 Stephen Rothwell
2025-09-08 8:57 ` Greg KH
2019-06-20 5:35 Stephen Rothwell
2019-06-20 6:20 ` Greg KH
2019-07-08 23:51 ` Stephen Rothwell
2019-07-09 7:12 ` Winkler, Tomas
2019-07-10 6:00 ` Stephen Rothwell
2019-06-13 5:53 Stephen Rothwell
2019-06-13 6:10 ` Greg KH
2019-07-08 23:20 ` Stephen Rothwell
2019-07-08 23:25 ` Nadav Amit
2019-07-09 6:15 ` Greg KH
2019-07-12 7:45 ` Greg KH
2017-02-01 4:28 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=20190701190940.7f23ac15@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=suzuki.poulose@arm$(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