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

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

Merge "Merge upstream linux-stable v3.10.28 into msm-3.10"

parents 9ef388c0 f1b32d4e

Documentation/DocBook/media_api.tmpl

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [

<!ENTITY % media-entities SYSTEM "./media-entities.tmpl"> %media-entities;

<!ENTITY media-indices SYSTEM "./media-indices.tmpl">

Documentation/hwmon/k10temp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Supported chips: 
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)

* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"

* AMD Family 16h processors: "Kabini"



  Prefix: 'k10temp'

  Addresses scanned: PCI space

Documentation/i2c/busses/i2c-piix4

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Supported adapters: 
  * AMD SP5100 (SB700 derivative found on some server mainboards)

    Datasheet: Publicly available at the AMD website

    http://support.amd.com/us/Embedded_TechDocs/44413.pdf

  * AMD Hudson-2

  * AMD Hudson-2, CZ

    Datasheet: Not publicly available

  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge

    Datasheet: Publicly available at the SMSC website http://www.smsc.com

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1456,6 +1456,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


			* dump_id: dump IDENTIFY data.



			* atapi_dmadir: Enable ATAPI DMADIR bridge support



			* disable: Disable this device.



			If there are multiple matching configurations changing

			the same attribute, the last one is used.

Documentation/networking/ip-sysctl.txt

+9 −3
Original line number Diff line number Diff line
@@ -478,6 +478,15 @@ tcp_syn_retries - INTEGER 
tcp_timestamps - BOOLEAN

	Enable timestamps as defined in RFC1323.



tcp_min_tso_segs - INTEGER

	Minimal number of segments per TSO frame.

	Since linux-3.12, TCP does an automatic sizing of TSO frames,

	depending on flow rate, instead of filling 64Kbytes packets.

	For specific usages, it's possible to force TCP to build big

	TSO frames. Note that TCP stack might split too big TSO packets

	if available window is too small.

	Default: 2



tcp_tso_win_divisor - INTEGER

	This allows control over what percentage of the congestion window

	can be consumed by a single TSO frame.
@@ -562,9 +571,6 @@ tcp_limit_output_bytes - INTEGER 
	typical pfifo_fast qdiscs.

	tcp_limit_output_bytes limits the number of bytes on qdisc

	or device to reduce artificial RTT/cwnd and reduce bufferbloat.

	Note: For GSO/TSO enabled flows, we try to have at least two

	packets in flight. Reducing tcp_limit_output_bytes might also

	reduce the size of individual GSO packet (64KB being the max)

	Default: 131072



tcp_challenge_ack_limit - INTEGER