From: Nathan Chancellor <nathan@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: linux-next: Tree for Apr 3
Date: Mon, 3 Apr 2023 08:51:47 -0700 [thread overview]
Message-ID: <20230403155147.GA239124@dev-arch.thelio-3990X> (raw)
In-Reply-To: <20230403202412.66d43f13@canb.auug.org.au>
Hi Stephen (and Greg, just as an FYI):
On Mon, Apr 03, 2023 at 08:24:12PM +1000, Stephen Rothwell wrote:
...
> Merging driver-core/driver-core-next (43ba3d4af7a7 pktcdvd: simplify the class_pktcdvd logic)
...
> Merging char-misc/char-misc-next (48a6c7bced2a cdx: add device attributes)
There is a semantic conflict between these two trees:
drivers/cdx/cdx.c:393:8: error: incompatible function pointer types initializing 'ssize_t (*)(const struct bus_type *, const char *, size_t)' (aka 'long (*)(const struct bus_type *, const char *, unsigned long)') with an expression of type
'ssize_t (struct bus_type *, const char *, size_t)' (aka 'long (struct bus_type *, const char *, unsigned long)') [-Wincompatible-function-pointer-types]
static BUS_ATTR_WO(rescan);
^~~~~~~~~~~~~~~~~~~
include/linux/device/bus.h:129:42: note: expanded from macro 'BUS_ATTR_WO'
struct bus_attribute bus_attr_##_name = __ATTR_WO(_name)
^~~~~~~~~~~~~~~~
include/linux/sysfs.h:135:11: note: expanded from macro '__ATTR_WO'
.store = _name##_store, \
^~~~~~~~~~~~~
<scratch space>:30:1: note: expanded from here
rescan_store
^~~~~~~~~~~~
1 error generated.
caused by commit 75cff725d956 ("driver core: bus: mark the struct
bus_type for sysfs callbacks as constant") in the driver-core tree
interacting with commit 2959ab247061 ("cdx: add the cdx bus driver") in
the char-misc tree. The following diff fixes it for me, could it be
applied to the merge of the char-misc tree (if I am reading the order of
your merges correctly)?
If there is a better or more appropriate way to report this, please let
me know.
Cheers,
Nathan
diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c
index 67c32cb2c006..38511fd36325 100644
--- a/drivers/cdx/cdx.c
+++ b/drivers/cdx/cdx.c
@@ -363,7 +363,7 @@ static struct attribute *cdx_dev_attrs[] = {
};
ATTRIBUTE_GROUPS(cdx_dev);
-static ssize_t rescan_store(struct bus_type *bus,
+static ssize_t rescan_store(const struct bus_type *bus,
const char *buf, size_t count)
{
struct cdx_controller *cdx;
next prev parent reply other threads:[~2023-04-03 15:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-03 10:24 linux-next: Tree for Apr 3 Stephen Rothwell
2023-04-03 15:51 ` Nathan Chancellor [this message]
2023-04-03 16:01 ` Greg Kroah-Hartman
2023-04-03 22:52 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-04-03 2:22 Stephen Rothwell
2020-04-03 5:29 Stephen Rothwell
2020-04-03 8:54 ` Yuehaibing
2020-04-03 9:00 ` Yuehaibing
2019-04-03 8:24 Stephen Rothwell
2018-04-03 9:03 Stephen Rothwell
2017-04-03 8:13 Stephen Rothwell
2014-04-03 5:02 Stephen Rothwell
2013-04-03 6:52 Stephen Rothwell
2012-04-03 3:41 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=20230403155147.GA239124@dev-arch.thelio-3990X \
--to=nathan@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).