Skip to content

Commit

Permalink
Merge tag 'v5.12.3' into 5.12
Browse files Browse the repository at this point in the history 
This is the 5.12.3 stable release
  • Loading branch information
@xanmod
xanmod committed May 12, 2021
2 parents 116a66b + d795d7b commit ad36592
Show file tree
Hide file tree
Showing 427 changed files with 4,327 additions and 2,738 deletions.
10 changes: 5 additions & 5 deletions Makefile
View file
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 12
SUBLEVEL = 2
SUBLEVEL = 3
EXTRAVERSION =
NAME = Frozen Wasteland

Expand Down Expand Up @@ -775,16 +775,16 @@ KBUILD_CFLAGS += -Wno-gnu
KBUILD_CFLAGS += -mno-global-merge
else

# These warnings generated too much noise in a regular build.
# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
KBUILD_CFLAGS += -Wno-unused-but-set-variable

# Warn about unmarked fall-throughs in switch statement.
# Disabled for clang while comment to attribute conversion happens and
# https://github.com/ClangBuiltLinux/linux/issues/636 is discussed.
KBUILD_CFLAGS += $(call cc-option,-Wimplicit-fallthrough,)
endif

# These warnings generated too much noise in a regular build.
# Use make W=1 to enable them (see scripts/Makefile.extrawarn)
KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)
ifdef CONFIG_FRAME_POINTER
KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/compressed/Makefile
View file
Expand Up @@ -118,8 +118,8 @@ asflags-y := -DZIMAGE

# Supply kernel BSS size to the decompressor via a linker symbol.
KBSS_SZ = $(shell echo $$(($$($(NM) $(obj)/../../../../vmlinux | \
sed -n -e 's/^\([^ ]*\) [AB] __bss_start$$/-0x\1/p' \
-e 's/^\([^ ]*\) [AB] __bss_stop$$/+0x\1/p') )) )
sed -n -e 's/^\([^ ]*\) [ABD] __bss_start$$/-0x\1/p' \
-e 's/^\([^ ]*\) [ABD] __bss_stop$$/+0x\1/p') )) )
LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)
# Supply ZRELADDR to the decompressor via a linker symbol.
ifneq ($(CONFIG_AUTO_ZRELADDR),y)
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sam9x60ek.dts
View file
Expand Up @@ -8,6 +8,7 @@
*/
/dts-v1/;
#include "sam9x60.dtsi"
#include <dt-bindings/input/input.h>

/ {
model = "Microchip SAM9X60-EK";
Expand Down Expand Up @@ -84,7 +85,7 @@
sw1 {
label = "SW1";
gpios = <&pioD 18 GPIO_ACTIVE_LOW>;
linux,code=<0x104>;
linux,code=<KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
View file
Expand Up @@ -11,6 +11,7 @@
#include "at91-sama5d27_som1.dtsi"
#include <dt-bindings/mfd/atmel-flexcom.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>

/ {
model = "Atmel SAMA5D27 SOM1 EK";
Expand Down Expand Up @@ -466,7 +467,7 @@
pb4 {
label = "USER";
gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts
View file
Expand Up @@ -8,6 +8,7 @@
*/
/dts-v1/;
#include "at91-sama5d27_wlsom1.dtsi"
#include <dt-bindings/input/input.h>

/ {
model = "Microchip SAMA5D27 WLSOM1 EK";
Expand Down Expand Up @@ -35,7 +36,7 @@
sw4 {
label = "USER BUTTON";
gpios = <&pioA PIN_PB2 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sama5d2_icp.dts
View file
Expand Up @@ -12,6 +12,7 @@
#include "sama5d2.dtsi"
#include "sama5d2-pinfunc.h"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/mfd/atmel-flexcom.h>

/ {
Expand Down Expand Up @@ -51,7 +52,7 @@
sw4 {
label = "USER_PB1";
gpios = <&pioA PIN_PD0 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
View file
Expand Up @@ -11,6 +11,7 @@
#include "sama5d2-pinfunc.h"
#include <dt-bindings/mfd/atmel-flexcom.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/pinctrl/at91.h>

/ {
Expand Down Expand Up @@ -402,7 +403,7 @@
bp1 {
label = "PB_USER";
gpios = <&pioA PIN_PA10 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sama5d2_xplained.dts
View file
Expand Up @@ -10,6 +10,7 @@
#include "sama5d2-pinfunc.h"
#include <dt-bindings/mfd/atmel-flexcom.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/regulator/active-semi,8945a-regulator.h>

/ {
Expand Down Expand Up @@ -712,7 +713,7 @@
bp1 {
label = "PB_USER";
gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91-sama5d3_xplained.dts
View file
Expand Up @@ -7,6 +7,7 @@
*/
/dts-v1/;
#include "sama5d36.dtsi"
#include <dt-bindings/input/input.h>

/ {
model = "SAMA5D3 Xplained";
Expand Down Expand Up @@ -354,7 +355,7 @@
bp3 {
label = "PB_USER";
gpios = <&pioE 29 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91sam9260ek.dts
View file
Expand Up @@ -7,6 +7,7 @@
*/
/dts-v1/;
#include "at91sam9260.dtsi"
#include <dt-bindings/input/input.h>

/ {
model = "Atmel at91sam9260ek";
Expand Down Expand Up @@ -156,7 +157,7 @@
btn4 {
label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View file
Expand Up @@ -5,6 +5,7 @@
* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
*/
#include "at91sam9g20.dtsi"
#include <dt-bindings/input/input.h>

/ {

Expand Down Expand Up @@ -234,7 +235,7 @@
btn4 {
label = "Button 4";
gpios = <&pioA 31 GPIO_ACTIVE_LOW>;
linux,code = <0x104>;
linux,code = <KEY_PROG1>;
wakeup-source;
};
};
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x18000000>;
};

spi {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4708-netgear-r6250.dts
View file
Expand Up @@ -22,8 +22,8 @@

memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

spi {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

spi {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x18000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
View file
Expand Up @@ -18,8 +18,8 @@

memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

gpio-keys {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4709-netgear-r7000.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm4709-netgear-r8000.dts
View file
Expand Up @@ -32,8 +32,8 @@

memory {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
View file
Expand Up @@ -21,8 +21,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

nand: nand@18028000 {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47094-linksys-panamera.dts
View file
Expand Up @@ -18,8 +18,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x08000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x08000000>;
};

gpio-keys {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
View file
Expand Up @@ -18,8 +18,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x18000000>;
};

leds {
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
View file
Expand Up @@ -18,8 +18,8 @@

memory@0 {
device_type = "memory";
reg = <0x00000000 0x08000000
0x88000000 0x18000000>;
reg = <0x00000000 0x08000000>,
<0x88000000 0x18000000>;
};

leds {
Expand Down

0 comments on commit ad36592

Please sign in to comment.