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

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

Merge 4.9.175 into android-4.9 



Changes in 4.9.175
	scsi: libsas: fix a race condition when smp task timeout
	ubsan: Fix nasty -Wbuiltin-declaration-mismatch GCC-9 warnings
	staging: greybus: power_supply: fix prop-descriptor request size
	ASoC:soc-pcm:fix a codec fixup issue in TDM case
	ASoC: nau8810: fix the issue of widget with prefixed name
	ASoC: cs4270: Set auto-increment bit for register writes
	IB/hfi1: Eliminate opcode tests on mr deref
	ASoC: tlv320aic32x4: Fix Common Pins
	drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
	perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS
	linux/kernel.h: Use parentheses around argument in u64_to_user_ptr()
	scsi: csiostor: fix missing data copy in csio_scsi_err_handler()
	drm/mediatek: fix possible object reference leak
	virtio-blk: limit number of hw queues by nr_cpu_ids
	iommu/amd: Set exclusion range correctly
	mm: add 'try_get_page()' helper function
	ARM: 8680/1: boot/compressed: fix inappropriate Thumb2 mnemonic for __nop
	genirq: Prevent use-after-free and work list corruption
	usb: dwc3: Fix default lpm_nyet_threshold value
	USB: serial: f81232: fix interrupt worker not stop
	usb-storage: Set virt_boundary_mask to avoid SG overflows
	scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines
	Bluetooth: hidp: fix buffer overflow
	Bluetooth: Align minimum encryption key size for LE and BR/EDR connections
	UAS: fix alignment of scatter/gather segments
	ASoC: Intel: avoid Oops if DMA setup fails
	timer/debug: Change /proc/timer_stats from 0644 to 0600
	Linux 4.9.175

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 07e40a31 bb4f008d

Makefile

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

VERSION = 4

PATCHLEVEL = 9

PATCHLEVEL = 9

SUBLEVEL = 174

SUBLEVEL = 175

EXTRAVERSION =

EXTRAVERSION =

NAME = Roaring Lionus

NAME = Roaring Lionus

arch/arm/boot/compressed/efi-header.S

+2 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,8 @@ 
		@ there.

		@ there.

		.inst	'M' | ('Z' << 8) | (0x1310 << 16)   @ tstne r0, #0x4d000

		.inst	'M' | ('Z' << 8) | (0x1310 << 16)   @ tstne r0, #0x4d000

#else

#else

		W(mov)	r0, r0

 AR_CLASS(	mov	r0, r0		)

  M_CLASS(	nop.w			)

#endif

#endif

		.endm

		.endm

arch/x86/events/intel/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2867,7 +2867,7 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		return ret;

		return ret;





	if (event->attr.precise_ip) {

	if (event->attr.precise_ip) {

		if (!event->attr.freq) {

		if (!(event->attr.freq || event->attr.wakeup_events)) {

			event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;

			event->hw.flags |= PERF_X86_EVENT_AUTO_RELOAD;

			if (!(event->attr.sample_type &

			if (!(event->attr.sample_type &

			      ~intel_pmu_free_running_flags(event)))

			      ~intel_pmu_free_running_flags(event)))

drivers/block/virtio_blk.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -392,6 +392,8 @@ static int init_vq(struct virtio_blk *vblk) 
	if (err)

	if (err)

		num_vqs = 1;

		num_vqs = 1;





	num_vqs = min_t(unsigned int, nr_cpu_ids, num_vqs);



	vblk->vqs = kmalloc_array(num_vqs, sizeof(*vblk->vqs), GFP_KERNEL);

	vblk->vqs = kmalloc_array(num_vqs, sizeof(*vblk->vqs), GFP_KERNEL);

	if (!vblk->vqs)

	if (!vblk->vqs)

		return -ENOMEM;

		return -ENOMEM;

drivers/gpu/drm/mediatek/mtk_hdmi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1473,7 +1473,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, 
	if (IS_ERR(regmap))

	if (IS_ERR(regmap))

		ret = PTR_ERR(regmap);

		ret = PTR_ERR(regmap);

	if (ret) {

	if (ret) {

		ret = PTR_ERR(regmap);

		dev_err(dev,

		dev_err(dev,

			"Failed to get system configuration registers: %d\n",

			"Failed to get system configuration registers: %d\n",

			ret);

			ret);
@@ -1529,6 +1528,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, 
	of_node_put(remote);

	of_node_put(remote);





	hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);

	hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np);

	of_node_put(i2c_np);

	if (!hdmi->ddc_adpt) {

	if (!hdmi->ddc_adpt) {

		dev_err(dev, "Failed to get ddc i2c adapter by node\n");

		dev_err(dev, "Failed to get ddc i2c adapter by node\n");

		return -EINVAL;

		return -EINVAL;