On Fri, Jul 12, 2019 at 09:40:23AM +0200, Greg KH wrote: > On Fri, Jul 12, 2019 at 09:36:23AM +0200, Greg KH wrote: > > The following changes since commit f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a: > > > > Linux 5.2-rc3 (2019-06-02 13:55:33 -0700) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git > > tags/driver-core-5.3-rc1 > > > > for you to fetch changes up to c33d442328f556460b79aba6058adb37bb555389: > > > > debugfs: make error message a bit more verbose (2019-07-08 10:44:57 +0200) > > > > ---------------------------------------------------------------- > > Driver Core and debugfs changes for 5.3-rc1 > > > > Here is the "big" driver core and debugfs changes for 5.3-rc1 > > > > It's a lot of different patches, all across the tree due to some api > > changes and lots of debugfs cleanups. Because of this, there is going > > to be some merge issues with your tree at the moment, I'll follow up > > with the expected resolutions to make it easier for you. > > > > Other than the debugfs cleanups, in this set of changes we have: > > - bus iteration function cleanups (will cause build warnings > > with s390 and coresight drivers in your tree) > > And here is the patch that should resolve the coresight build issue. >
> From: Nathan Chancellor <natechancel...@gmail.com> > Date: Mon, 1 Jul 2019 11:28:08 -0700 > Subject: [PATCH] coresight: Make the coresight_device_fwnode_match > declaration's fwnode parameter const > > drivers/hwtracing/coresight/coresight.c:1051:11: error: incompatible pointer > types passing 'int (struct device *, void *)' to parameter of type 'int > (*)(struct device *, const void *)' [-Werror,-Wincompatible-pointer-types] > coresight_device_fwnode_match); > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > include/linux/device.h:173:17: note: passing argument to parameter 'match' > here > int (*match)(struct device *dev, const void > *data)); > ^ > 1 error generated. > > Signed-off-by: Nathan Chancellor <natechancel...@gmail.com> > --- > drivers/hwtracing/coresight/coresight-priv.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hwtracing/coresight/coresight-priv.h > b/drivers/hwtracing/coresight/coresight-priv.h > index 8b07fe55395a..7d401790dd7e 100644 > --- a/drivers/hwtracing/coresight/coresight-priv.h > +++ b/drivers/hwtracing/coresight/coresight-priv.h > @@ -202,6 +202,6 @@ static inline void *coresight_get_uci_data(const struct > amba_id *id) > > void coresight_release_platform_data(struct coresight_platform_data *pdata); > > -int coresight_device_fwnode_match(struct device *dev, void *fwnode); > +int coresight_device_fwnode_match(struct device *dev, const void *fwnode); > > #endif > -- > 2.22.0 > Doesn't look like this made it into the merge, as I currently see that same error with arm64 allyesconfig. Cheers, Nathan
