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

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

Merge 3.18.14 into android-3.18



Changes in 3.18.14:
	kvm: add a memslot flag for incoherent memory regions
	arm, arm64: KVM: allow forced dcache flush on page faults
	arm, arm64: KVM: handle potential incoherency of readonly memslots
	arm/arm64: KVM: Don't clear the VCPU_POWER_OFF flag
	arm/arm64: KVM: Correct KVM_ARM_VCPU_INIT power off option
	arm/arm64: KVM: Reset the HCR on each vcpu when resetting the vcpu
	arm/arm64: KVM: Turn off vcpus on PSCI shutdown/reboot
	arm/arm64: KVM: Introduce stage2_unmap_vm
	arm/arm64: KVM: vgic: move reset initialization into vgic_init_maps()
	arm/arm64: KVM: Don't allow creating VCPUs after vgic_initialized
	arm/arm64: KVM: vgic: kick the specific vcpu instead of iterating through all
	arm/arm64: KVM: Initialize the vgic on-demand when injecting IRQs
	arm/arm64: KVM: Require in-kernel vgic for the arch timers
	KVM: arm/arm64: vgic: vgic_init returns -ENODEV when no online vcpu
	arm64: KVM: Fix TLB invalidation by IPA/VMID
	arm64: KVM: Fix HCR setting for 32bit guests
	arm/arm64: KVM: Invalidate data cache on unmap
	arm/arm64: KVM: Use kernel mapping to perform invalidation on page fault
	ARM: KVM: Fix size check in __coherent_cache_guest_page
	arm64: KVM: Fix stage-2 PGD allocation to have per-page refcounting
	arm64: KVM: Do not use pgd_index to index stage-2 pgd
	arm/arm64: KVM: Keep elrsr/aisr in sync with software model
	mlx4: Fix tx ring affinity_mask creation
	net/mlx4_en: Schedule napi when RX buffers allocation fails
	ipv4: Missing sk_nulls_node_init() in ping_unhash().
	ip_forward: Drop frames with attached skb->sk
	net: add skb_checksum_complete_unset
	ppp: call skb_checksum_complete_unset in ppp_receive_frame
	tcp: fix possible deadlock in tcp_send_fin()
	tcp: avoid looping in tcp_send_fin()
	net: do not deplete pfmemalloc reserve
	net: fix crash in build_skb()
	sched/idle/x86: Restore mwait_idle() to fix boot hangs, to improve power savings and to improve performance
	sched/idle/x86: Optimize unnecessary mwait_idle() resched IPIs
	KVM: x86: Fix MSR_IA32_BNDCFGS in msrs_to_save
	Btrfs: fix log tree corruption when fs mounted with -o discard
	btrfs: don't accept bare namespace as a valid xattr
	Btrfs: fix inode eviction infinite loop after cloning into it
	Btrfs: fix inode eviction infinite loop after extent_same ioctl
	usb: gadget: printer: enqueue printer's response for setup request
	KVM: s390: fix handling of write errors in the tpi handler
	KVM: s390: reinjection of irqs can fail in the tpi handler
	KVM: s390: Zero out current VMDB of STSI before including level3 data.
	KVM: s390: no need to hold the kvm->mutex for floating interrupts
	KVM: s390: fix get_all_floating_irqs
	s390/hibernate: fix save and restore of kernel text section
	KVM: use slowpath for cross page cached accesses
	KVM: arm/arm64: check IRQ number on userland injection
	MIPS: KVM: Handle MSA Disabled exceptions from guest
	MIPS: lose_fpu(): Disable FPU when MSA enabled
	MIPS: Malta: Detect and fix bad memsize values
	MIPS: asm: asm-eva: Introduce kernel load/store variants
	MIPS: Loongson-3: Add IRQF_NO_SUSPEND to Cascade irqaction
	MIPS: Hibernate: flush TLB entries earlier
	staging: panel: fix lcd type
	staging: android: sync: Fix memory corruption in sync_timeline_signal().
	md/raid0: fix bug with chunksize not a power of 2.
	cdc-wdm: fix endianness bug in debug statements
	mmc: sunxi: Use devm_reset_control_get_optional() for reset control
	spi: imx: read back the RX/TX watermark levels earlier
	spi: spidev: fix possible arithmetic overflow for multi-transfer message
	compal-laptop: Fix leaking hwmon device
	compal-laptop: Check return value of power_supply_register
	ring-buffer: Replace this_cpu_*() with __this_cpu_*()
	power_supply: twl4030_madc: Check return value of power_supply_register
	power_supply: lp8788-charger: Fix leaked power supply on probe fail
	power_supply: ipaq_micro_battery: Fix leaking workqueue
	power_supply: ipaq_micro_battery: Check return values in probe
	NFS: fix BUG() crash in notify_change() with patch to chown_common()
	ARM: fix broken hibernation
	ARM: 8320/1: fix integer overflow in ELF_ET_DYN_BASE
	ARM: mvebu: Disable CPU Idle on Armada 38x
	ARM: S3C64XX: Use fixed IRQ bases to avoid conflicts on Cragganmore
	ARM: dts: dove: Fix uart[23] reg property
	usb: musb: core: fix TX/RX endpoint order
	usb: phy: Find the right match in devm_usb_phy_match
	usb: define a generic USB_RESUME_TIMEOUT macro
	usb: musb: use new USB_RESUME_TIMEOUT
	usb: host: oxu210hp: use new USB_RESUME_TIMEOUT
	usb: host: fusbh200: use new USB_RESUME_TIMEOUT
	usb: host: uhci: use new USB_RESUME_TIMEOUT
	usb: host: fotg210: use new USB_RESUME_TIMEOUT
	usb: host: r8a66597: use new USB_RESUME_TIMEOUT
	usb: host: isp116x: use new USB_RESUME_TIMEOUT
	usb: host: xhci: use new USB_RESUME_TIMEOUT
	usb: host: ehci: use new USB_RESUME_TIMEOUT
	usb: host: sl811: use new USB_RESUME_TIMEOUT
	usb: core: hub: use new USB_RESUME_TIMEOUT
	clk: at91: usb: propagate rate modification to the parent clk
	ALSA: hda - Add dock support for ThinkPad X250 (17aa:2226)
	ALSA: emu10k1: don't deadlock in proc-functions
	ALSA: hda/realtek - Enable the ALC292 dock fixup on the Thinkpad T450
	ALSA: hda - fix "num_steps = 0" error on ALC256
	ALSA: hda/realtek - Fix Headphone Mic doesn't recording for ALC256
	Input: elantech - fix absolute mode setting on some ASUS laptops
	fs/binfmt_elf.c: fix bug in loading of PIE binaries
	ptrace: fix race between ptrace_resume() and wait_task_stopped()
	NFC: st21nfcb: Retry i2c_master_send if it returns a negative value
	rtlwifi: rtl8192cu: Add new USB ID
	rtlwifi: rtl8192cu: Add new device ID
	ext4: make fsync to sync parent dir in no-journal for real this time
	mnt: Improve the umount_tree flags
	mnt: Don't propagate umounts in __detach_mounts
	perf symbols: Define STT_GNU_IFUNC for glibc 2.9 and older.
	perf tools: Work around lack of sched_getcpu in glibc < 2.6.
	powerpc/perf: Cap 64bit userspace backtraces to PERF_MAX_STACK_DEPTH
	tools lib traceevent kbuffer: Remove extra update to data pointer in PADDING
	tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
	UBI: account for bitflips in both the VID header and data
	UBI: fix out of bounds write
	UBI: initialize LEB number variable
	UBI: fix check for "too many bytes"
	scsi: storvsc: Fix a bug in copy_from_bounce_buffer()
	target: Fix COMPARE_AND_WRITE with SG_TO_MEM_NOALLOC handling
	target/file: Fix BUG() when CONFIG_DEBUG_SG=y and DIF protection enabled
	target/file: Fix UNMAP with DIF protection support
	target/file: Fix SG table for prot_buf initialization
	iser-target: Fix session hang in case of an rdma read DIF error
	Bluetooth: ath3k: Add support Atheros AR5B195 combo Mini PCIe card
	powerpc/powernv: Don't map M64 segments using M32DT
	powerpc: Fix missing L2 cache size in /sys/devices/system/cpu
	powerpc/cell: Fix crash in iic_setup_cpu() after per_cpu changes
	powerpc/cell: Fix cell iommu after it_page_shift changes
	ASoC: cs4271: Increase delay time after reset
	ASoC: wm8741: Fix rates constraints values
	ASoC: davinci-evm: drop un-necessary remove function
	ASoC: pcm512x: Add 'Analogue' prefix to analogue volume controls
	ACPICA: Utilities: split IO address types from data type models.
	ACPICA: Tables: Don't release ACPI_MTX_TABLES in acpi_tb_install_standard_table().
	ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
	xtensa: xtfpga: fix hardware lockup caused by LCD driver
	xtensa: provide __NR_sync_file_range2 instead of __NR_sync_file_range
	xtensa: ISS: fix locking in TAP network adapter
	gpio: mvebu: Fix mask/unmask managment per irq chip type
	clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC
	clk: tegra: Register the proper number of resets
	clk: qcom: Fix i2c frequency table
	clk: qcom: fix RCG M/N counter configuration
	Revert "dm crypt: fix deadlock when async crypto algorithm returns -EBUSY"
	sd: Unregister integrity profile
	sd: Fix missing ATO tag check
	Drivers: hv: vmbus: Fix a bug in the error path in vmbus_open()
	mvsas: fix panic on expander attached SATA devices
	[media] rc: img-ir: fix error in parameters passed to irq_free()
	[media] stk1160: Make sure current buffer is released
	IB/core: disallow registering 0-sized memory region
	IB/core: don't disallow registering region starting at 0x0
	IB/mlx4: Fix WQE LSO segment calculation
	IB/iser: Fix wrong calculation of protection buffer length
	tracing: Handle ftrace_dump() atomic context in graph_trace_open()
	i2c: rk3x: report number of messages transmitted
	i2c: core: Export bus recovery functions
	drm/radeon: fix doublescan modes (v2)
	drm/i915: Dont enable CS_PARSER_ERROR interrupts at all
	drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
	drm/i915: cope with large i2c transfers
	RCU pathwalk breakage when running into a symlink overmounting something
	nfsd4: fix READ permission checking
	nfsd4: disallow SEEK with special stateids
	NFS: Add a stub for GETDEVICELIST
	e1000: add dummy allocator to fix race condition between mtu change and netpoll
	ebpf: verifier: check that call reg with ARG_ANYTHING is initialized
	lib: memzero_explicit: use barrier instead of OPTIMIZER_HIDE_VAR
	wl18xx: show rx_frames_per_rates as an array as it really is
	crypto: omap-aes - Fix support for unequal lengths
	C6x: time: Ensure consistency in __init
	memstick: mspro_block: add missing curly braces
	drivers: platform: parse IRQ flags from resources
	driver core: bus: Goto appropriate labels on failure in bus_add_device
	netfilter: bridge: really save frag_max_size between PRE and POST_ROUTING
	KVM: nVMX: mask unrestricted_guest if disabled on L0
	staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel
	mm/hugetlb: use pmd_page() in follow_huge_pmd()
	mm/hugetlb: take page table lock in follow_huge_pmd()
	rtlwifi: rtl8192ee: Fix handling of new style descriptors
	fs: take i_mutex during prepare_binprm for set[ug]id executables
	bpf: fix 64-bit divide
	MIPS: BCM63xx: Move bcm63xx_gpio_init() to bcm63xx_register_devices().
	MIPS: OCTEON: dma-octeon: fix OHCI USB config check
	clk: at91: usb: fix determine_rate prototype
	MIPS: Octeon: Remove udelay() causing huge IRQ latency
	MIPS: OCTEON: fix PCI interrupt mapping for D-Link DSR-1000N
	MIPS: Netlogic: Fix for SATA PHY init
	MIPS: kernel: entry.S: Set correct ISA level for mips_ihb
	MIPS: Octeon: Delete override of cpu_has_mips_r2_exec_hazard.
	SSB: fix Kconfig dependencies
	MIPS: ralink: add missing symbol for RALINK_ILL_ACC
	MIPS: smp-cps: cpu_set FPU mask if FPU present
	MIPS: Kconfig: Disable SMP/CPS for 64-bit
	MIPS: BCM47XX: Fix detecting Microsoft MN-700 & Asus WL500G
	ALSA: emux: Fix mutex deadlock at unloading
	ALSA: emux: Fix mutex deadlock in OSS emulation
	ALSA: emu10k1: Fix card shortname string buffer overflow
	ALSA: emu10k1: Emu10k2 32 bit DMA mode
	ALSA: hda - Add mute-LED mode control to Thinkpad
	cdc-acm: add sanity checks
	cdc-acm: prevent infinite loop when parsing CDC headers.
	serial: of-serial: Remove device_type = "serial" registration
	serial: xilinx: Use platform_get_irq to get irq description structure
	arm64: dma-mapping: always clear allocated buffers
	usb: chipidea: otg: remove mutex unlock and lock while stop and start role
	ASoC: samsung: s3c24xx-i2s: Fix return value check in s3c24xx_iis_dev_probe()
	ASoC: dapm: Enable autodisable on SOC_DAPM_SINGLE_TLV_AUTODISABLE
	ASoC: rt5677: fixed wrong DMIC ref clock
	btrfs: unlock i_mutex after attempting to delete subvolume during send
	ACPI / SBS: Enable battery manager when present
	tty/serial: at91: maxburst was missing for dma transfers
	rbd: end I/O the entire obj_request on error
	uas: Allow uas_use_uas_driver to return usb-storage flags
	uas: Add US_FL_MAX_SECTORS_240 flag
	uas: Set max_sectors_240 quirk for ASM1053 devices
	ext4: fix data corruption caused by unwritten and delayed extents
	ext4: move check under lock scope to close a race.
	3w-xxxx: fix command completion race
	3w-9xxx: fix command completion race
	3w-sas: fix command completion race
	drm/radeon: adjust pll when audio is not enabled
	drm/radeon: add SI DPM quirk for Sapphire R9 270 Dual-X 2G GDDR5
	drm/radeon: check new address before removing old one
	hfsplus: don't store special "osx" xattr prefix on-disk
	Drivers: hv: vmbus: Don't wait after requesting offers
	Linux 3.18.14

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 91b5f5ea 51af8176
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -3654,6 +3654,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
					READ_CAPACITY_16 command);
				f = NO_REPORT_OPCODES (don't use report opcodes
					command, uas only);
				g = MAX_SECTORS_240 (don't transfer more than
					240 sectors at a time, uas only);
				h = CAPACITY_HEURISTICS (decrease the
					reported device capacity by one
					sector if the number is odd);
