Commit f8e478e3 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf-tools 



To pick up some extra files that need to be sync'ed with the kernel
sources to try and reduce the number of PRs.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 563d3992 04a9f176

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ Henrik Rydberg <rydberg@bitmath.org> 
Herbert Xu <herbert@gondor.apana.org.au>

Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>

Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>

Ignat Korchagin <ignat@linux.win> <ignat@cloudflare.com>

Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>

J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>

J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>

Documentation/dev-tools/kunit/run_wrapper.rst

+2 −0
Original line number Diff line number Diff line
@@ -336,6 +336,8 @@ command line arguments: 
- ``--list_tests_attr``: If set, lists all tests that will be run and all of their

  attributes.



- ``--list_suites``: If set, lists all suites that will be run.



Command-line completion

==============================

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -4022,7 +4022,7 @@ F: drivers/hwmon/asus_wmi_sensors.c 
ASYMMETRIC KEYS

M:	David Howells <dhowells@redhat.com>

M:	Lukas Wunner <lukas@wunner.de>

M:	Ignat Korchagin <ignat@cloudflare.com>

M:	Ignat Korchagin <ignat@linux.win>

L:	keyrings@vger.kernel.org

L:	linux-crypto@vger.kernel.org

S:	Maintained
@@ -4035,7 +4035,7 @@ F: include/linux/verification.h 








ASYMMETRIC KEYS - ECDSA









M:	Lukas Wunner <lukas@wunner.de>









M:	Ignat Korchagin <ignat@cloudflare.com>









M:	Ignat Korchagin <ignat@linux.win>









R:	Stefan Berger <stefanb@linux.ibm.com>









L:	linux-crypto@vger.kernel.org









S:	Maintained








@@ -4045,14 +4045,14 @@ F:	include/crypto/ecc*















ASYMMETRIC KEYS - GOST









M:	Lukas Wunner <lukas@wunner.de>









M:	Ignat Korchagin <ignat@cloudflare.com>









M:	Ignat Korchagin <ignat@linux.win>









L:	linux-crypto@vger.kernel.org









S:	Odd fixes









F:	crypto/ecrdsa*

















ASYMMETRIC KEYS - RSA









M:	Lukas Wunner <lukas@wunner.de>









M:	Ignat Korchagin <ignat@cloudflare.com>









M:	Ignat Korchagin <ignat@linux.win>









L:	linux-crypto@vger.kernel.org









S:	Maintained









F:	crypto/rsa*
































arch/arm/configs/multi_v7_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -279,7 +279,6 @@ CONFIG_TI_CPSW_SWITCHDEV=y







CONFIG_TI_CPTS=y









CONFIG_TI_KEYSTONE_NETCP=y









CONFIG_TI_KEYSTONE_NETCP_ETHSS=y









CONFIG_TI_PRUSS=m









CONFIG_TI_PRUETH=m









CONFIG_XILINX_EMACLITE=y









CONFIG_SFP=m
































arch/arm64/boot/dts/renesas/r8a78000.dtsi



+8
−8






























Original line number
Diff line number
Diff line







@@ -698,7 +698,7 @@ scif0: serial@c0700000 {







			compatible = "renesas,scif-r8a78000",









				     "renesas,rcar-gen5-scif", "renesas,scif";









			reg = <0 0xc0700000 0 0x40>;









			interrupts = <GIC_SPI 4074 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 10 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -708,7 +708,7 @@ scif1: serial@c0704000 {







			compatible = "renesas,scif-r8a78000",









				     "renesas,rcar-gen5-scif", "renesas,scif";









			reg = <0 0xc0704000 0 0x40>;









			interrupts = <GIC_SPI 4075 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 11 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -718,7 +718,7 @@ scif3: serial@c0708000 {







			compatible = "renesas,scif-r8a78000",









				     "renesas,rcar-gen5-scif", "renesas,scif";









			reg = <0 0xc0708000 0 0x40>;









			interrupts = <GIC_SPI 4076 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 12 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -728,7 +728,7 @@ scif4: serial@c070c000 {







			compatible = "renesas,scif-r8a78000",









				     "renesas,rcar-gen5-scif", "renesas,scif";









			reg = <0 0xc070c000 0 0x40>;









			interrupts = <GIC_SPI 4077 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 13 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd16>, <&dummy_clk_sgasyncd16>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -738,7 +738,7 @@ hscif0: serial@c0710000 {







			compatible = "renesas,hscif-r8a78000",









				     "renesas,rcar-gen5-hscif", "renesas,hscif";









			reg = <0 0xc0710000 0 0x60>;









			interrupts = <GIC_SPI 4078 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 14 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -748,7 +748,7 @@ hscif1: serial@c0714000 {







			compatible = "renesas,hscif-r8a78000",









				     "renesas,rcar-gen5-hscif", "renesas,hscif";









			reg = <0 0xc0714000 0 0x60>;









			interrupts = <GIC_SPI 4079 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 15 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -758,7 +758,7 @@ hscif2: serial@c0718000 {







			compatible = "renesas,hscif-r8a78000",









				     "renesas,rcar-gen5-hscif", "renesas,hscif";









			reg = <0 0xc0718000 0 0x60>;









			interrupts = <GIC_SPI 4080 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 16 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";








@@ -768,7 +768,7 @@ hscif3: serial@c071c000 {







			compatible = "renesas,hscif-r8a78000",









				     "renesas,rcar-gen5-hscif", "renesas,hscif";









			reg = <0 0xc071c000 0 0x60>;









			interrupts = <GIC_SPI 4081 IRQ_TYPE_LEVEL_HIGH>;









			interrupts = <GIC_ESPI 17 IRQ_TYPE_LEVEL_HIGH>;









			clocks = <&dummy_clk_sgasyncd4>, <&dummy_clk_sgasyncd4>, <&scif_clk>;









			clock-names = "fck", "brg_int", "scif_clk";









			status = "disabled";