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

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

Merge 3.18.12 into android-3.18 



Changes in 3.18.12:
	ASoC: da732x: Fix control-less DAPM routes
	ASoC: ak4671: Fix control-less DAPM routes
	ASoC: sn95031: Fix control-less DAPM routes
	ASoC: sgtl5000: remove useless register write clearing CHRGPUMP_POWERUP
	ASoC: pcm1681: Fix wrong value references for boolean kctl
	ASoC: cs4271: Fix wrong value references for boolean kctl
	ASoC: es8238: Fix wrong value references for boolean kctl
	ASoC: wm8960: Fix wrong value references for boolean kctl
	ASoC: tas5086: Fix wrong value references for boolean kctl
	ASoC: wm8731: Fix wrong value references for boolean kctl
	ASoC: wm2000: Fix wrong value references for boolean kctl
	ASoC: wm8903: Fix wrong value references for boolean kctl
	ASoC: wm8904: Fix wrong value references for boolean kctl
	ASoC: ak4641: Fix wrong value references for boolean kctl
	ASoC: adav80x: Fix wrong value references for boolean kctl
	ASoC: wm8955: Fix wrong value references for boolean kctl
	virtio_balloon: set DRIVER_OK before using device
	sched/wait: Provide infrastructure to deal with nested blocking
	virtio-balloon: do not call blocking ops when !TASK_RUNNING
	clockevents: sun5i: Fix setup_irq init sequence
	regmap: regcache-rbtree: Fix present bitmap resize
	regmap: introduce regmap_name to fix syscon regmap trace events
	clocksource: efm32: Fix a NULL pointer dereference
	tcm_fc: missing curly braces in ft_invl_hw_context()
	tcm_qla2xxx: Fix incorrect use of __transport_register_session
	Input: synaptics - split synaptics_resolution(), query first
	Input: synaptics - log queried and quirked dimension values
	Input: synaptics - query min dimensions for fw v8.1
	Input: synaptics - remove obsolete min/max quirk for X240
	Input: synaptics - support min/max board id in min_max_pnpid_table
	Input: synaptics - skip quirks when post-2013 dimensions
	Input: synaptics - fix middle button on Lenovo 2015 products
	Input: synaptics - handle spurious release of trackstick buttons
	Input: synaptics - do not retrieve the board id on old firmwares
	nl80211: ignore HT/VHT capabilities without QoS/WMM
	mac80211: disable u-APSD queues by default
	mac80211: drop unencrypted frames in mesh fwding
	mac80211: count interfaces correctly for combination checks
	uas: Add US_FL_NO_ATA_1X for Initio Corporation controllers / devices
	usb: phy: am335x-control: check return value of bus_find_device
	usb: chipidea: otg: add a_alt_hnp_support response for B device
	usb: common: otg-fsm: only signal connect after switching to peripheral
	phy: Find the right match in devm_phy_destroy()
	rtlwifi: Improve handling of IPv6 packets
	cpuidle: mvebu: Fix the CPU PM notifier usage
	of/irq: Fix of_irq_parse_one() returned error codes
	perf: Fix irq_work 'tail' recursion
	staging: vt6656: vnt_rf_setpower: fix missing rate RATE_12M
	vt6655: RFbSetPower fix missing rate RATE_12M
	dmaengine: dw: append MODULE_ALIAS for platform driver
	dm: hold suspend_lock while suspending device during device deletion
	dm io: deal with wandering queue limits when handling REQ_DISCARD and REQ_WRITE_SAME
	dm thin: fix to consistently zero-fill reads to unprovisioned blocks
	dm snapshot: suspend origin when doing exception handover
	dm snapshot: suspend merging snapshot when doing exception handover
	spi: qup: Fix cs-num DT property parsing
	spi: trigger trace event for message-done before mesg->complete
	hfsplus: fix B-tree corruption after insertion at position 0
	Revert "libceph: use memalloc flags for net IO"
	sb_edac: Fix discovery of top-of-low-memory for Haswell
	sb_edac: Fix typo computing number of banks
	powerpc/book3s: Fix the MCE code to use CONFIG_KVM_BOOK3S_64_HANDLER
	regulator: palmas: Correct TPS659038 register definition for REGEN2
	arm64: Use the reserved TTBR0 if context switching to the init_mm
	powerpc/pseries: Little endian fixes for post mobility device tree update
	powerpc/mpc85xx: Add ranges to etsec2 nodes
	net: ethernet: pcnet32: Setup the SRAM and NOUFLO on Am79C97{3, 5}
	mfd: kempld-core: Fix callback return value check
	Linux 3.18.12

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9d730b57 43f497a2

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 11

SUBLEVEL = 12

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ ethernet@b0000 { 
	fsl,num_tx_queues = <0x8>;

	fsl,magic-packet;

	local-mac-address = [ 00 00 00 00 00 00 ];

	ranges;



	queue-group@b0000 {

		#address-cells = <1>;

arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ ethernet@b1000 { 
	fsl,num_tx_queues = <0x8>;

	fsl,magic-packet;

	local-mac-address = [ 00 00 00 00 00 00 ];

	ranges;



	queue-group@b1000 {

		#address-cells = <1>;

arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ ethernet@b2000 { 
	fsl,num_tx_queues = <0x8>;

	fsl,magic-packet;

	local-mac-address = [ 00 00 00 00 00 00 ];

	ranges;



	queue-group@b2000 {

		#address-cells = <1>;

arch/powerpc/kernel/exceptions-64s.S

+1 −1
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ machine_check_handle_early: 
	bne	9f			/* continue in V mode if we are. */



5:

#ifdef CONFIG_KVM_BOOK3S_64_HV

#ifdef CONFIG_KVM_BOOK3S_64_HANDLER

	/*

	 * We are coming from kernel context. Check if we are coming from

	 * guest. if yes, then we can continue. We will fall through