+11 −1
Original line number Diff line number Diff line
@@ -2455,7 +2455,8 @@ should be created before this ioctl is invoked.

Possible features:
	- KVM_ARM_VCPU_POWER_OFF: Starts the CPU in a power-off state.
	  Depends on KVM_CAP_ARM_PSCI.
	  Depends on KVM_CAP_ARM_PSCI.  If not set, the CPU will be powered on
	  and execute guest code when KVM_RUN is called.
	- KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode.
	  Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only).
	- KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU.
@@ -2951,6 +2952,15 @@ HVC instruction based PSCI call from the vcpu. The 'type' field describes
the system-level event type. The 'flags' field describes architecture
specific flags for the system-level event.

Valid values for 'type' are:
  KVM_SYSTEM_EVENT_SHUTDOWN -- the guest has requested a shutdown of the
   VM. Userspace is not obliged to honour this, and if it does honour
   this does not need to destroy the VM synchronously (ie it may call
   KVM_RUN again before shutdown finally occurs).
  KVM_SYSTEM_EVENT_RESET -- the guest has requested a reset of the VM.
   As with SHUTDOWN, userspace can choose to ignore the request, or
   to schedule the reset to occur in the future and may call KVM_RUN again.

		/* Fix the size of the union. */
		char padding[256];
	};
+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ Groups:
    Copies all floating interrupts into a buffer provided by userspace.
    When the buffer is too small it returns -ENOMEM, which is the indication
    for userspace to try again with a bigger buffer.
    -ENOBUFS is returned when the allocation of a kernelspace buffer has
    failed.
    -EFAULT is returned when copying data to userspace failed.
    All interrupts remain pending, i.e. are not deleted from the list of
    currently pending interrupts.
    attr->addr contains the userspace address of the buffer into which all
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 13
SUBLEVEL = 14
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@

			uart2: serial@12200 {
				compatible = "ns16550a";
				reg = <0x12000 0x100>;
				reg = <0x12200 0x100>;
				reg-shift = <2>;
				interrupts = <9>;
				clocks = <&core_clk 0>;
@@ -163,7 +163,7 @@

			uart3: serial@12300 {
				compatible = "ns16550a";
				reg = <0x12100 0x100>;
				reg = <0x12300 0x100>;
				reg-shift = <2>;
				interrupts = <10>;
				clocks = <&core_clk 0>;
Loading