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

Commit e4ed2b53 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14-rc5 into usb-next 



We want the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 4fcae770 33d930e5

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10
Original line number Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead. 
		still used for tmpfs etc. other users.  If set to

		false, the global swap readahead algorithm will be

		used for all swappable pages.
 


What:		/sys/kernel/mm/swap/vma_ra_max_order

Date:		August 2017

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	The max readahead size in order for VMA based swap readahead



		VMA based swap readahead algorithm will readahead at

		most 1 << max_order pages for each readahead.  The

		real readahead size for each readahead will be scaled

		according to the estimation algorithm.

Documentation/networking/bonding.txt

+1 −1
Original line number Diff line number Diff line
@@ -2387,7 +2387,7 @@ broadcast: Like active-backup, there is not much advantage to this 
	and packet type ID), so in a "gatewayed" configuration, all

	outgoing traffic will generally use the same device.  Incoming

	traffic may also end up on a single device, but that is

	dependent upon the balancing policy of the peer's 8023.ad

	dependent upon the balancing policy of the peer's 802.3ad

	implementation.  In a "local" configuration, traffic will be

	distributed across the devices in the bond.

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5346,9 +5346,7 @@ M: "J. Bruce Fields" <bfields@fieldses.org> 
L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	include/linux/fcntl.h

F:	include/linux/fs.h

F:	include/uapi/linux/fcntl.h

F:	include/uapi/linux/fs.h

F:	fs/fcntl.c

F:	fs/locks.c
@@ -5357,6 +5355,8 @@ M: Alexander Viro <viro@zeniv.linux.org.uk> 
L:	linux-fsdevel@vger.kernel.org

S:	Maintained

F:	fs/*

F:	include/linux/fs.h

F:	include/uapi/linux/fs.h



FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER

M:	Riku Voipio <riku.voipio@iki.fi>
@@ -7571,7 +7571,7 @@ F: arch/mips/include/asm/kvm* 
F:	arch/mips/kvm/



KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc)

M:	Alexander Graf <agraf@suse.com>

M:	Paul Mackerras <paulus@ozlabs.org>

L:	kvm-ppc@vger.kernel.org

W:	http://www.linux-kvm.org/

T:	git git://github.com/agraf/linux-2.6.git

Makefile

+6 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Fearless Coyote



# *DOCUMENTATION*
@@ -933,7 +933,11 @@ ifdef CONFIG_STACK_VALIDATION 
  ifeq ($(has_libelf),1)

    objtool_target := tools/objtool FORCE

  else

    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    ifdef CONFIG_ORC_UNWINDER

      $(error "Cannot generate ORC metadata for CONFIG_ORC_UNWINDER=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    else

      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")

    endif

    SKIP_STACK_VALIDATION := 1

    export SKIP_STACK_VALIDATION

  endif

arch/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -937,9 +937,6 @@ config STRICT_MODULE_RWX 
	  and non-text memory will be made non-executable. This provides

	  protection against certain security exploits (e.g. writing to text)



config ARCH_WANT_RELAX_ORDER

	bool



config ARCH_HAS_REFCOUNT

	bool

	help