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

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

Merge remote-tracking branch 'tip/perf/urgent' into perf/core 



To pick up fixes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents d4ae5529 20e8e72d

Documentation/driver-api/fpga/fpga-mgr.rst

+5 −0
Original line number Diff line number Diff line
@@ -184,6 +184,11 @@ API for implementing a new FPGA Manager driver 
API for programming an FPGA

---------------------------



FPGA Manager flags



.. kernel-doc:: include/linux/fpga/fpga-mgr.h

   :doc: FPGA Manager flags



.. kernel-doc:: include/linux/fpga/fpga-mgr.h

   :functions: fpga_image_info

Documentation/fb/uvesafb.txt

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ than x86. Check the v86d documentation for a list of currently supported 
arches.



v86d source code can be downloaded from the following website:

  http://dev.gentoo.org/~spock/projects/uvesafb



  https://github.com/mjanusz/v86d



Please refer to the v86d documentation for detailed configuration and

installation instructions.
@@ -177,7 +178,7 @@ from the Video BIOS if you set pixclock to 0 in fb_var_screeninfo. 


--

 Michal Januszewski <spock@gentoo.org>

 Last updated: 2009-03-30

 Last updated: 2017-10-10



 Documentation of the uvesafb options is loosely based on vesafb.txt.

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ tcp_mtu_probing - INTEGER 
	  1 - Disabled by default, enabled when an ICMP black hole detected

	  2 - Always enabled, use initial MSS of tcp_base_mss.



tcp_probe_interval - INTEGER

tcp_probe_interval - UNSIGNED INTEGER

	Controls how often to start TCP Packetization-Layer Path MTU

	Discovery reprobe. The default is reprobing every 10 minutes as

	per RFC4821.

MAINTAINERS

+11 −12
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ F: Documentation/ABI/testing/sysfs-bus-acpi 
F:	Documentation/ABI/testing/configfs-acpi

F:	drivers/pci/*acpi*

F:	drivers/pci/*/*acpi*

F:	drivers/pci/*/*/*acpi*

F:	tools/power/acpi/



ACPI APEI
@@ -1251,7 +1250,7 @@ N: meson 


ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

M:	Antoine Tenart <antoine.tenart@bootlin.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-alpine/
@@ -2956,7 +2955,6 @@ F: include/linux/bcm963xx_tag.h 


BROADCOM BNX2 GIGABIT ETHERNET DRIVER

M:	Rasesh Mody <rasesh.mody@cavium.com>

M:	Harish Patil <harish.patil@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

L:	netdev@vger.kernel.org

S:	Supported
@@ -2977,6 +2975,7 @@ F: drivers/scsi/bnx2i/ 


BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER

M:	Ariel Elior <ariel.elior@cavium.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@cavium.com>

M:	everest-linux-l2@cavium.com

L:	netdev@vger.kernel.org

S:	Supported
@@ -5470,7 +5469,8 @@ S: Odd Fixes 
F:	drivers/net/ethernet/agere/



ETHERNET BRIDGE

M:	Stephen Hemminger <stephen@networkplumber.org>

M:	Roopa Prabhu <roopa@cumulusnetworks.com>

M:	Nikolay Aleksandrov <nikolay@cumulusnetworks.com>

L:	bridge@lists.linux-foundation.org (moderated for non-subscribers)

L:	netdev@vger.kernel.org

W:	http://www.linuxfoundation.org/en/Net:Bridge
@@ -8598,7 +8598,6 @@ F: include/linux/spinlock*.h 
F:	arch/*/include/asm/spinlock*.h

F:	include/linux/rwlock*.h

F:	include/linux/mutex*.h

F:	arch/*/include/asm/mutex*.h

F:	include/linux/rwsem*.h

F:	arch/*/include/asm/rwsem.h

F:	include/linux/seqlock.h
@@ -9658,7 +9657,8 @@ MIPS/LOONGSON2 ARCHITECTURE 
M:	Jiaxun Yang <jiaxun.yang@flygoat.com>

L:	linux-mips@linux-mips.org

S:	Maintained

F:	arch/mips/loongson64/*{2e/2f}*

F:	arch/mips/loongson64/fuloong-2e/

F:	arch/mips/loongson64/lemote-2f/

F:	arch/mips/include/asm/mach-loongson64/

F:	drivers/*/*loongson2*

F:	drivers/*/*/*loongson2*
@@ -9865,7 +9865,7 @@ M: Peter Rosin <peda@axentia.se> 
S:	Maintained

F:	Documentation/ABI/testing/sysfs-class-mux*

F:	Documentation/devicetree/bindings/mux/

F:	include/linux/dt-bindings/mux/

F:	include/dt-bindings/mux/

F:	include/linux/mux/

F:	drivers/mux/
@@ -10942,7 +10942,7 @@ M: Willy Tarreau <willy@haproxy.com> 
M:	Ksenija Stanojevic <ksenija.stanojevic@gmail.com>

S:	Odd Fixes

F:	Documentation/auxdisplay/lcd-panel-cgram.txt

F:	drivers/misc/panel.c

F:	drivers/auxdisplay/panel.c



PARALLEL PORT SUBSYSTEM

M:	Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -11979,7 +11979,7 @@ F: Documentation/scsi/LICENSE.qla4xxx 
F:	drivers/scsi/qla4xxx/



QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER

M:	Harish Patil <harish.patil@cavium.com>

M:	Shahed Shaikh <Shahed.Shaikh@cavium.com>

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

L:	netdev@vger.kernel.org
@@ -11987,7 +11987,6 @@ S: Supported 
F:	drivers/net/ethernet/qlogic/qlcnic/



QLOGIC QLGE 10Gb ETHERNET DRIVER

M:	Harish Patil <harish.patil@cavium.com>

M:	Manish Chopra <manish.chopra@cavium.com>

M:	Dept-GELinuxNICDev@cavium.com

L:	netdev@vger.kernel.org
@@ -13063,7 +13062,7 @@ SELINUX SECURITY MODULE 
M:	Paul Moore <paul@paul-moore.com>

M:	Stephen Smalley <sds@tycho.nsa.gov>

M:	Eric Paris <eparis@parisplace.org>

L:	selinux@tycho.nsa.gov (moderated for non-subscribers)

L:	selinux@vger.kernel.org

W:	https://selinuxproject.org

W:	https://github.com/SELinuxProject

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git
@@ -15395,7 +15394,7 @@ S: Maintained 
UVESAFB DRIVER

M:	Michal Januszewski <spock@gentoo.org>

L:	linux-fbdev@vger.kernel.org

W:	http://dev.gentoo.org/~spock/projects/uvesafb/

W:	https://github.com/mjanusz/v86d

S:	Maintained

F:	Documentation/fb/uvesafb.txt

F:	drivers/video/fbdev/uvesafb.*

Makefile

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

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc8

NAME = Merciless Moray



# *DOCUMENTATION*
@@ -483,13 +483,15 @@ endif 
ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

endif