Commit ad350a58 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.14.y' into rpi-4.14.y

parents c6b70aaa 96427a51

Documentation/networking/ip-sysctl.txt

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max 
	min: Minimal size of receive buffer used by TCP sockets.

	It is guaranteed to each TCP socket, even under moderate memory

	pressure.

	Default: 1 page

	Default: 4K



	default: initial size of receive buffer used by TCP sockets.

	This value overrides net.core.rmem_default used by other protocols.
@@ -666,7 +666,7 @@ tcp_window_scaling - BOOLEAN 
tcp_wmem - vector of 3 INTEGERs: min, default, max

	min: Amount of memory reserved for send buffers for TCP sockets.

	Each TCP socket has rights to use it due to fact of its birth.

	Default: 1 page

	Default: 4K



	default: initial size of send buffer used by TCP sockets.  This

	value overrides net.core.wmem_default used by other protocols.

Documentation/virtual/kvm/cpuid.txt

+4 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ KVM_FEATURE_PV_UNHALT || 7 || guest checks this feature bit 
                                   ||       || before enabling paravirtualized

                                   ||       || spinlock support.

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

KVM_FEATURE_ASYNC_PF_VMEXIT        ||    10 || paravirtualized async PF VM exit

                                   ||       || can be enabled by setting bit 2

                                   ||       || when writing to msr 0x4b564d02

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

KVM_FEATURE_CLOCKSOURCE_STABLE_BIT ||    24 || host will warn if no guest-side

                                   ||       || per-cpu warps are expected in

                                   ||       || kvmclock.

Documentation/virtual/kvm/msr.txt

+2 −1
Original line number Diff line number Diff line
@@ -170,7 +170,8 @@ MSR_KVM_ASYNC_PF_EN: 0x4b564d02 
	when asynchronous page faults are enabled on the vcpu 0 when

	disabled. Bit 1 is 1 if asynchronous page faults can be injected

	when vcpu is in cpl == 0. Bit 2 is 1 if asynchronous page faults

	are delivered to L1 as #PF vmexits.

	are delivered to L1 as #PF vmexits.  Bit 2 can be set only if

	KVM_FEATURE_ASYNC_PF_VMEXIT is present in CPUID.



	First 4 byte of 64 byte memory location will be written to by

	the hypervisor at the time of asynchronous page fault (APF)

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 24

SUBLEVEL = 26

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/logicpd-som-lv.dtsi

+8 −1
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ 
};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins>;

	clock-frequency = <2600000>;



	twl: twl@48 {
@@ -215,7 +217,12 @@ 
		>;

	};





	i2c1_pins: pinmux_i2c1_pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0)        /* i2c1_scl.i2c1_scl */

			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */

		>;

	};

};



&omap3_pmx_wkup {