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

Commit 356fb135 authored by Ian Maund's avatar Ian Maund
Browse files

Merge upstream linux-stable v3.10.36 into msm-3.10 



* commit 'v3.10.36': (494 commits)
  Linux 3.10.36
  netfilter: nf_conntrack_dccp: fix skb_header_pointer API usages
  mm: close PageTail race
  net: mvneta: rename MVNETA_GMAC2_PSC_ENABLE to MVNETA_GMAC2_PCS_ENABLE
  x86: fix boot on uniprocessor systems
  Input: cypress_ps2 - don't report as a button pads
  Input: synaptics - add manual min/max quirk for ThinkPad X240
  Input: synaptics - add manual min/max quirk
  Input: mousedev - fix race when creating mixed device
  ext4: atomically set inode->i_flags in ext4_set_inode_flags()
  Linux 3.10.35
  sched/autogroup: Fix race with task_groups list
  e100: Fix "disabling already-disabled device" warning
  xhci: Fix resume issues on Renesas chips in Samsung laptops
  Input: wacom - make sure touch_max is set for touch devices
  KVM: VMX: fix use after free of vmx->loaded_vmcs
  KVM: x86: handle invalid root_hpa everywhere
  KVM: MMU: handle invalid root_hpa at __direct_map
  Input: elantech - improve clickpad detection
  ARM: highbank: avoid L2 cache smc calls when PL310 is not present
  ...

Change-Id: Ib68f565291702c53df09e914e637930c5d3e5310
Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parents 1cd71605 8f0c10ea

Documentation/devicetree/bindings/ata/marvell.txt

+1 −1
Original line number Diff line number Diff line 
* Marvell Orion SATA



Required Properties:

- compatibility : "marvell,orion-sata"

- compatibility : "marvell,orion-sata" or "marvell,armada-370-sata"

- reg           : Address range of controller

- interrupts    : Interrupt controller is using

- nr-ports      : Number of SATA ports in use.

Documentation/filesystems/proc.txt

+2 −2
Original line number Diff line number Diff line
@@ -1372,8 +1372,8 @@ may allocate from based on an estimation of its current memory and swap use. 
For example, if a task is using all allowed memory, its badness score will be

1000.  If it is using half of its allowed memory, its score will be 500.



There is an additional factor included in the badness score: root

processes are given 3% extra memory over other tasks.

There is an additional factor included in the badness score: the current memory

and swap usage is discounted by 3% for root processes.



The amount of "allowed" memory depends on the context in which the oom killer

was called.  If it is due to the memory assigned to the allocating task's cpuset

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Supported adapters: 
  * Intel Lynx Point-LP (PCH)

  * Intel Avoton (SOC)

  * Intel Wellsburg (PCH)

  * Intel Coleto Creek (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 10

SUBLEVEL = 28

SUBLEVEL = 36

EXTRAVERSION =

NAME = TOSSUG Baby Fish

arch/arm/include/asm/cacheflush.h

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, 
static inline void __flush_icache_all(void)

{

	__flush_icache_preferred();

	dsb();

}



/*