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

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

Merge 3.18.15 into android-3.18



Changes in 3.18.15:
	ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook
	ACPI / PNP: add two IDs to list for PNPACPI device enumeration
	ocfs2: dlm: fix race between purge and get lock resource
	nilfs2: fix sanity check of btree level in nilfs_btree_root_broken()
	RDMA/CMA: Canonize IPv4 on IPV6 sockets properly
	gpio: sysfs: fix memory leaks and device hotplug
	mnt: Fix fs_fully_visible to verify the root directory is visible
	mm/memory-failure: call shake_page() when error hits thp tail page
	path_openat(): fix double fput()
	writeback: use |1 instead of +1 to protect against div by zero
	mm: soft-offline: fix num_poisoned_pages counting on concurrent events
	xen/events: Clear cpu_evtchn_mask before resuming
	xen/xenbus: Update xenbus event channel on resume
	xen/console: Update console event channel on resume
	xen/events: Set irq_info->evtchn before binding the channel to CPU in __startup_pirq()
	xen-pciback: Add name prefix to global 'permissive' variable
	Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY"
	ARM: dts: OMAP3-N900: Add microphone bias voltages
	ARM: dts: imx25: Add #pwm-cells to pwm4
	ARM: dts: imx6: phyFLEX: USB VBUS control is active-high
	ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
	ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
	ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO
	ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
	ARM: OMAP2+: Fix omap off idle power consumption creeping up
	ARM: net fix emit_udiv() for BPF_ALU | BPF_DIV | BPF_K intruction.
	ARM: ux500: Move GPIO regulator for SD-card into board DTSs
	ARM: ux500: Enable GPIO regulator for SD-card for HREF boards
	ARM: ux500: Enable GPIO regulator for SD-card for snowball
	drm: Zero out invalid vblank timestamp in drm_update_vblank_count.
	drm/i915: Add missing MacBook Pro models with dual channel LVDS
	drm/i915/dp: there is no audio on port A
	drm/radeon: disable semaphores for UVD V1 (v2)
	drm/radeon: fix userptr BO unpin bug v3
	drm/radeon: make VCE handle check more strict
	drm/radeon: make UVD handle checking more strict
	drm/radeon: more strictly validate the UVD codec
	pinctrl: Don't just pretend to protect pinctrl_maps, do it for real
	mmc: card: Don't access RPMB partitions for normal read/write
	mmc: core: add missing pm event in mmc_pm_notify to fix hib restore
	mmc: sh_mmcif: Fix timeout value for command request
	ARM: 8307/1: psci: move psci firmware calls out of line
	sound/oss: fix deadlock in sequencer_ioctl(SNDCTL_SEQ_OUTOFBAND)
	coredump: accept any write method
	ACPICA: Tables: Change acpi_find_root_pointer() to use acpi_physical_address.
	ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR().
	ACPICA: Utilities: Cleanup to convert physical address printing formats.
	ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers.
	ARM: mvebu: do not register custom DMA operations when coherency is disabled
	mnt: Fail collect_mounts when applied to unmounted mounts
	fs_pin: Allow for the possibility that m_list or s_list go unused.
	Revert "KVM: x86: drop fpu_activate hook"
	x86, mce, severity: Extend the the mce_severity mechanism to handle UCNA/DEFERRED error
	x86/mce: Fix MCE severity messages
	x86/fpu: Disable XSAVES* support for now
	KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages
	KVM: MMU: fix smap permission check
	kvm: fix crash in kvm_vcpu_reload_apic_access_page
	KVM: MMU: fix SMAP virtualization
	kvm/fpu: Enable eager restore kvm FPU for MPX
	ktime: Optimize ktime_divns for constant divisors
	ktime: Fix ktime_divns to do signed division
	fs, omfs: add NULL terminator in the end up the token list
	omfs: fix sign confusion for bitmap loop counter
	lguest: fix out-by-one error in address checking.
	xfs: xfs_attr_inactive leaves inconsistent attr fork state behind
	xfs: xfs_iozero can return positive errno
	Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"
	Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"
	xen/events: don't bind non-percpu VIRQs with percpu chip
	hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE
	iio: light: hid-sensor-prox: Fix modifier
	iio: pressure: hid-sensor-press: Fix modifier
	iio: adc: xilinx: Fix register addresses
	iio: adc: xilinx: Fix "vccaux" channel .address
	iio: adc: xilinx: Fix VREFP scale
	iio: adc: xilinx: Fix VREFN sign
	hwmon: (nct6775) Add missing sysfs attribute initialization
	hwmon: (nct6683) Add missing sysfs attribute initialization
	lib: Fix strnlen_user() to not touch memory after specified maximum
	d_walk() might skip too much
	module: Call module notifier on failure after complete_formation()
	ALSA: usb-audio: Add native DSD support for Denon/Marantz DACs
	ALSA: usb-audio: Add mode select quirk for Denon/Marantz DACs
	ALSA: usb-audio: Add support for Zoom R16/24 capture and midi interfaces
	ALSA: usb-audio: add native DSD support for Matrix Audio DACs
	ALSA: usb-audio: Don't attempt to get Lifecam HD-5000 sample rate
	ALSA: usb: Fix support for Denon DA-300USB DAC (ID 154e:1003)
	ALSA: usb-audio: Check Marantz/Denon USB DACs in a single place
	ALSA: usb-audio: don't try to get Benchmark DAC1 sample rate
	ALSA: usb-audio: Don't attempt to get Microsoft Lifecam Cinema sample rate
	ALSA: usb-audio: Add quirk for MS LifeCam Studio
	ALSA: usb-audio: Add quirk for MS LifeCam HD-3000
	ALSA: hda/realtek - Support Dell headset mode for ALC256
	ALSA: hda/realtek - Support headset mode for ALC286/288
	ALSA: hda - fix headset mic detection problem for one more machine
	ALSA: hda - Add headphone quirk for Lifebook E752
	ALSA: hda/realtek - Fix typo for ALC286/ALC288
	ALSA: hda/realtek - Add ALC298 alias name for Dell
	ALSA: hda - Add headset mic quirk for Dell Inspiron 5548
	ALSA: hda/realtek - Support headset mode for ALC298
	ALSA: hda - Fix headset mic and mic-in for a Dell desktop
	ALSA: hda/realtek - ALC292 dock fix for Thinkpad L450
	ALSA: hda/realtek - Add ALC256 alias name for Dell
	ALSA: hda - Disable Headphone Mic boost for ALC662
	Revert "ALSA: hda - Add mute-LED mode control to Thinkpad"
	ALSA: hda - Add AZX_DCAPS_SNOOP_OFF (and refactor snoop setup)
	ALSA: hda - Fix noise on AMD radeon 290x controller
	ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls
	ASoC: dapm: Modify widget stream name according to prefix
	ASoC: wm8960: fix "RINPUT3" audio route error
	ASoC: wm8994: correct BCLK DIV 348 to 384
	RDMA/core: Fix for parsing netlink string attribute
	staging: gdm724x: Correction of variable usage after applying ALIGN()
	staging: vt6656: use ieee80211_tx_info to select packet type.
	perf/x86/rapl: Enable Broadwell-U RAPL support
	target/pscsi: Don't leak scsi_host if hba is VIRTUAL_HOST
	xhci: fix isoc endpoint dequeue from advancing too far on transaction error
	xhci: Solve full event ring by increasing TRBS_PER_SEGMENT to 256
	xhci: gracefully handle xhci_irq dead device
	USB: visor: Match I330 phone more precisely
	USB: pl2303: Remove support for Samsung I330
	USB: cp210x: add ID for KCF Technologies PRN device
	usb-storage: Add NO_WP_DETECT quirk for Lacie 059f:0651 devices
	usb: gadget: configfs: Fix interfaces array NULL-termination
	powerpc: Align TOC to 256 bytes
	mmc: atmel-mci: fix bad variable type for clkdiv
	tty/n_gsm.c: fix a memory leak when gsmtty is removed
	ext4: fix NULL pointer dereference when journal restart fails
	ext4: check for zero length extent explicitly
	jbd2: fix r_count overflows leading to buffer overflow in journal recovery
	ahci: avoton port-disable reset-quirk
	libata: Add helper to determine when PHY events should be ignored
	libata: Ignore spurious PHY event on LPM policy change
	arm64: bpf: fix signedness bug in loading 64-bit immediate
	rt2x00: add new rt2800usb device DWA 130
	gpio: gpio-kempld: Fix get_direction return value
	crypto: s390/ghash - Fix incorrect ghash icv buffer handling.
	mac80211: move WEP tailroom size check
	mac80211: don't use napi_gro_receive() outside NAPI context
	s390/mm: correct return value of pmd_pfn
	sched: Handle priority boosted tasks proper in setscheduler()
	ARM: 8356/1: mm: handle non-pmd-aligned end of RAM
	ARM: dts: imx27: only map 4 Kbyte for fec registers
	ARM: fix missing syscall trace exit
	parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures
	tools/vm: fix page-flags build
	mm, numa: really disable NUMA balancing by default on single node machines
	nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op
	svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures
	firmware: dmi_scan: Fix ordering of product_uuid
	thermal: armada: Update Armada 380 thermal sensor coefficients
	md/raid5: don't record new size if resize_stripes fails.
	rtlwifi: rtl8192cu: Fix kernel deadlock
	storvsc: Set the SRB flags correctly when no data transfer is needed
	sd: Disable support for 256 byte/sector disks
	ACPI / init: Fix the ordering of acpi_reserve_resources()
	iwlwifi: pcie: prevent using unmapped memory in fw monitor
	drm/radeon: add new bonaire pci id
	drm/radeon: fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling
	drm/radeon: retry dcpd fetch
	drm/radeon: don't share plls if monitors differ in audio support
	drm/radeon: partially revert "fix VM_CONTEXT*_PAGE_TABLE_END_ADDR handling"
	vfs: read file_handle only once in handle_to_path
	power/reset: at91: fix return value check in at91_reset_platform_probe()
	ARC: unbork !LLSC build
	xfrm: release dst_orig in case of error in xfrm_lookup()
	ARM: OMAP3: Fix booting with thumb2 kernel
	Linux 3.18.15

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 37b707be 324d8201
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 {
		      80 81 68 69
		      70 71 72 73
		      74 75 76 77>;
	interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",
	interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
			  "saif0", "saif1", "i2c0", "i2c1",
			  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
			  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
+14 −4
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ Shadow pages contain the following information:
    Contains the value of cr4.smep && !cr0.wp for which the page is valid
    (pages for which this is true are different from other pages; see the
    treatment of cr0.wp=0 below).
  role.smap_andnot_wp:
    Contains the value of cr4.smap && !cr0.wp for which the page is valid
    (pages for which this is true are different from other pages; see the
    treatment of cr0.wp=0 below).
  gfn:
    Either the guest page table containing the translations shadowed by this
    page, or the base page frame for linear translations.  See role.direct.
@@ -344,10 +348,16 @@ on fault type:

(user write faults generate a #PF)

In the first case there is an additional complication if CR4.SMEP is
enabled: since we've turned the page into a kernel page, the kernel may now
execute it.  We handle this by also setting spte.nx.  If we get a user
fetch or read fault, we'll change spte.u=1 and spte.nx=gpte.nx back.
In the first case there are two additional complications:
- if CR4.SMEP is enabled: since we've turned the page into a kernel page,
  the kernel may now execute it.  We handle this by also setting spte.nx.
  If we get a user fetch or read fault, we'll change spte.u=1 and
  spte.nx=gpte.nx back.
- if CR4.SMAP is disabled: since the page has been changed to a kernel
  page, it can not be reused when CR4.SMAP is enabled. We set
  CR4.SMAP && !CR0.WP into shadow page's role to avoid this case. Note,
  here we do not care the case that CR4.SMAP is enabled since KVM will
  directly inject #PF to guest due to failed permission check.

To prevent an spte that was converted into a kernel page with cr0.wp=0
from being written by the kernel after cr0.wp has changed to 1, we make
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 14
SUBLEVEL = 15
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static inline void atomic_##op(int i, atomic_t *v) \
	atomic_ops_unlock(flags);					\
}

#define ATOMIC_OP_RETURN(op, c_op)					\
#define ATOMIC_OP_RETURN(op, c_op, asm_op)				\
static inline int atomic_##op##_return(int i, atomic_t *v)		\
{									\
	unsigned long flags;						\
+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@
		};

		internal-regs {
			rtc@10300 {
				/* No crystal connected to the internal RTC */
				status = "disabled";
			};
			serial@12000 {
				status = "okay";
			};
Loading