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

Commit efc9710f authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Merge android-4.14-p.88 (761e5718) into msm-4.14 



* refs/heads/tmp-761e5718:
  Linux 4.14.88
  mac80211: ignore NullFunc frames in the duplicate detection
  mac80211: fix reordering of buffered broadcast packets
  mac80211: ignore tx status for PS stations in ieee80211_tx_status_ext
  mac80211: Clear beacon_int in ieee80211_do_stop
  mac80211_hwsim: Timer should be initialized before device registered
  libnvdimm, pfn: Pad pfn namespaces relative to other regions
  kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var()
  tty: do not set TTY_IO_ERROR flag if console port
  tty: serial: 8250_mtk: always resume the device in probe.
  Drivers: hv: vmbus: Offload the handling of channels to two workqueues
  drm/amdgpu/gmc8: update MC firmware for polaris
  drm/amdgpu: update mc firmware image for polaris12 variants
  Revert commit ef9209b6 "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c"
  staging: rtl8712: Fix possible buffer overrun
  cifs: Fix separator when building path from dentry
  staging: atomisp: remove "fun" strncpy warning
  Staging: lustre: remove two build warnings
  swiotlb: clean up reporting
  f2fs: fix to do sanity check with block address in main area v2
  xhci: Prevent U1/U2 link pm states if exit latency is too long
  xhci: workaround CSS timeout on AMD SNPS 3.0 xHC
  ARM: 8806/1: kprobes: Fix false positive with FORTIFY_SOURCE
  dmaengine: cppi41: delete channel from pending list when stop channel
  dmaengine: dw: Fix FIFO size for Intel Merrifield
  SUNRPC: Fix leak of krb5p encode pages
  vhost/vsock: fix use-after-free in network stack callers
  virtio/s390: fix race in ccw_io_helper()
  virtio/s390: avoid race on vcdev->config
  ALSA: hda/realtek - Fix speaker output regression on Thinkpad T570
  ALSA: pcm: Fix interval evaluation with openmin/max
  ALSA: pcm: Call snd_pcm_unlink() conditionally at closing
  ALSA: pcm: Fix starvation on down_write_nonblock()
  ALSA: hda: Add support for AMD Stoney Ridge
  ALSA: usb-audio: Fix UAF decrement if card has no live interfaces in card.c
  USB: check usb_get_extra_descriptor for proper size
  usb: appledisplay: Add 27" Apple Cinema Display
  usb: quirk: add no-LPM quirk on SanDisk Ultra Flair device
  mm: don't warn about allocations which stall for too long
  net: amd: add missing of_node_put()
  team: no need to do team_notify_peers or team_mcast_rejoin when disabling port
  ibmvnic: Fix RX queue buffer cleanup
  flexfiles: use per-mirror specified stateid for IO
  iommu/vt-d: Use memunmap to free memremap
  net: faraday: ftmac100: remove netif_running(netdev) check before disabling interrupts
  qed: Fix QM getters to always return a valid pq
  qed: Fix bitmap_weight() check
  mtd: spi-nor: Fix Cadence QSPI page fault kernel panic
  HID: multitouch: Add pointstick support for Cirque Touchpad
  mtd: rawnand: qcom: Namespace prefix some commands
  gpio: mockup: fix indicated direction
  net/mlx4: Fix UBSAN warning of signed integer overflow
  net/mlx4_core: Fix uninitialized variable compilation warning
  net/mlx4_core: Zero out lkey field in SW2HW_MPT fw command
  Revert "usb: gadget: ffs: Fix BUG when userland exits with submitted AIO transfers"
  qed: Fix reading wrong value in loop condition
  qed: Fix PTT leak in qed_drain()
  bnx2x: Assign unique DMAE channel number for FW DMAE transactions.
  amd/iommu: Fix Guest Virtual APIC Log Tail Address Register
  batman-adv: Expand merged fragment buffer for full packet
  batman-adv: Use explicit tvlv padding for ELP packets
  HID: input: Ignore battery reported by Symbol DS4308
  test_firmware: fix error return getting clobbered
  can: rcar_can: Fix erroneous registration
  iommu/ipmmu-vmsa: Fix crash on early domain free
  brcmutil: really fix decoding channel info for 160 MHz bandwidth
  iommu/vt-d: Fix NULL pointer dereference in prq_event_thread()
  media: omap3isp: Unregister media device as first
  ANDROID: revert all remaining hisi_thermal.c changes

