| Message ID | CAK8P3a2RjRSjTcmwVf3VHy2CUB2HBj5AaJTx=1NSYuA_Qy4E-w@mail.gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | ARM SoC branches for 5.13 | expand |
On Mon, Apr 26, 2021 at 8:53 AM Arnd Bergmann <arnd@kernel.org> wrote: > > Here are six branches for the SoC tree [...] Ok, all merged. Please do check my conflict resolutions - not because I think there is anything wrong there, but simply because the arm side doesn't get the same build coverage testing when I merge. All but the two first had some fairly trivial conflicts with the other trees I've been merging today. Linus
On Mon, Apr 26, 2021 at 9:41 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Mon, Apr 26, 2021 at 8:53 AM Arnd Bergmann <arnd@kernel.org> wrote: > > > > Here are six branches for the SoC tree [...] > > Ok, all merged. Please do check my conflict resolutions - not because > I think there is anything wrong there, but simply because the arm side > doesn't get the same build coverage testing when I merge. > > All but the two first had some fairly trivial conflicts with the other > trees I've been merging today. I've inspected the merges and ran the tree through my randconfig test box for today. It seems you fixed one merge that went wrong in linux-next, but you missed a harmless mismerge in a DT binding documentation file. I've applied a fix to the arm/fixes branch now and sent it to the list [1]. Arnd [1] https://lore.kernel.org/linux-arm-kernel/20210427210121.1080364-1-arnd@kernel.org/T/#u
Hello: This series was applied to soc/soc.git (refs/heads/arm/fixes): On Mon, 26 Apr 2021 17:52:39 +0200 you wrote: > Here are six branches for the SoC tree for the 5.13 merge window. > There are a couple > of new SoCs this time, with the initial Apple M1 support being the > most exciting one. > The STM32H750 platform is also noteworthy because it's fairly > unexpected to still > see new MMU-less boards. > > [...] Here is the summary with links: - [GIT,PULL,1/6] ARM: SoC changes for v5.13 https://git.kernel.org/soc/soc/c/01d713689441 - [GIT,PULL,2/6] ARM: defconfigs for v5.13 https://git.kernel.org/soc/soc/c/2b90506a8186 - [GIT,PULL,3/6] ARM: SoC drivers for v5.13 https://git.kernel.org/soc/soc/c/37f00ab4a003 - [GIT,PULL,4/6] ARM: devicetree changes for 5.13 https://git.kernel.org/soc/soc/c/f7857bf3745e - [GIT,PULL,5/6] ARM: platform support for Nuvoton WPCM450 https://git.kernel.org/soc/soc/c/6b0fbc540c2f - [GIT,PULL,6/6,look,out,for,dependencies] ARM: platform support for Apple M1 https://git.kernel.org/soc/soc/c/0c8555631820 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Here are six branches for the SoC tree for the 5.13 merge window. There are a couple of new SoCs this time, with the initial Apple M1 support being the most exciting one. The STM32H750 platform is also noteworthy because it's fairly unexpected to still see new MMU-less boards. The arm-apple-m1-5.13 tag includes changes from the tty and arm64 trees, so it would be good to merge those first in order to get a neater git history. Both have been submitted today by Greg and Catalin. As usual, the changes are mostly for devicetree files, aside from the ongoing cleanup work to omap2 and driver work for tegra and socfpga. About two thirds this of the overall changes this time are for 64-bit machines, which is more than usual but fits in with the long-term trend. A few more statistics: There are 863 non-merge commits this time, from 195 authors. These twenty people have done more than ten changes each: 79 Tony Lindgren 47 Krzysztof Kozlowski 38 Cristian Marussi 28 Vinod Koul 28 Dmitry Osipenko 21 Manivannan Sadhasivam 18 Hector Martin 18 Geert Uytterhoeven 18 Dong Aisheng 18 Arnd Bergmann 17 Sai Prakash Ranjan 17 Rafał Miłecki 15 Jagan Teki 12 Stephen Boyd 12 Nicolas Saenz Julienne 11 Linus Walleij 11 Jonathan Neuschäfer 11 Heiko Stuebner 11 Eddie James 11 Chunfeng Yun This is the total diffstat: 0.6% Documentation/devicetree/bindings/arm/ 0.2% Documentation/devicetree/bindings/interrupt-controller/ 0.3% Documentation/devicetree/bindings/memory-controllers/ 0.2% Documentation/devicetree/bindings/mfd/ 0.2% Documentation/devicetree/bindings/ 1.6% Documentation/driver-api/ 23.1% arch/arm/boot/dts/ 0.5% arch/arm/configs/ 4.8% arch/arm/mach-omap2/ 1.2% arch/arm/ 0.2% arch/arm64/boot/dts/allwinner/ 0.8% arch/arm64/boot/dts/amlogic/ 0.3% arch/arm64/boot/dts/apple/ 0.5% arch/arm64/boot/dts/broadcom/bcm4908/ 8.1% arch/arm64/boot/dts/freescale/ 0.6% arch/arm64/boot/dts/intel/ 0.4% arch/arm64/boot/dts/marvell/ 3.1% arch/arm64/boot/dts/mediatek/ 14.4% arch/arm64/boot/dts/qcom/ 2.3% arch/arm64/boot/dts/renesas/ 0.8% arch/arm64/boot/dts/rockchip/ 8.3% arch/arm64/boot/dts/ti/ 0.2% arch/arm64/include/asm/ 0.2% arch/arm64/ 0.2% drivers/bus/ 0.4% drivers/clk/ 0.3% drivers/cpufreq/ 9.2% drivers/firmware/arm_scmi/ 0.6% drivers/firmware/ 1.7% drivers/iio/common/scmi_sensors/ 2.1% drivers/irqchip/ 1.2% drivers/memory/tegra/ 0.5% drivers/pwm/ 0.9% drivers/soc/fsl/qe/ 2.5% drivers/soc/mediatek/ 0.5% drivers/soc/qcom/ 0.5% drivers/soc/tegra/ 0.3% drivers/soc/ 0.4% drivers/tty/serial/ 1.2% drivers/ 1.3% include/linux/ 0.2% include/soc/ 0.2% include/ 774 files changed, 35247 insertions(+), 8091 deletions(-)