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

Commit 9799cdc2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.186 (cd46375d) into msm-4.9"

parents 92f38e1d 0fce515e

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ from load_config import loadConfig 
extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include', 'cdomain']



# The name of the math extension changed on Sphinx 1.4

if major == 1 and minor > 3:

if (major == 1 and minor > 3) or (major > 1):

    extensions.append("sphinx.ext.imgmath")

else:

    extensions.append("sphinx.ext.pngmath")

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
 - compatible: Should be one of the following:

   - "microchip,mcp2510" for MCP2510.

   - "microchip,mcp2515" for MCP2515.

   - "microchip,mcp25625" for MCP25625.

 - reg: SPI chip select.

 - clocks: The clock feeding the CAN controller.

 - interrupt-parent: The parent interrupt controller.

Documentation/networking/ip-sysctl.txt

+8 −0
Original line number Diff line number Diff line
@@ -230,6 +230,14 @@ tcp_base_mss - INTEGER 
	Path MTU discovery (MTU probing).  If MTU probing is enabled,

	this is the initial MSS used by the connection.



tcp_min_snd_mss - INTEGER

	TCP SYN and SYNACK messages usually advertise an ADVMSS option,

	as described in RFC 1122 and RFC 6691.

	If this ADVMSS option is smaller than tcp_min_snd_mss,

	it is silently capped to tcp_min_snd_mss.



	Default : 48 (at least 8 bytes of payload per segment)



tcp_congestion_control - STRING

	Set the congestion control algorithm to be used for new

	connections. The algorithm "reno" is always available, but

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 179

SUBLEVEL = 186

EXTRAVERSION =

NAME = Roaring Lionus
@@ -694,6 +694,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)



ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION
@@ -812,7 +813,6 @@ ifeq ($(cc-name),clang) 
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config ARC 
	select GENERIC_SMP_IDLE_THREAD

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_FUTEX_CMPXCHG

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_IOREMAP_PROT

	select HAVE_KPROBES

	select HAVE_KRETPROBES