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

Commit 7c85ed08 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.159 into android-4.9 



Changes in 4.9.159
	dt-bindings: eeprom: at24: add "atmel,24c2048" compatible string
	eeprom: at24: add support for 24c2048
	uapi/if_ether.h: prevent redefinition of struct ethhdr
	ARM: 8789/1: signal: copy registers using __copy_to_user()
	ARM: 8791/1: vfp: use __copy_to_user() when saving VFP state
	ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user()
	ARM: 8793/1: signal: replace __put_user_error with __put_user
	ARM: 8794/1: uaccess: Prevent speculative use of the current addr_limit
	ARM: 8795/1: spectre-v1.1: use put_user() for __put_user()
	ARM: 8796/1: spectre-v1,v1.1: provide helpers for address sanitization
	ARM: 8797/1: spectre-v1.1: harden __copy_to_user
	ARM: 8810/1: vfp: Fix wrong assignement to ufp_exc
	ARM: make lookup_processor_type() non-__init
	ARM: split out processor lookup
	ARM: clean up per-processor check_bugs method call
	ARM: add PROC_VTABLE and PROC_TABLE macros
	ARM: spectre-v2: per-CPU vtables to work around big.Little systems
	ARM: ensure that processor vtables is not lost after boot
	ARM: fix the cockup in the previous patch
	net: create skb_gso_validate_mac_len()
	bnx2x: disable GSO where gso_size is too big for hardware
	ACPI: NUMA: Use correct type for printing addresses on i386-PAE
	cpufreq: check if policy is inactive early in __cpufreq_get()
	drm/bridge: tc358767: add defines for DP1_SRCCTRL & PHY_2LANE
	drm/bridge: tc358767: fix single lane configuration
	drm/bridge: tc358767: fix initial DP0/1_SRCCTRL value
	drm/bridge: tc358767: reject modes which require too much BW
	drm/bridge: tc358767: fix output H/V syncs
	ARM: dts: da850-evm: Correct the sound card name
	ARM: dts: da850-lcdk: Correct the sound card name
	ARM: dts: kirkwood: Fix polarity of GPIO fan lines
	gpio: pl061: handle failed allocations
	cifs: Limit memory used by lock request calls to a page
	perf report: Include partial stacks unwound with libdw
	Revert "Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G"
	Input: elan_i2c - add ACPI ID for touchpad in Lenovo V330-15ISK
	perf/core: Fix impossible ring-buffer sizes warning
	perf/x86: Add check_period PMU callback
	ALSA: hda - Add quirk for HP EliteBook 840 G5
	ALSA: usb-audio: Fix implicit fb endpoint setup by quirk
	kvm: vmx: Fix entry number check for add_atomic_switch_msr()
	Input: bma150 - register input device after setting private data
	Input: elantech - enable 3rd button support on Fujitsu CELSIUS H780
	alpha: fix page fault handling for r16-r18 targets
	alpha: Fix Eiger NR_IRQS to 128
	tracing/uprobes: Fix output for multiple string arguments
	x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls
	signal: Restore the stop PTRACE_EVENT_EXIT
	x86/a.out: Clear the dump structure initially
	dm thin: fix bug where bio that overwrites thin block ignores FUA
	drm/i915: Prevent a race during I915_GEM_MMAP ioctl with WC set
	smsc95xx: Use skb_cow_head to deal with cloned skbs
	ch9200: use skb_cow_head() to deal with cloned skbs
	kaweth: use skb_cow_head() to deal with cloned skbs
	usb: dwc2: Remove unnecessary kfree
	netfilter: nf_tables: fix mismatch in big-endian system
	pinctrl: msm: fix gpio-hog related boot issues
	mm: stop leaking PageTables
	uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define
	Revert "scsi: aic94xx: fix module loading"
	Linux 4.9.159

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3de7f845 b9d7a53e

Documentation/devicetree/bindings/eeprom/eeprom.txt

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties: 


	"atmel,24c00", "atmel,24c01", "atmel,24c02", "atmel,24c04",

	"atmel,24c08", "atmel,24c16", "atmel,24c32", "atmel,24c64",

	"atmel,24c128", "atmel,24c256", "atmel,24c512", "atmel,24c1024"

	"atmel,24c128", "atmel,24c256", "atmel,24c512", "atmel,24c1024",

	"atmel,24c2048"



	"catalyst,24c32"
@@ -17,7 +18,7 @@ Required properties: 
	 If there is no specific driver for <manufacturer>, a generic

	 driver based on <type> is selected. Possible types are:

	 "24c00", "24c01", "24c02", "24c04", "24c08", "24c16", "24c32", "24c64",

	 "24c128", "24c256", "24c512", "24c1024", "spd"

	 "24c128", "24c256", "24c512", "24c1024", "24c2048", "spd"



  - reg : the I2C address of the EEPROM

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 158

SUBLEVEL = 159

EXTRAVERSION =

NAME = Roaring Lionus

arch/alpha/include/asm/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -55,15 +55,15 @@ 


#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK) || \

      defined(CONFIG_ALPHA_EIGER)

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64



#elif defined(CONFIG_ALPHA_TITAN)

#define NR_IRQS		80



#elif defined(CONFIG_ALPHA_RAWHIDE) || \

	defined(CONFIG_ALPHA_TAKARA)

      defined(CONFIG_ALPHA_TAKARA) || \

      defined(CONFIG_ALPHA_EIGER)

# define NR_IRQS	128



#elif defined(CONFIG_ALPHA_WILDFIRE)

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ __load_new_mm_context(struct mm_struct *next_mm) 
/* Macro for exception fixup code to access integer registers.  */

#define dpf_reg(r)							\

	(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 :	\

				 (r) <= 18 ? (r)+8 : (r)-10])

				 (r) <= 18 ? (r)+10 : (r)-10])



asmlinkage void

do_page_fault(unsigned long address, unsigned long mmcsr,

arch/arm/boot/dts/da850-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 


	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 EVM";

		simple-audio-card,name = "DA850-OMAPL138 EVM";

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line Out";