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

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

Merge 3.18.5 into android-3.18



Changes in 3.18.5:
	can: dev: fix crtlmode_supported check
	can: m_can: tag current CAN FD controllers as non-ISO
	pinctrl: qcom: Don't iterate past end of function array
	pinctrl: Fix two deadlocks
	mfd: tps65218: Make INT[12] and STATUS registers volatile
	mfd: tps65218: Make INT1 our status_base register
	mfd: rtsx_usb: Fix runtime PM deadlock
	libata: allow sata_sil24 to opt-out of tag ordered submission
	libata: prevent HSM state change race between ISR and PIO
	ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210
	workqueue: fix subtle pool management issue which can stall whole worker_pool
	scripts/recordmcount.pl: There is no -m32 gcc option on Super-H anymore
	drm/i915: Ban Haswell from using RCS flips
	drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES
	drm/radeon: add a dpm quirk list
	drm/radeon: add si dpm quirk list
	drm/radeon: use rv515_ring_start on r5xx
	PCI: Pass bridge device, not bus, when updating bridge windows
	PCI: Add pci_claim_bridge_resource() to clip window if necessary
	PCI: Add pci_bus_clip_resource() to clip to fit upstream window
	x86/PCI: Clip bridge windows to fit in upstream windows
	PCI: Add flag for devices where we can't use bus reset
	PCI: Mark Atheros AR93xx to avoid bus reset
	ipr: wait for aborted command responses
	cx23885: Split Hauppauge WinTV Starburst from HVR4400 card entry
	vb2: fix vb2_thread_stop race conditions
	dm cache: share cache-metadata object across inactive and active DM tables
	dm cache: fix problematic dual use of a single migration count variable
	irqchip: omap-intc: Fix legacy DMA regression
	time: settimeofday: Validate the values of tv from user
	time: adjtimex: Validate the ADJ_FREQUENCY values
	ARM: dts: imx25: Fix PWM "per" clocks
	ARM: mvebu: completely disable hardware I/O coherency
	bus: mvebu-mbus: fix support of MBus window 13
	fix deadlock in cifs_ioctl_clone()
	irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type
	x86, irq: Properly tag virtualization entry in /proc/interrupts
	clocksource: exynos_mct: Fix bitmask regression for exynos4_mct_write
	x86, hyperv: Mark the Hyper-V clocksource as being continuous
	x86/tsc: Change Fast TSC calibration failed from error to info
	x86, boot: Skip relocs when load address unchanged
	KVM: x86: SYSENTER emulation is broken
	KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
	x86, tls, ldt: Stop checking lm in LDT_empty
	x86, tls: Interpret an all-zero struct user_desc as "no segment"
	x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
	sata_dwc_460ex: fix resource leak on error path
	ahci_xgene: Fix the endianess issue in APM X-Gene SoC AHCI SATA controller driver.
	KEYS: close race between key lookup and freeing
	mm: get rid of radix tree gfp mask for pagecache_get_page
	netfilter: nfnetlink: validate nfnetlink header from batch
	netfilter: nf_tables: fix flush ruleset chain dependencies
	netfilter: nfnetlink: relax strict multicast group check from netlink_bind
	netfilter: conntrack: fix race between confirmation and flush
	ipvs: uninitialized data with IP_VS_IPV6
	Revert "swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single"
	iwlwifi: mvm: add a flag to enable match found notification
	ACPI / PM: Do not disable wakeup GPEs that have not been enabled
	crypto: prefix module autoloading with "crypto-"
	crypto: include crypto- module prefix in template
	crypto: add missing crypto module aliases
	Linux 3.18.5

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f9fdfd90 c2d6598e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 4
SUBLEVEL = 5
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+4 −4
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
				#pwm-cells = <2>;
				reg = <0x53fa0000 0x4000>;
				clocks = <&clks 106>, <&clks 36>;
				clocks = <&clks 106>, <&clks 52>;
				clock-names = "ipg", "per";
				interrupts = <36>;
			};
@@ -388,7 +388,7 @@
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
				#pwm-cells = <2>;
				reg = <0x53fa8000 0x4000>;
				clocks = <&clks 107>, <&clks 36>;
				clocks = <&clks 107>, <&clks 52>;
				clock-names = "ipg", "per";
				interrupts = <41>;
			};
@@ -429,7 +429,7 @@
			pwm4: pwm@53fc8000 {
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
				reg = <0x53fc8000 0x4000>;
				clocks = <&clks 108>, <&clks 36>;
				clocks = <&clks 108>, <&clks 52>;
				clock-names = "ipg", "per";
				interrupts = <42>;
			};
@@ -476,7 +476,7 @@
				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
				#pwm-cells = <2>;
				reg = <0x53fe0000 0x4000>;
				clocks = <&clks 105>, <&clks 36>;
				clocks = <&clks 105>, <&clks 52>;
				clock-names = "ipg", "per";
				interrupts = <26>;
			};
+2 −2
Original line number Diff line number Diff line
@@ -93,6 +93,6 @@ module_exit(aes_fini);

MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm (ASM)");
MODULE_LICENSE("GPL");
MODULE_ALIAS("aes");
MODULE_ALIAS("aes-asm");
MODULE_ALIAS_CRYPTO("aes");
MODULE_ALIAS_CRYPTO("aes-asm");
MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");
+1 −1
Original line number Diff line number Diff line
@@ -171,5 +171,5 @@ module_exit(sha1_mod_fini);

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm (ARM)");
MODULE_ALIAS("sha1");
MODULE_ALIAS_CRYPTO("sha1");
MODULE_AUTHOR("David McCullough <ucdevel@gmail.com>");
+1 −1
Original line number Diff line number Diff line
@@ -194,4 +194,4 @@ module_exit(sha1_neon_mod_fini);

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm, NEON accelerated");
MODULE_ALIAS("sha1");
MODULE_ALIAS_CRYPTO("sha1");
Loading