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

Commit 23a9348b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14.117 (74196c0e) into msm-4.14"

parents 857a96fb c80c2374

Documentation/admin-guide/kernel-parameters.txt

+5 −1
Original line number Diff line number Diff line
@@ -2689,7 +2689,11 @@ 
			nosmt=force: Force disable SMT, cannot be undone

				     via the sysfs control file.



	nospectre_v2	[X86] Disable all mitigations for the Spectre variant 2

	nospectre_v1	[PPC] Disable mitigations for Spectre Variant 1 (bounds

			check bypass). With this option data leaks are possible

			in the system.



	nospectre_v2	[X86,PPC_FSL_BOOK3E] Disable all mitigations for the Spectre variant 2

			(indirect branch prediction) vulnerability. System may

			allow data leaks with this option, which is equivalent

			to spectre_v2=off.

Documentation/driver-api/usb/power-management.rst

+9 −5
Original line number Diff line number Diff line
@@ -370,11 +370,15 @@ autosuspend the interface's device. When the usage counter is = 0 
then the interface is considered to be idle, and the kernel may

autosuspend the device.



Drivers need not be concerned about balancing changes to the usage

counter; the USB core will undo any remaining "get"s when a driver

is unbound from its interface.  As a corollary, drivers must not call

any of the ``usb_autopm_*`` functions after their ``disconnect``

routine has returned.

Drivers must be careful to balance their overall changes to the usage

counter.  Unbalanced "get"s will remain in effect when a driver is

unbound from its interface, preventing the device from going into

runtime suspend should the interface be bound to a driver again.  On

the other hand, drivers are allowed to achieve this balance by calling

the ``usb_autopm_*`` functions even after their ``disconnect`` routine

has returned -- say from within a work-queue routine -- provided they

retain an active reference to the interface (via ``usb_get_intf`` and

``usb_put_intf``).



Drivers using the async routines are responsible for their own

synchronization and mutual exclusion.

Documentation/networking/ip-sysctl.txt

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ tcp_min_rtt_wlen - INTEGER 
	minimum RTT when it is moved to a longer path (e.g., due to traffic

	engineering). A longer window makes the filter more resistant to RTT

	inflations such as transient congestion. The unit is seconds.

	Possible values: 0 - 86400 (1 day)

	Default: 300



tcp_moderate_rcvbuf - BOOLEAN

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 114

SUBLEVEL = 117

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/compressed/head.S

+15 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,21 @@ ENTRY(efi_stub_entry) 


		@ Preserve return value of efi_entry() in r4

		mov	r4, r0

		bl	cache_clean_flush



		@ our cache maintenance code relies on CP15 barrier instructions

		@ but since we arrived here with the MMU and caches configured

		@ by UEFI, we must check that the CP15BEN bit is set in SCTLR.

		@ Note that this bit is RAO/WI on v6 and earlier, so the ISB in

		@ the enable path will be executed on v7+ only.

		mrc	p15, 0, r1, c1, c0, 0	@ read SCTLR

		tst	r1, #(1 << 5)		@ CP15BEN bit set?

		bne	0f

		orr	r1, r1, #(1 << 5)	@ CP15 barrier instructions

		mcr	p15, 0, r1, c1, c0, 0	@ write SCTLR

 ARM(		.inst	0xf57ff06f		@ v7+ isb	)

 THUMB(		isb						)



0:		bl	cache_clean_flush

		bl	cache_off



		@ Set parameters for booting zImage according to boot protocol