Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Tue, Apr 6, 2021 at 2:11 AM Greg KH wrote:
>
> On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the driver-core tree got a conflict in:
> >
> > drivers/of/property.c
> >
> > between commit:
> >
> > 3915fed92365 ("of: property: Provide missing member description and
> > remove excess param")
> >
> > from the devicetree tree and commit:
> >
> > f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint")
> >
> > 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.
>
> Change looks good to me, thanks!
LGTM too.
-Saravana
Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Tue, Apr 06, 2021 at 06:19:45PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the driver-core tree got a conflict in:
>
> drivers/of/property.c
>
> between commit:
>
> 3915fed92365 ("of: property: Provide missing member description and remove
> excess param")
>
> from the devicetree tree and commit:
>
> f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint")
>
> 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.
Change looks good to me, thanks!
greg k-h
linux-next: manual merge of the driver-core tree with the devicetree tree
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
drivers/of/property.c
between commit:
3915fed92365 ("of: property: Provide missing member description and remove
excess param")
from the devicetree tree and commit:
f7514a663016 ("of: property: fw_devlink: Add support for remote-endpoint")
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 drivers/of/property.c
index 2046ae311322,2bb3158c9e43..
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1243,7 -1230,8 +1248,8 @@@ static struct device_node *parse_##fnam
* @parse_prop.prop_name: Name of property holding a phandle value
* @parse_prop.index: For properties holding a list of phandles, this is the
* index into the list
- * @optional: The property can be an optional dependency.
+ * @optional: Describes whether a supplier is mandatory or not
+ * @node_not_dev: The consumer node containing the property is never a device.
*
* Returns:
* parse_prop() return values are
pgp6VgAQ9wsbP.pgp
Description: OpenPGP digital signature
linux-next: manual merge of the driver-core tree with the devicetree tree
Hi all,
Today's linux-next merge of the driver-core tree got a conflict in:
include/linux/device.h
between commit:
7d34ca385484 ("driver core: Add device_is_dependent() to linux/device.h")
from the devicetree tree and commit:
67dd07723969 ("device: remove 'extern' attribute from function prototypes in
device.h")
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 b5ac86e356d9,9a62f7f43d55..
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@@ -814,27 -808,25 +813,26 @@@ static inline bool dev_has_sync_state(s
/*
* High level routines for use by the bus drivers
*/
- extern int __must_check device_register(struct device *dev);
- extern void device_unregister(struct device *dev);
- extern void device_initialize(struct device *dev);
- extern int __must_check device_add(struct device *dev);
- extern void device_del(struct device *dev);
- extern int device_for_each_child(struct device *dev, void *data,
-int (*fn)(struct device *dev, void *data));
- extern int device_for_each_child_reverse(struct device *dev, void *data,
-int (*fn)(struct device *dev, void *data));
- extern struct device *device_find_child(struct device *dev, void *data,
- int (*match)(struct device *dev, void *data));
- extern struct device *device_find_child_by_name(struct device *parent,
- const char *name);
- extern int device_rename(struct device *dev, const char *new_name);
- extern int device_move(struct device *dev, struct device *new_parent,
- enum dpm_order dpm_order);
- extern int device_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid);
- extern const char *device_get_devnode(struct device *dev,
- umode_t *mode, kuid_t *uid, kgid_t *gid,
- const char **tmp);
- extern int device_is_dependent(struct device *dev, void *target);
+ int __must_check device_register(struct device *dev);
+ void device_unregister(struct device *dev);
+ void device_initialize(struct device *dev);
+ int __must_check device_add(struct device *dev);
+ void device_del(struct device *dev);
+ int device_for_each_child(struct device *dev, void *data,
+ int (*fn)(struct device *dev, void *data));
+ int device_for_each_child_reverse(struct device *dev, void *data,
+ int (*fn)(struct device *dev, void *data));
+ struct device *device_find_child(struct device *dev, void *data,
+int (*match)(struct device *dev, void *data));
+ struct device *device_find_child_by_name(struct device *parent,
+const char *name);
+ int device_rename(struct device *dev, const char *new_name);
+ int device_move(struct device *dev, struct device *new_parent,
+ enum dpm_order dpm_order);
+ int device_change_owner(struct device *dev, kuid_t kuid, kgid_t kgid);
+ const char *device_get_devnode(struct device *dev, umode_t *mode, kuid_t *uid,
+ kgid_t *gid, const char **tmp);
++int device_is_dependent(struct device *dev, void *target);
static inline bool device_supports_offline(struct device *dev)
{
pgphCT03mEsQj.pgp
Description: OpenPGP digital signature
Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Mon, Jun 17, 2013 at 03:33:02PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> include/linux/platform_device.h between commit 10dbc5e39a60 ("driver
> core: move to_platform_driver to platform_device.h") from the devicetree
> tree and commit 9447057eaff8 ("platform_device: use a macro instead of
> platform_driver_register") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Fix looks good to me, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the driver-core tree with the devicetree tree
On Mon, Jun 17, 2013 at 03:33:02PM +1000, Stephen Rothwell wrote: Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in include/linux/platform_device.h between commit 10dbc5e39a60 (driver core: move to_platform_driver to platform_device.h) from the devicetree tree and commit 9447057eaff8 (platform_device: use a macro instead of platform_driver_register) from the driver-core tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). Fix looks good to me, thanks. greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: manual merge of the driver-core tree with the devicetree tree
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
include/linux/platform_device.h between commit 10dbc5e39a60 ("driver
core: move to_platform_driver to platform_device.h") from the devicetree
tree and commit 9447057eaff8 ("platform_device: use a macro instead of
platform_driver_register") from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc include/linux/platform_device.h
index 3413897,cd46ee5..000
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@@ -180,10 -180,13 +180,16 @@@ struct platform_driver
const struct platform_device_id *id_table;
};
+#define to_platform_driver(drv) (container_of((drv), struct
platform_driver, \
+ driver))
+
- extern int platform_driver_register(struct platform_driver *);
+ /*
+ * use a macro to avoid include chaining to get THIS_MODULE
+ */
+ #define platform_driver_register(drv) \
+ __platform_driver_register(drv, THIS_MODULE)
+ extern int __platform_driver_register(struct platform_driver *,
+ struct module *);
extern void platform_driver_unregister(struct platform_driver *);
/* non-hotpluggable platform devices may use this so that probe() and
pgp27W49qbY2c.pgp
Description: PGP signature
linux-next: manual merge of the driver-core tree with the devicetree tree
Hi Greg, Today's linux-next merge of the driver-core tree got a conflict in include/linux/platform_device.h between commit 10dbc5e39a60 (driver core: move to_platform_driver to platform_device.h) from the devicetree tree and commit 9447057eaff8 (platform_device: use a macro instead of platform_driver_register) from the driver-core tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/linux/platform_device.h index 3413897,cd46ee5..000 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@@ -180,10 -180,13 +180,16 @@@ struct platform_driver const struct platform_device_id *id_table; }; +#define to_platform_driver(drv) (container_of((drv), struct platform_driver, \ + driver)) + - extern int platform_driver_register(struct platform_driver *); + /* + * use a macro to avoid include chaining to get THIS_MODULE + */ + #define platform_driver_register(drv) \ + __platform_driver_register(drv, THIS_MODULE) + extern int __platform_driver_register(struct platform_driver *, + struct module *); extern void platform_driver_unregister(struct platform_driver *); /* non-hotpluggable platform devices may use this so that probe() and pgp27W49qbY2c.pgp Description: PGP signature
