linux-next: manual merge of the rpmsg tree with the spi tree

[Stephen Rothwell]

Hi all,

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

  include/linux/firmware/xlnx-zynqmp.h

between commit:

  1e400cb9cff2 ("firmware: xilinx: Add qspi firmware interface")

from the spi tree and commit:

  b2bd0a8c3ab1 ("firmware: xilinx: Add ZynqMP firmware ioctl enums for RPU configuration.")

from the rpmsg 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/firmware/xlnx-zynqmp.h
index fac37680ffe7,cf92e739fa3b..000000000000
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@@ -135,7 -138,10 +138,11 @@@ enum pm_ret_status 
  };
  
  enum pm_ioctl_id {
+ 	IOCTL_GET_RPU_OPER_MODE = 0,
+ 	IOCTL_SET_RPU_OPER_MODE = 1,
+ 	IOCTL_RPU_BOOT_ADDR_CONFIG = 2,
+ 	IOCTL_TCM_COMB_CONFIG = 3,
 +	IOCTL_SET_TAPDELAY_BYPASS = 4,
  	IOCTL_SD_DLL_RESET = 6,
  	IOCTL_SET_SD_TAPDELAY = 7,
  	IOCTL_SET_PLL_FRAC_MODE = 8,

Attachment: pgpUN_CyJZ6uu.pgp
Description: OpenPGP digital signature