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

Commit 6e96a859 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.6 into android-3.18 



Changes in 3.18.6:
	x86, build: replace Perl script with Shell script
	spi: dw: Fix detecting FIFO depth
	spi: dw-mid: fix FIFO size
	vm: add VM_FAULT_SIGSEGV handling support
	arc: mm: Fix build failure
	vm: make stack guard page errors return VM_FAULT_SIGSEGV rather than SIGBUS
	ASoC: wm8960: Fix capture sample rate from 11250 to 11025
	ASoC: pcm512x: Fix DSP program selection
	ASoC: fsl_esai: Fix incorrect xDC field width of xCCR registers
	ASoC: soc-compress.c: fix NULL dereference
	ASoC: simple-card: Fix crash in asoc_simple_card_unref()
	ASoC: omap-mcbsp: Correct CBM_CFS dai format configuration
	udf: Release preallocation on last writeable close
	can: kvaser_usb: Do not sleep in atomic context
	can: kvaser_usb: Send correct context to URB completion
	can: kvaser_usb: Retry the first bulk transfer on -ETIMEDOUT
	can: kvaser_usb: Fix state handling upon BUS_ERROR events
	powerpc/xmon: Fix another endiannes issue in RTAS call from xmon
	ALSA: seq-dummy: remove deadlock-causing events on close
	rbd: drop parent_ref in rbd_dev_unprobe() unconditionally
	rbd: fix rbd_dev_parent_get() when parent_overlap == 0
	USB: Add OTG PET device to TPL
	usb-storage/SCSI: blacklist FUA on JMicron 152d:2566 USB-SATA controller
	uas: Add no-report-opcodes quirk for Simpletech devices with id 4971:8017
	i2c: s3c2410: fix ABBA deadlock by keeping clock prepared
	Input: synaptics - adjust min/max for Lenovo ThinkPad X1 Carbon 2nd
	Input: elantech - add more Fujtisu notebooks to force crc_enabled
	Input: i8042 - add noloop quirk for Medion Akoya E7225 (MD98857)
	nfs: fix dio deadlock when O_DIRECT flag is flipped
	NFSv4.1: Fix an Oops in nfs41_walk_client_list
	mac80211: properly set CCK flag in radiotap
	mac80211: only roll back station states for WDS when suspending
	nl80211: fix per-station group key get/del and memory leak
	pinctrl: at91: allow to have disabled gpio bank
	ARM: mvebu: don't set the PL310 in I/O coherency mode when I/O coherency is disabled
	dm thin: don't allow messages to be sent to a pool target in READ_ONLY or FAIL mode
	dm cache: fix missing ERR_PTR returns and handling
	drm/vmwgfx: Replace the hw mutex with a hw spinlock
	drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry
	drm/radeon: Restore GART table contents after pinning it in VRAM v3
	spi/pxa2xx: Clear cur_chip pointer before starting next message
	drivers/rtc/rtc-s5m.c: terminate s5m_rtc_id array with empty element
	regulator: core: fix race condition in regulator_put()
	drivers: net: cpsw: discard dual emac default vlan configuration
	drm: fix fb-helper vs MST dangling connector ptrs (v2)
	drm/i915: Only fence tiled region of object.
	drm/i915: BDW Fix Halo PCI IDs marked as ULT.
	drm/i915: Init PPGTT before context enable
	drm/i915: fix inconsistent brightness after resume
	quota: Switch ->get_dqblk() and ->set_dqblk() to use bytes as space units
	memcg: remove extra newlines from memcg oom kill log
	perf/x86/intel: Add model number for Airmont
	perf/rapl: Fix crash in rapl_scale()
	HID: rmi: Check for additional ACM registers appended to F11 data report
	can: c_can: end pending transmission on network stop (ifdown)
	clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64
	xen/arm/arm64: introduce xen_arch_need_swiotlb
	Linux 3.18.6

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4e4a84f5 99609149

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 5

SUBLEVEL = 6

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/alpha/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ retry: 
	if (unlikely(fault & VM_FAULT_ERROR)) {

		if (fault & VM_FAULT_OOM)

			goto out_of_memory;

		else if (fault & VM_FAULT_SIGSEGV)

			goto bad_area;

		else if (fault & VM_FAULT_SIGBUS)

			goto do_sigbus;

		BUG();

arch/arc/mm/fault.c

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ good_area: 


	if (fault & VM_FAULT_OOM)

		goto out_of_memory;

	else if (fault & VM_FAULT_SIGSEGV)

		goto bad_area;

	else if (fault & VM_FAULT_SIGBUS)

		goto do_sigbus;

arch/arm/include/asm/xen/page.h

+4 −0
Original line number Diff line number Diff line
@@ -107,4 +107,8 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
#define xen_remap(cookie, size) ioremap_cache((cookie), (size))

#define xen_unmap(cookie) iounmap((cookie))



bool xen_arch_need_swiotlb(struct device *dev,

			   unsigned long pfn,

			   unsigned long mfn);



#endif /* _ASM_ARM_XEN_PAGE_H */

arch/arm/mach-mvebu/coherency.c

+7 −0
Original line number Diff line number Diff line
@@ -341,6 +341,13 @@ static void __init armada_375_380_coherency_init(struct device_node *np) 
	coherency_cpu_base = of_iomap(np, 0);

	arch_ioremap_caller = armada_pcie_wa_ioremap_caller;



	/*

	 * We should switch the PL310 to I/O coherency mode only if

	 * I/O coherency is actually enabled.

	 */

	if (!coherency_available())

		return;



	/*

	 * Add the PL310 property "arm,io-coherent". This makes sure the

	 * outer sync operation is not used, which allows to