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

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

[Stephen Rothwell]

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

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Mathieu Poirier]

Hi Stephen - thanks for the legwork on this.


On Sun, 27 Nov 2022 at 19:41, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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")
>

Mark - since this is in the SPI tree, can you send me a pull request
for this commit?  I will do the refactoring on my side.

Thanks,
Mathieu

> 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,

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

[Mark Brown]

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

On Mon, Dec 05, 2022 at 10:24:48AM -0700, Mathieu Poirier wrote:
> On Sun, 27 Nov 2022 at 19:41, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

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

> Mark - since this is in the SPI tree, can you send me a pull request
> for this commit?  I will do the refactoring on my side.

That would basically be the entire SPI tree up to that point since it's
all mostly on one branch...

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

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

[Stephen Rothwell]

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

Hi Mark,

On Mon, 5 Dec 2022 19:55:19 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> On Mon, Dec 05, 2022 at 10:24:48AM -0700, Mathieu Poirier wrote:
> > On Sun, 27 Nov 2022 at 19:41, Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> 
> > >   1e400cb9cff2 ("firmware: xilinx: Add qspi firmware interface")  
> 
> > Mark - since this is in the SPI tree, can you send me a pull request
> > for this commit?  I will do the refactoring on my side.  
> 
> That would basically be the entire SPI tree up to that point since it's
> all mostly on one branch...

Both sides just need to mention it to Linus when you send your pull
requests - it is not a problematic conflict.

-- 
Cheers,
Stephen Rothwell

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