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

[Mark Brown <broonie@kernel.org>]

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

Hi all,

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

  include/linux/platform_device.h

between commit:

  00cd8fc630e06 ("driver core: platform: Include header for struct platform_device_id")

from the origin tree and commits:

  714cfe9e143fe ("driver core: platform: provide platform_device_set_of_node()")
  8877c06885ce4 ("driver core: platform: provide platform_device_set_fwnode()")

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 include/linux/platform_device.h
index 8c566f09d04ef,94b8d2b46e913..0000000000000
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@@ -19,6 -18,9 +19,8 @@@
  struct irq_affinity;
  struct mfd_cell;
  struct property_entry;
 -struct platform_device_id;
+ struct device_node;
+ struct fwnode_handle;
  
  struct platform_device {
  	const char	*name;

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