From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Andersson <bjorn.andersson@linaro•org>,
Mathieu Poirier <mathieu.poirier@linaro•org>,
Mark Brown <broonie@kernel•org>
Cc: 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>
Subject: linux-next: manual merge of the rpmsg tree with the spi tree
Date: Mon, 28 Nov 2022 13:41:20 +1100 [thread overview]
Message-ID: <20221128134120.0afdceb3@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-11-28 2:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 2:41 Stephen Rothwell [this message]
2022-12-05 17:24 ` linux-next: manual merge of the rpmsg tree with the spi tree Mathieu Poirier
2022-12-05 19:55 ` Mark Brown
2022-12-05 21:40 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221128134120.0afdceb3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amit.kumar-mahapatra@amd$(echo .)com \
--cc=ben.levinsky@amd$(echo .)com \
--cc=bjorn.andersson@linaro$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=michal.simek@amd$(echo .)com \
--cc=rajan.vaja@xilinx$(echo .)com \
--cc=tanmay.shah@amd$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox