Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52b5c5f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 10b11050 786b71f5

Documentation/networking/ppp_generic.txt

+0 −6
Original line number Diff line number Diff line
@@ -300,12 +300,6 @@ unattached instance are: 
The ioctl calls available on an instance of /dev/ppp attached to a

channel are:



* PPPIOCDETACH detaches the instance from the channel.  This ioctl is

  deprecated since the same effect can be achieved by closing the

  instance.  In order to prevent possible races this ioctl will fail

  with an EINVAL error if more than one file descriptor refers to this

  instance (i.e. as a result of dup(), dup2() or fork()).



* PPPIOCCONNECT connects this channel to a PPP interface.  The

  argument should point to an int containing the interface unit

  number.  It will return an EINVAL error if the channel is already

MAINTAINERS

+11 −5
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ F: drivers/gpio/gpio-ath79.c 
F:	Documentation/devicetree/bindings/gpio/gpio-ath79.txt



ATHEROS ATH GENERIC UTILITIES

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/net/wireless/ath/*
@@ -2347,7 +2347,7 @@ S: Maintained 
F:	drivers/net/wireless/ath/ath5k/



ATHEROS ATH6KL WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/ath6kl

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@ -6503,9 +6503,15 @@ F: Documentation/networking/hinic.txt 
F:	drivers/net/ethernet/huawei/hinic/



HUGETLB FILESYSTEM

M:	Nadia Yvette Chambers <nyc@holomorphy.com>

M:	Mike Kravetz <mike.kravetz@oracle.com>

L:	linux-mm@kvack.org

S:	Maintained

F:	fs/hugetlbfs/

F:	mm/hugetlb.c

F:	include/linux/hugetlb.h

F:	Documentation/admin-guide/mm/hugetlbpage.rst

F:	Documentation/vm/hugetlbfs_reserv.rst

F:	Documentation/ABI/testing/sysfs-kernel-mm-hugepages



HVA ST MEDIA DRIVER

M:	Jean-Christophe Trotin <jean-christophe.trotin@st.com>
@@ -11626,7 +11632,7 @@ S: Maintained 
F:	drivers/media/tuners/qt1010*



QUALCOMM ATHEROS ATH10K WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	ath10k@lists.infradead.org

W:	http://wireless.kernel.org/en/users/Drivers/ath10k

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@ -11677,7 +11683,7 @@ S: Maintained 
F:	drivers/media/platform/qcom/venus/



QUALCOMM WCN36XX WIRELESS DRIVER

M:	Eugene Krasnikov <k.eugene.e@gmail.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	wcn36xx@lists.infradead.org

W:	http://wireless.kernel.org/en/users/Drivers/wcn36xx

T:	git git://github.com/KrasnikovEugene/wcn36xx.git

Makefile

+7 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 17

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Merciless Moray



# *DOCUMENTATION*
@@ -500,6 +500,9 @@ RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk 
RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))

export RETPOLINE_CFLAGS



KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)



# check for 'asm goto'

ifeq ($(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)

  CC_HAVE_ASM_GOTO := 1
@@ -621,9 +624,9 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)

KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)

CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)

CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage \

	$(call cc-option,-fno-tree-loop-im) \

	$(call cc-disable-warning,maybe-uninitialized,)

export CFLAGS_GCOV CFLAGS_KCOV



# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

arch/arm/boot/dts/sun4i-a10.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-hdmi";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_HDMI0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_HDMI>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";
@@ -88,7 +88,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0";

			clocks = <&ccu CLK_AHB_LCD0>, <&ccu CLK_AHB_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_DE_BE0>,

				 <&ccu CLK_AHB_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DE_FE0>, <&ccu CLK_TCON0_CH0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

		};
@@ -99,7 +99,7 @@ 
			allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";

			clocks = <&ccu CLK_AHB_TVE0>, <&ccu CLK_AHB_LCD0>,

				 <&ccu CLK_AHB_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_AHB_DE_FE0>,

				 <&ccu CLK_DE_BE0>, <&ccu CLK_DE_FE0>,

				 <&ccu CLK_TCON0_CH1>, <&ccu CLK_DRAM_TVE0>,

				 <&ccu CLK_DRAM_DE_FE0>, <&ccu CLK_DRAM_DE_BE0>;

			status = "disabled";

arch/arm/boot/dts/sun8i-h3-orangepi-one.dts

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
	phy-handle = <&int_mii_phy>;

	phy-mode = "mii";

	allwinner,leds-active-low;

	status = "okay";

};



&hdmi {