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

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

Merge 3.18.21 into android-3.18 



Changes in 3.18.21:
	MIPS: Malta: Don't reinitialise RTC
	MIPS: Fix sched_getaffinity with MT FPAFF enabled
	MIPS: do_mcheck: Fix kernel code dump with EVA
	MIPS: show_stack: Fix stack trace with EVA
	MIPS: Flush RPS on kernel entry with EVA
	MIPS: Make set_pte() SMP safe.
	fsnotify: fix oops in fsnotify_clear_marks_by_group_flags()
	drm/i915: Replace WARN inside I915_READ64_2x32 with retry loop
	drm/radeon/combios: add some validation of lvds values
	drm/dp-mst: Remove debug WARN_ON
	ipr: Fix locking for unit attention handling
	ipr: Fix incorrect trace indexing
	ipr: Fix invalid array indexing for HRRQ
	xhci: fix off by one error in TRB DMA address boundary check
	drivers/usb: Delete XHCI command timer if necessary
	USB: sierra: add 1199:68AB device ID
	usb: udc: core: add device_del() call to error pathway
	phy: twl4030-usb: make runtime pm more reliable.
	md: use kzalloc() when bitmap is disabled
	sparc64: Fix userspace FPU register corruptions.
	clk: keystone: add support for post divider register for main pll
	ARM: dts: keystone: fix dt bindings to use post div register for mainpll
	ASoC: pcm1681: Fix setting de-emphasis sampling rate selection
	ASoC: dapm: Lock during userspace access
	x86/xen: Probe target addresses in set_aliased_prot() before the hypercall
	xen/gntdev: convert priv->lock to a mutex
	xen/gntdevt: Fix race condition in gntdev_release()
	hwrng: core - correct error check of kthread_run call
	crypto: qat - Fix invalid synchronization between register/unregister sym algs
	crypto: ixp4xx - Remove bogus BUG_ON on scattered dst buffer
	rbd: fix copyup completion race
	ARM: dts: i.MX35: Fix can support.
	ARM: OMAP2+: hwmod: Fix _wait_target_ready() for hwmods without sysc
	ALSA: hda - fix cs4210_spdif_automute()
	ALSA: fireworks/firewire-lib: add support for recent firmware quirk
	hwmon: (dell-smm) Blacklist Dell Studio XPS 8100
	ipc: modify message queue accounting to not take kernel data structures into account
	ocfs2: fix BUG in ocfs2_downconvert_thread_do_work()
	nfsd: Drop BUG_ON and ignore SECLABEL on absent filesystem
	PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition
	md/raid1: extend spinlock to protect raid1_end_read_request against inconsistencies
	usb: gadget: f_uac2: fix calculation of uac2->p_interval
	USB: qcserial/option: make AT URCs work for Sierra Wireless MC7305/MC7355
	USB: qcserial: Add support for Dell Wireless 5809e 4G Modem
	mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict
	mm, vmscan: Do not wait for page writeback for GFP_NOFS allocations
	signalfd: fix information leak in signalfd_copyinfo
	signal: fix information leak in copy_siginfo_to_user
	signal: fix information leak in copy_siginfo_from_user32
	kvm: x86: fix kvm_apic_has_events to check for NULL pointer
	nfsd: refactor nfs4_preprocess_stateid_op
	nfsd: do nfs4_check_fh in nfs4_check_file instead of nfs4_check_olstateid
	ACPI / init: Switch over platform to the ACPI mode later
	freeing unlinked file indefinitely delayed
	s390/sclp: clear upper register halves in _sclp_print_early
	genirq: Prevent resend to interrupts marked IRQ_NESTED_THREAD
	ALSA: usb-audio: Add MIDI support for Steinberg MI2/MI4
	ALSA: usb-audio: add dB range mapping for some devices
	ALSA: hda - Fix MacBook Pro 5,2 quirk
	st: null pointer dereference panic caused by use after kref_put by st_open
	mac80211: clear subdir_stations when removing debugfs
	mmc: sdhci-esdhc: Make 8BIT bus work
	md/raid1: fix test for 'was read error from last working device'.
	tile: use free_bootmem_late() for initrd
	Input: usbtouchscreen - avoid unresponsive TSC-30 touch screen
	blkcg: fix gendisk reference leak in blkg_conf_prep()
	ata: pmp: add quirk for Marvell 4140 SATA PMP
	usb-storage: ignore ZTE MF 823 card reader in mode 0x1225
	xhci: Calculate old endpoints correctly on device reset
	xhci: prevent bus_suspend if SS port resuming in phase 1
	xhci: do not report PLC when link is in internal resume state
	x86/efi: Use all 64 bit of efi_memmap in setup_e820()
	rds: rds_ib_device.refcount overflow
	vhost: actually track log eventfd file
	avr32: handle NULL as a valid clock object
	iscsi-target: Fix use-after-free during TPG session shutdown
	iscsi-target: Fix iser explicit logout TX kthread leak
	ima: add support for new "euid" policy condition
	ima: extend "mask" policy matching support
	iscsi-target: Fix iscsit_start_kthreads failure OOPs
	sg_start_req(): make sure that there's not too many elements in iovec
	md/bitmap: return an error when bitmap superblock is corrupt.
	iio: adc: twl6030-gpadc: Fix modalias
	btrfs: incorrect handling for fiemap_fill_next_extent return
	btrfs: cleanup orphans while looking up default subvolume
	usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop
	usb: renesas_usbhs: Don't disable the pipe if Control write status stage
	cpufreq: pcc: Enable autoload of pcc-cpufreq for ACPI processors
	hpsa: fix a couple pci id table mistakes
	HID: tivo: enable all buttons on the TiVo Slide Pro remote
	[media] si4713: HID blacklist Si4713 USB development board
	HID: do not bind to Microchip Pick16F1454
	Bluetooth: ath3k: Add a new ID 0cf3:e006 to ath3k list
	arm64/mm: Remove hack in mmap randomize layout
	thermal: rcar: fix ENR register value
	iio: light: hid-sensor-als.c: Fix memory leak in probe()
	iio: gyro: hid-sensor-gyro-3d: Fix memory leak in probe()
	iio: accel: hid-sensor-accel-3d: Fix memory leak in probe()
	ALSA: hda - add codec ID for Skylake display audio codec
	ALSA: hda/hdmi - apply Haswell fix-ups to Skylake display codec
	i2c: i801: Add DeviceIDs for SunrisePoint LP
	kexec: allocate the kexec control page with KEXEC_CONTROL_MEMORY_GFP
	intel_idle: support additional Broadwell model
	hpfs: hpfs_error: Remove static buffer, use vsprintf extension %pV instead
	Revert "libata: add ATA_HORKAGE_NOTRIM"
	libata: Whitelist SSDs that are known to properly return zeroes after TRIM
	libata: Update Crucial/Micron blacklist
	libata: Blacklist queued TRIM on Samsung SSD 850 Pro
	libata: Blacklist queued TRIM on all Samsung 800-series
	libata: Do not blacklist Micron M500DC
	libata: Expose TRIM capability in sysfs
	libata: add ATA_HORKAGE_NOTRIM
	libata: force disable trim for SuperSSpeed S238
	libata: Do not blacklist M510DC
	ip_vti/ip6_vti: Do not touch skb->mark on xmit
	xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input
	ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
	Linux 3.18.21

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6e0c5001 fcd9bfdb

