Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20221128134120.0afdceb3@canb.auug.org.au>
In-Reply-To: <20221128134120.0afdceb3@canb.auug.org.au>
From:   Mathieu Poirier <mathieu.poirier@linaro.org>
Date:   Mon, 5 Dec 2022 10:24:48 -0700
Message-ID: <CANLsYkw0Nq38rZzGTTpCL4J3aWJQpX32iOe4zdTT0+CcfhcOmg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the rpmsg tree with the spi tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Mark Brown <broonie@kernel.org>,
        Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>,
        Ben Levinsky <ben.levinsky@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michal Simek <michal.simek@amd.com>,
        Rajan Vaja <rajan.vaja@xilinx.com>,
        Tanmay Shah <tanmay.shah@amd.com>,
        Bjorn Andersson <andersson@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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,