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

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

Merge 3.18.3 into android-3.18



Changes in 3.18.3:
	drivers/rtc/rtc-sirfsoc.c: move hardware initilization earlier in probe
	rtc: omap: fix clock-source configuration
	rtc: omap: fix missing wakealarm attribute
	drivers/rtc/rtc-isl12057.c: fix masking of register values
	ocfs2: fix journal commit deadlock
	ocfs2: fix the wrong directory passed to ocfs2_lookup_ino_from_name() when link file
	ath9k_hw: fix hardware queue allocation
	ath9k: fix BE/BK queue order
	can: peak_usb: fix cleanup sequence order in case of error during init
	can: peak_usb: fix memset() usage
	swiotlb-xen: pass dev_addr to xen_dma_unmap_page and xen_dma_sync_single_for_cpu
	swiotlb-xen: remove BUG_ON in xen_bus_to_phys
	swiotlb-xen: call xen_dma_sync_single_for_device when appropriate
	swiotlb-xen: pass dev_addr to swiotlb_tbl_unmap_single
	iwlwifi: dvm: fix flush support for old firmware
	iwlwifi: mvm: update values for Smart Fifo
	iwlwifi: add new device IDs for 3165
	ath5k: fix hardware queue index assignment
	ASoC: eukrea-tlv320: Fix of_node_put() call with uninitialized object
	ASoC: sigmadsp: Refuse to load firmware files with a non-supported version
	ASoC: max98090: Fix ill-defined sidetone route
	ASoC: tlv320aic31xx: Fix off by one error in the loop stucture.
	ASoC: pcm512x: Trigger auto-increment of register addresses on i2c
	ASoC: dwc: Ensure FIFOs are flushed to prevent channel swap
	ktest: Fix make_min_config to handle new assign_configs call
	powerpc: Fix bad NULL pointer check in udbg_uart_getc_poll()
	powerpc/book3s: Fix partial invalidation of TLBs in MCE code.
	powerpc/powernv: Switch off MMU before entering nap/sleep/rvwinkle mode
	powerpc/perf/hv-24x7: Use per-cpu page buffer
	powerpc: add little endian flag to syscall_get_arch()
	Bluetooth: ath3k: Add support of MCI 13d3:3408 bt device
	Bluetooth: 6lowpan: fix skb_unshare behaviour
	Bluetooth: Fix LE connection timeout deadlock
	Bluetooth: Fix check for direct advertising
	Bluetooth: Clear LE white list when resetting controller
	Bluetooth: Fix controller configuration with HCI_QUIRK_INVALID_BDADDR
	Bluetooth: Fix accepting connections when not using mgmt
	PCI: Restore detection of read-only BARs
	brcmfmac: Fix ifidx for rx data by msgbuf.
	pstore-ram: Fix hangs by using write-combine mappings
	pstore-ram: Allow optional mapping with pgprot_noncached
	UBI: Fix invalid vfree()
	UBI: Fix double free after do_sync_erase()
	iommu/vt-d: Fix an off-by-one bug in __domain_mapping()
	iommu/vt-d: Fix dmar_domain leak in iommu_attach_device
	blk-mq: use 'nr_cpu_ids' as highest CPU ID count for hwq <-> cpu map
	blk-mq: Fix a use-after-free
	blk-mq: Avoid that __bt_get_word() wraps multiple times
	blk-mq: Fix a race between bt_clear_tag() and bt_get()
	blk-mq: Fix uninitialized kobject at CPU hotplugging
	HID: yet another buggy ELAN touchscreen
	HID: wacom: re-add accidentally dropped Lenovo PID
	HID: wacom: fix freeze on open when autosuspend is on
	HID: i2c-hid: fix race condition reading reports
	HID: i2c-hid: prevent buffer overflow in early IRQ
	HID: roccat: potential out of bounds in pyra_sysfs_write_settings()
	HID: i2c-hid: Do not free buffers in i2c_hid_stop()
	HID: add battery quirk for USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO keyboard
	HID: Add a new id 0x501a for Genius MousePen i608X
	x86: export get_xsave_addr
	KVM: x86: support XSAVES usage in the host
	KVM: x86: em_ret_far overrides cpl
	kvm: x86: mask out XSAVES
	KVM: s390: Fix size of monitor-class number field
	KVM: s390: flush CPU on load control
	KVM: s390: Fix ipte locking
	kvm: x86: drop severity of "generation wraparound" message
	x86_64, vdso: Fix the vdso address randomization algorithm
	x86, vdso: Use asm volatile in __getcpu
	driver core: Fix unbalanced device reference in drivers_probe
	misc: genwqe: check for error from get_user_pages_fast()
	i8k: Add support for Dell Latitude E6440
	i2c: designware: Fix falling time bindings doc
	ALSA: usb-audio: extend KEF X300A FU 10 tweak to Arcam rPAC
	ALSA: hda/realtek - New codec support for ALC298
	ALSA: hda/realtek - New codec support for ALC256
	ALSA: hda/realtek - Add new Dell desktop for ALC3234 headset mode
	ALSA: hda - using uninitialized data
	ALSA: fireworks: fix an endianness bug for transaction length
	ALSA: snd-usb-caiaq: fix stream count check
	ALSA: hda - Fix wrong gpio_dir & gpio_mask hint setups for IDT/STAC codecs
	ALSA: hda - Add new GPU codec ID 0x10de0072 to snd-hda
	md/raid5: fetch_block must fetch all the blocks handle_stripe_dirtying wants.
	USB: cdc-acm: check for valid interfaces
	usb: renesas_usbhs: gadget: fix NULL pointer dereference in ep_disable()
	usb: gadget: at91_udc: move prepare clk into process context
	USB: qcserial: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem
	Add USB_EHCI_EXYNOS to multi_v7_defconfig
	genhd: check for int overflow in disk_expand_part_tbl()
	cdc-acm: memory leak in error case
	drbd: merge_bvec_fn: properly remap bvm->bi_bdev
	drbd: Fix state change in case of connection timeout
	writeback: fix a subtle race condition in I_DIRTY clearing
	tracing/sched: Check preempt_count() for current when reading task->state
	tty: serial: men_z135_uart: Add terminating entry for men_z135_ids
	serial: samsung: wait for transfer completion before clock disable
	xtensa: fix kmap_prot definition
	reiserfs: destroy allocated commit workqueue
	n_tty: Fix read_buf race condition, increment read_head after pushing data
	Drivers: hv: vmbus: Fix a race condition when unregistering a device
	Drivers: hv: util: make struct hv_do_fcopy match Hyper-V host messages
	fs: nfsd: Fix signedness bug in compare_blob
	nfsd4: fix xdr4 inclusion of escaped char
	nfsd4: fix xdr4 count of server in fs_location4
	nfsd: fix fi_delegees leak when fi_had_conflict returns true
	ACPI / video: update the skip case for acpi_video_device_in_dod()
	ceph: do_sync is never initialized
	mtd: tests: abort torturetest on erase errors
	MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
	mtd: nand: omap: Fix NAND enumeration on 3430 LDP
	nilfs2: fix the nilfs_iget() vs. nilfs_new_inode() races
	scripts/kernel-doc: don't eat struct members with __aligned
	sched/deadline: Fix migration of SCHED_DEADLINE tasks
	sched/deadline: Avoid double-accounting in case of missed deadlines
	sched: Add missing rcu protection to wake_up_all_idle_cpus
	ARM: dts: am437x-sk: fix lcd enable pin mux data
	ARM: dts: am437x-sk-evm.dts: fix LCD timings
	ARM: defconfigs: use CONFIG_CPUFREQ_DT
	ARM: dts: DRA7: wdt: Fix compatible property for watchdog node
	ARM: dts: Enable PWM node by default for s3c64xx
	ARM: OMAP4: PM: Only do static dependency configuration in omap4_init_static_deps
	Revert "ARM: 7830/1: delay: don't bother reporting bogomips in /proc/cpuinfo"
	rpc: fix xdr_truncate_encode to handle buffer ending on page boundary
	ACPI / video: Add some Samsung models to disable_native_backlight list
	ACPI / PM: Fix PM initialization for devices that are not present
	Input: alps - v7: ignore new packets
	Input: alps - v7: sometimes a single touch is reported in mt[1]
	Input: alps - v7: fix finger counting for > 2 fingers on clickpads
	arm64: Move cpu_resume into the text section
	arm64: kernel: fix __cpu_suspend mm switch on warm-boot
	arm64/efi: add missing call to early_ioremap_reset()
	crypto: sha-mb - Add avx2_supported check.
	crypto: aesni - fix "by8" variant for 128 bit keys
	Btrfs: don't delay inode ref updates during log replay
	Revert "mac80211: Fix accounting of the tailroom-needed counter"
	perf/x86/intel/uncore: Make sure only uncore events are collected
	perf: Fix events installation during moving group
	perf/x86/uncore/hsw-ep: Handle systems with only two SBOXes
	perf session: Do not fail on processing out of order event
	spi: sh-msiof: Add runtime PM lock in initializing
	drm/nouveau/nouveau: Do not BUG_ON(!spin_is_locked()) on UP
	nouveau: bring back legacy mmap handler
	regulator: s2mps11: Fix dw_mmc failure on Gear 2
	mmc: sdhci: Fix sleep in atomic after inserting SD card
	exit: fix race between wait_consider_task() and wait_task_zombie()
	mm: protect set_page_dirty() from ongoing truncation
	mm, vmscan: prevent kswapd livelock due to pfmemalloc-throttled process being killed
	mm: propagate error from stack expansion even for guard page
	mm: Don't count the stack guard page towards RLIMIT_STACK
	Linux 3.18.3

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fdd54487 219b188d
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ Optional properties :
 - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.
   This option is only supported in hardware blocks version 1.11a or newer.

 - i2c-scl-falling-time : should contain the SCL falling time in nanoseconds.
 - i2c-scl-falling-time-ns : should contain the SCL falling time in nanoseconds.
   This value which is by default 300ns is used to compute the tLOW period.

 - i2c-sda-falling-time : should contain the SDA falling time in nanoseconds.
 - i2c-sda-falling-time-ns : should contain the SDA falling time in nanoseconds.
   This value which is by default 300ns is used to compute the tHIGH period.