Documentation/ABI/testing/ima_policy

+4 −2
Original line number Diff line number Diff line
@@ -20,17 +20,19 @@ Description: 
		action: measure | dont_measure | appraise | dont_appraise | audit

		condition:= base | lsm  [option]

			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]

				 [fowner]]

				[euid=] [fowner=]]

			lsm:	[[subj_user=] [subj_role=] [subj_type=]

				 [obj_user=] [obj_role=] [obj_type=]]

			option:	[[appraise_type=]] [permit_directio]



		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]

				[FIRMWARE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]

			       [[^]MAY_EXEC]

			fsmagic:= hex value

			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)

			uid:= decimal value

			euid:= decimal value

			fowner:=decimal value

		lsm:  	are LSM specific

		option:	appraise_type:= [imasig]

Documentation/ABI/testing/sysfs-ata

+11 −0
Original line number Diff line number Diff line
@@ -90,6 +90,17 @@ gscr 
	130:	SATA_PMP_GSCR_SII_GPIO

	Only valid if the device is a PM.



trim



	Shows the DSM TRIM mode currently used by the device. Valid

	values are:

	unsupported:		Drive does not support DSM TRIM

	unqueued:		Drive supports unqueued DSM TRIM only

	queued:			Drive supports queued DSM TRIM

	forced_unqueued:	Drive's unqueued DSM support is known to be

				buggy and only unqueued TRIM commands

				are sent



spdn_cnt



	Number of time libata decided to lower the speed of link due to errors.

Documentation/devicetree/bindings/clock/keystone-pll.txt

+4 −4
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ Required properties: 
- compatible : shall be "ti,keystone,main-pll-clock" or "ti,keystone,pll-clock"

- clocks : parent clock phandle

- reg - pll control0 and pll multipler registers

- reg-names : control and multiplier. The multiplier is applicable only for

		main pll clock

- reg-names : control, multiplier and post-divider. The multiplier and

		post-divider registers are applicable only for main pll clock

- fixed-postdiv : fixed post divider value. If absent, use clkod register bits

		for postdiv
@@ -25,8 +25,8 @@ Example: 
		#clock-cells = <0>;

		compatible = "ti,keystone,main-pll-clock";

		clocks = <&refclksys>;

		reg = <0x02620350 4>, <0x02310110 4>;

		reg-names = "control", "multiplier";

		reg = <0x02620350 4>, <0x02310110 4>, <0x02310108 4>;

		reg-names = "control", "multiplier", "post-divider";

		fixed-postdiv = <2>;

	};

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ Supported adapters: 
  * Intel Wildcat Point-LP (PCH)

  * Intel BayTrail (SOC)

  * Intel Sunrise Point-H (PCH)

  * Intel Sunrise Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 20

SUBLEVEL = 21

EXTRAVERSION =

NAME = Shuffling Zombie Juror