Conflicts:
	drivers/usb/gadget/function/f_fs.c
	drivers/usb/host/xhci.c
	sound/usb/card.c

Change-Id: I3ed3c6b3d303f0b8cd0b9dfe4afe7a25dee668c9
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parents 09123017 761e5718

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 87

SUBLEVEL = 88

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/probes/kprobes/opt-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or 
	}



	/* Copy arch-dep-instance from template. */

	memcpy(code, &optprobe_template_entry,

	memcpy(code, (unsigned char *)optprobe_template_entry,

			TMPL_END_IDX * sizeof(kprobe_opcode_t));



	/* Adjust buffer according to instruction. */

drivers/dma/cppi41.c

+15 −1
Original line number Diff line number Diff line
@@ -723,8 +723,22 @@ static int cppi41_stop_chan(struct dma_chan *chan) 


	desc_phys = lower_32_bits(c->desc_phys);

	desc_num = (desc_phys - cdd->descs_phys) / sizeof(struct cppi41_desc);

	if (!cdd->chan_busy[desc_num])

	if (!cdd->chan_busy[desc_num]) {

		struct cppi41_channel *cc, *_ct;



		/*

		 * channels might still be in the pendling list if

		 * cppi41_dma_issue_pending() is called after

		 * cppi41_runtime_suspend() is called

		 */

		list_for_each_entry_safe(cc, _ct, &cdd->pending, node) {

			if (cc != c)

				continue;

			list_del(&cc->node);

			break;

		}

		return 0;

	}



	ret = cppi41_tear_down_chan(c);

	if (ret)

drivers/dma/dw/core.c

+3 −3
Original line number Diff line number Diff line
@@ -1064,12 +1064,12 @@ static void dwc_issue_pending(struct dma_chan *chan) 
/*

 * Program FIFO size of channels.

 *

 * By default full FIFO (1024 bytes) is assigned to channel 0. Here we

 * By default full FIFO (512 bytes) is assigned to channel 0. Here we

 * slice FIFO on equal parts between channels.

 */

static void idma32_fifo_partition(struct dw_dma *dw)

{

	u64 value = IDMA32C_FP_PSIZE_CH0(128) | IDMA32C_FP_PSIZE_CH1(128) |

	u64 value = IDMA32C_FP_PSIZE_CH0(64) | IDMA32C_FP_PSIZE_CH1(64) |

		    IDMA32C_FP_UPDATE;

	u64 fifo_partition = 0;
@@ -1082,7 +1082,7 @@ static void idma32_fifo_partition(struct dw_dma *dw) 
	/* Fill FIFO_PARTITION high bits (Channels 2..3, 6..7) */

	fifo_partition |= value << 32;



	/* Program FIFO Partition registers - 128 bytes for each channel */

	/* Program FIFO Partition registers - 64 bytes per channel */

	idma32_writeq(dw, FIFO_PARTITION1, fifo_partition);

	idma32_writeq(dw, FIFO_PARTITION0, fifo_partition);

}

drivers/gpio/gpio-mockup.c

+3 −3
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ 
#define GPIO_MOCKUP_MAX_RANGES	(GPIO_MOCKUP_MAX_GC * 2)



enum {

	GPIO_MOCKUP_DIR_OUT = 0,

	GPIO_MOCKUP_DIR_IN = 1,

	GPIO_MOCKUP_DIR_IN = 0,

	GPIO_MOCKUP_DIR_OUT = 1,

};



/*
@@ -112,7 +112,7 @@ static int gpio_mockup_get_direction(struct gpio_chip *gc, unsigned int offset) 
{

	struct gpio_mockup_chip *chip = gpiochip_get_data(gc);



	return chip->lines[offset].dir;

	return !chip->lines[offset].dir;

}



static int gpio_mockup_name_lines(struct device *dev,