| Message ID | 752fc10f-c2eb-736e-8a11-13e770f50c90@monstr.eu (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [GIT,PULL] ARM: dts zynq: Xilinx DT changes for v5.11 | expand |
Hi, pull request below is correct. I just used incorrect subject line (c&p error). Sorry about it. Please let me know if you want to send it again. Thanks, Michal On 09. 12. 20 15:51, Michal Simek wrote: > Hi, > > please pull the following changes to your tree. The tree is based on > zynqmp-soc-fixes-for-v5.10-rc6 tag or acfdd18591ea ("firmware: xilinx: > Use hash-table for api feature check") which went to v5.10-rc6. > > Thanks, > Michal > > > The following changes since commit acfdd18591eaac25446e976a0c0d190f8b3dbfb1: > > firmware: xilinx: Use hash-table for api feature check (2020-11-24 > 15:13:54 +0100) > > are available in the Git repository at: > > https://github.com/Xilinx/linux-xlnx.git tags/zynqmp-soc-for-v5.11 > > for you to fetch changes up to b8d6b5c241b3dedaa03f845e25412935fef81c6b: > > firmware: xilinx: Properly align function parameter (2020-12-09 > 15:09:11 +0100) > > ---------------------------------------------------------------- > arm64: soc: ZynqMP SoC changes for v5.11 > > - Small alignments in Xilinx Firmware driver > - Exposing syscon interface for VCU driver > > ---------------------------------------------------------------- > Michael Tretter (4): > soc: xilinx: vcu: drop useless success message > dt-bindings: soc: xlnx: extract xlnx, vcu-settings to separate binding > soc: xilinx: vcu: use vcu-settings syscon registers > soc: xilinx: vcu: add missing register NUM_CORE > > Michal Simek (4): > firmware: xilinx: Fix kernel-doc warnings > firmware: xilinx: Remove additional newline > firmware: xilinx: Add a blank line after function declaration > firmware: xilinx: Properly align function parameter > > Wendy Liang (1): > firmware: xlnx-zynqmp: fix compilation warning > > Zou Wei (1): > firmware: xilinx: Mark pm_api_features_map with static keyword > > Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu-settings.yaml | > 34 ++++++++++++++++++++++++++++++++++ > Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu.txt | > 9 ++------- > drivers/firmware/xilinx/zynqmp.c | > 48 ++++++++++++++++++++++++------------------------ > drivers/soc/xilinx/Kconfig | 1 + > drivers/soc/xilinx/xlnx_vcu.c | > 96 > +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- > include/linux/firmware/xlnx-zynqmp.h | > 45 ++++++++++++++++++++++++++++++++++++++++----- > include/linux/mfd/syscon/xlnx-vcu.h | > 39 +++++++++++++++++++++++++++++++++++++++ > 7 files changed, 187 insertions(+), 85 deletions(-) > create mode 100644 > Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu-settings.yaml > create mode 100644 include/linux/mfd/syscon/xlnx-vcu.h > [linux](zynqmp/soc)$ >
On Wed, Dec 9, 2020 at 3:51 PM Michal Simek <monstr@monstr.eu> wrote: > > Hi, > > please pull the following changes to your tree. The tree is based on > zynqmp-soc-fixes-for-v5.10-rc6 tag or acfdd18591ea ("firmware: xilinx: > Use hash-table for api feature check") which went to v5.10-rc6. Is it necessary that this is based on top of the bugfix? This means I'd have to do a backmerged of -rc4 into my dt tree, which is something I would prefer to avoid. I also notice that the subject is the same as the DT pull request, which seems to have messed up patchwork into thinking it is an updated version of the former. If I had not noticed the backmerge, the DT pull request would have gotten lost. Arnd
Hi, On 09. 12. 20 18:01, Arnd Bergmann wrote: > On Wed, Dec 9, 2020 at 3:51 PM Michal Simek <monstr@monstr.eu> wrote: >> >> Hi, >> >> please pull the following changes to your tree. The tree is based on >> zynqmp-soc-fixes-for-v5.10-rc6 tag or acfdd18591ea ("firmware: xilinx: >> Use hash-table for api feature check") which went to v5.10-rc6. > > Is it necessary that this is based on top of the bugfix? This means > I'd have to do a backmerged of -rc4 into my dt tree, which is something > I would prefer to avoid. The patch from Zou Wei is fixing the hash table patch merge in rc6. If you think I should drop it and send it after rc1 I am fine with it. Just let me know which way you prefer. > > I also notice that the subject is the same as the DT pull request, which > seems to have messed up patchwork into thinking it is an updated > version of the former. If I had not noticed the backmerge, the DT pull > request would have gotten lost. I shoot an email that subject was wrong. It is targeting soc tree. Sorry about it. Let's figured it out the first part about RC and then I can send new PR with proper subject. Thanks, Michal
On Wed, Dec 9, 2020 at 7:06 PM Michal Simek <monstr@monstr.eu> wrote: > On 09. 12. 20 18:01, Arnd Bergmann wrote: > > On Wed, Dec 9, 2020 at 3:51 PM Michal Simek <monstr@monstr.eu> wrote: > >> > >> Hi, > >> > >> please pull the following changes to your tree. The tree is based on > >> zynqmp-soc-fixes-for-v5.10-rc6 tag or acfdd18591ea ("firmware: xilinx: > >> Use hash-table for api feature check") which went to v5.10-rc6. > > > > Is it necessary that this is based on top of the bugfix? This means > > I'd have to do a backmerged of -rc4 into my dt tree, which is something > > I would prefer to avoid. > > The patch from Zou Wei is fixing the hash table patch merge in rc6. > If you think I should drop it and send it after rc1 I am fine with it. > Just let me know which way you prefer. Ah, I see. I thought you meant this was a bugfix that was already merged in -rc6 and you based the other patches on top of the bugfix. Since it's technically a regression fix, I'll cherry-pick this one for v5.10. Arnd
Hi, please pull the following changes to your tree. The tree is based on zynqmp-soc-fixes-for-v5.10-rc6 tag or acfdd18591ea ("firmware: xilinx: Use hash-table for api feature check") which went to v5.10-rc6. Thanks, Michal The following changes since commit acfdd18591eaac25446e976a0c0d190f8b3dbfb1: firmware: xilinx: Use hash-table for api feature check (2020-11-24 15:13:54 +0100) are available in the Git repository at: https://github.com/Xilinx/linux-xlnx.git tags/zynqmp-soc-for-v5.11 for you to fetch changes up to b8d6b5c241b3dedaa03f845e25412935fef81c6b: firmware: xilinx: Properly align function parameter (2020-12-09 15:09:11 +0100) ---------------------------------------------------------------- arm64: soc: ZynqMP SoC changes for v5.11 - Small alignments in Xilinx Firmware driver - Exposing syscon interface for VCU driver ---------------------------------------------------------------- Michael Tretter (4): soc: xilinx: vcu: drop useless success message dt-bindings: soc: xlnx: extract xlnx, vcu-settings to separate binding soc: xilinx: vcu: use vcu-settings syscon registers soc: xilinx: vcu: add missing register NUM_CORE Michal Simek (4): firmware: xilinx: Fix kernel-doc warnings firmware: xilinx: Remove additional newline firmware: xilinx: Add a blank line after function declaration firmware: xilinx: Properly align function parameter Wendy Liang (1): firmware: xlnx-zynqmp: fix compilation warning Zou Wei (1): firmware: xilinx: Mark pm_api_features_map with static keyword Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu-settings.yaml | 34 ++++++++++++++++++++++++++++++++++ Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu.txt | 9 ++------- drivers/firmware/xilinx/zynqmp.c | 48 ++++++++++++++++++++++++------------------------ drivers/soc/xilinx/Kconfig | 1 + drivers/soc/xilinx/xlnx_vcu.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------- include/linux/firmware/xlnx-zynqmp.h | 45 ++++++++++++++++++++++++++++++++++++++++----- include/linux/mfd/syscon/xlnx-vcu.h | 39 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 187 insertions(+), 85 deletions(-) create mode 100644 Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu-settings.yaml create mode 100644 include/linux/mfd/syscon/xlnx-vcu.h [linux](zynqmp/soc)$