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

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

Merge 4.9.303 into android-4.9-q 



Changes in 4.9.303
	Makefile.extrawarn: Move -Wunaligned-access to W=1
	net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup
	serial: parisc: GSC: fix build when IOSAPIC is not set
	parisc: Fix data TLB miss in sba_unmap_sg
	parisc: Fix sglist access in ccio-dma.c
	btrfs: send: in case of IO error log it
	net: ieee802154: at86rf230: Stop leaking skb's
	selftests/zram: Skip max_comp_streams interface on newer kernel
	selftests/zram01.sh: Fix compression ratio calculation
	selftests/zram: Adapt the situation that /dev/zram0 is being used
	ax25: improve the incomplete fix to avoid UAF and NPD bugs
	vfs: make freeze_super abort when sync_filesystem returns error
	quota: make dquot_quota_sync return errors from ->sync_fs
	drm/radeon: Fix backlight control on iMac 12,1
	xfrm: Don't accidentally set RTO_ONLINK in decode_session4()
	taskstats: Cleanup the use of task->exit_code
	vsock: correct removal of socket from the list
	vsock: remove vsock from connected table when connect is interrupted by a signal
	iwlwifi: pcie: fix locking when "HW not ready"
	drop_monitor: fix data-race in dropmon_net_event / trace_napi_poll_hit
	libsubcmd: Fix use-after-free for realloc(..., 0)
	ALSA: hda: Fix regression on forced probe mask option
	ALSA: hda: Fix missing codec probe on Shenker Dock 15
	ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw()
	ASoC: ops: Fix stereo change notifications in snd_soc_put_volsw_range()
	NFS: LOOKUP_DIRECTORY is also ok with symlinks
	EDAC: Fix calculation of returned address and next offset in edac_align_ptr()
	i2c: brcmstb: fix support for DSL and CM variants
	lib/iov_iter: initialize "flags" in new pipe_buffer
	KVM: x86/pmu: Use AMD64_RAW_EVENT_MASK for PERF_TYPE_RAW
	NFS: Do not report writeback errors in nfs_getattr()
	ata: libata-core: Disable TRIM on M88V29
	tracing: Fix tp_printk option related with tp_printk_stop_on_boot
	net: usb: qmi_wwan: Add support for Dell DW5829e
	Linux 4.9.303

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I19131cbf223588e36e1bccd435f93eab152f4199
parents a2caf9af 9279031d

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 302

SUBLEVEL = 303

EXTRAVERSION =

NAME = Roaring Lionus

arch/x86/kvm/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel) 
	}



	if (type == PERF_TYPE_RAW)

		config = eventsel & X86_RAW_EVENT_MASK;

		config = eventsel & AMD64_RAW_EVENT_MASK;



	pmc_reprogram_counter(pmc, type, config,

			      !(eventsel & ARCH_PERFMON_EVENTSEL_USR),

drivers/ata/libata-core.c

+1 −0
Original line number Diff line number Diff line
@@ -4486,6 +4486,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 


	/* devices that don't properly handle TRIM commands */

	{ "SuperSSpeed S238*",		NULL,	ATA_HORKAGE_NOTRIM, },

	{ "M88V29*",			NULL,	ATA_HORKAGE_NOTRIM, },



	/*

	 * As defined, the DRAT (Deterministic Read After Trim) and RZAT

drivers/edac/edac_mc.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems) 
	else

		return (char *)ptr;



	r = (unsigned long)p % align;

	r = (unsigned long)ptr % align;



	if (r == 0)

		return (char *)ptr;

drivers/gpu/drm/radeon/atombios_encoders.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ void radeon_atom_backlight_init(struct radeon_encoder *radeon_encoder, 
	 * so don't register a backlight device

	 */

	if ((rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) &&

	    (rdev->pdev->device == 0x6741))

	    (rdev->pdev->device == 0x6741) &&

	    !dmi_match(DMI_PRODUCT_NAME, "iMac12,1"))

		return;



	if (!radeon_encoder->enc_priv)