Example :
+1 −1
Original line number Diff line number Diff line
VERSION = 3
PATCHLEVEL = 18
SUBLEVEL = 2
SUBLEVEL = 3
EXTRAVERSION =
NAME = Shuffling Zombie Juror

+7 −8
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@
	};

	lcd0: display {
		compatible = "osddisplays,osd057T0559-34ts", "panel-dpi";
		compatible = "newhaven,nhd-4.3-480272ef-atxl", "panel-dpi";
		label = "lcd";

		pinctrl-names = "default";
@@ -112,11 +112,11 @@
			clock-frequency = <9000000>;
			hactive = <480>;
			vactive = <272>;
			hfront-porch = <8>;
			hback-porch = <43>;
			hsync-len = <4>;
			vback-porch = <12>;
			vfront-porch = <4>;
			hfront-porch = <2>;
			hback-porch = <2>;
			hsync-len = <41>;
			vfront-porch = <2>;
			vback-porch = <2>;
			vsync-len = <10>;
			hsync-active = <0>;
			vsync-active = <0>;
@@ -320,8 +320,7 @@

	lcd_pins: lcd_pins {
		pinctrl-single,pins = <
			/* GPIO 5_8 to select LCD / HDMI */
			0x238 (PIN_OUTPUT_PULLUP | MUX_MODE7)
			0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpcm_ad7.gpio1_7 */
		>;
	};
};
+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@
		};

		wdt2: wdt@4ae14000 {
			compatible = "ti,omap4-wdt";
			compatible = "ti,omap3-wdt";
			reg = <0x4ae14000 0x80>;
			interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
			ti,hwmods = "wd_timer2";
+0 −4
Original line number Diff line number Diff line
@@ -198,10 +198,6 @@
	status = "okay";
};

&pwm {
	status = "okay";
};

&pinctrl0 {
	gpio_leds: gpio-leds {
		samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7";
Loading