linux-next: manual merge of the driver-core tree with the devicetree tree

linux-next: manual merge of the driver-core tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

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..000000000000
--- 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the driver-core tree with the devicetree tree

[Greg KH]

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

Re: linux-next: manual merge of the driver-core tree with the devicetree tree

[Saravana Kannan]

On Tue, Apr 6, 2021 at 2:11 AM Greg KH <greg@kroah.com> 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

linux-next: manual merge of the driver-core tree with the devicetree tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 2625 bytes --]

Hi all,

Today's linux-next merge of the driver-core tree got a conflict in:

  drivers/of/base.c

between commit:

  82b6c1b542ea0 ("of: Add of_machine_get_match() helper")

from the devicetree tree and commits:

  59621105ffca7 ("of: provide of_machine_read_compatible()")
  c86d3b7b847cc ("of: provide of_machine_read_model()")

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.

diff --cc drivers/of/base.c
index af048ab88e694,bf4a51887d742..0000000000000
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@@ -434,13 -434,42 +434,41 @@@ bool of_machine_compatible_match(const 
  }
  EXPORT_SYMBOL(of_machine_compatible_match);
  
+ /**
+  * of_machine_read_compatible - Get the compatible string of this machine
+  * @compatible: address at which the address of the compatible string will be
+  *              stored
+  * @index: index of the compatible entry in the list
+  *
+  * Returns:
+  * 0 on success, negative error number on failure.
+  */
+ int of_machine_read_compatible(const char **compatible, unsigned int index)
+ {
+ 	return of_property_read_string_index(of_root, "compatible", index, compatible);
+ }
+ EXPORT_SYMBOL_GPL(of_machine_read_compatible);
+ 
+ /**
+  * of_machine_read_model - Get the model string of this machine
+  * @model: address at which the address of the model string will be stored
+  *
+  * Returns:
+  * 0 on success, negative error number on failure.
+  */
+ int of_machine_read_model(const char **model)
+ {
+ 	return of_property_read_string(of_root, "model", model);
+ }
+ EXPORT_SYMBOL_GPL(of_machine_read_model);
+ 
  /**
 - * of_machine_device_match - Test root of device tree against a of_device_id array
 + * of_machine_get_match - Test root of device tree against an of_device_id array
   * @matches:	NULL terminated array of of_device_id match structures to search in
   *
 - * Returns true if the root node has any of the given compatible values in its
 - * compatible property.
 + * Returns matched entry or NULL
   */
 -bool of_machine_device_match(const struct of_device_id *matches)
 +const struct of_device_id *of_machine_get_match(const struct of_device_id *matches)
  {
  	struct device_node *root;
  	const struct of_device_id *match = NULL;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the driver-core tree with the devicetree tree

[Greg KH]

On Tue, Mar 17, 2026 at 04:19:33PM +0000, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the driver-core tree got a conflict in:
> 
>   drivers/of/base.c
> 
> between commit:
> 
>   82b6c1b542ea0 ("of: Add of_machine_get_match() helper")
> 
> from the devicetree tree and commits:
> 
>   59621105ffca7 ("of: provide of_machine_read_compatible()")
>   c86d3b7b847cc ("of: provide of_machine_read_model()")
> 
> 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.

Fix looks good, thanks!

greg k-h

linux-next: manual merge of the driver-core tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3499 bytes --]

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..000000000000
--- 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)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the driver-core tree with the devicetree tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1360 bytes --]

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 Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/platform_device.h
index 3413897,cd46ee5..0000000
--- 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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the driver-core tree with the devicetree tree

[Greg KH]

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