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

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

Merge 3.18.109 into android-3.18 



Changes in 3.18.109
	percpu: include linux/sched.h for cond_resched()
	perf/core: Fix the perf_cpu_time_max_percent check
	perf session: Fix undeclared 'oe'
	ALSA: pcm: Check PCM state at xfern compat ioctl
	ALSA: seq: Fix races at MIDI encoding in snd_virmidi_output_trigger()
	ALSA: aloop: Mark paused device as inactive
	ALSA: aloop: Add missing cable lock to ctl API callbacks
	RDMA/mlx5: Protect from shift operand overflow
	NET: usb: qmi_wwan: add support for ublox R410M PID 0x90b2
	USB: serial: visor: handle potential invalid device configuration
	usb: musb: host: fix potential NULL pointer dereference
	netlink: fix uninit-value in netlink_sendmsg
	net: fix rtnh_ok()
	net: initialize skb->peeked when cloning
	net: fix uninit-value in __hw_addr_add_ex()
	soreuseport: initialise timewait reuseport field
	perf: Remove superfluous allocation error check
	tcp: fix TCP_REPAIR_QUEUE bound checking
	rfkill: gpio: fix memory leak in probe error path
	libata: Apply NOLPM quirk for SanDisk SD7UB3Q*G1001 SSDs
	tracing: Fix regex_match_front() to not over compare the test string
	can: kvaser_usb: Increase correct stats counter in kvaser_usb_rx_can_msg()
	tracing/uprobe_event: Fix strncpy corner case
	Linux 3.18.109

Change-Id: I469f2ac5e437fa22afc13a95fe4605cde77054f9
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0ebe34f7 7eac0d47

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 108

SUBLEVEL = 109

EXTRAVERSION =

NAME = Diseased Newt

drivers/ata/libata-core.c

+3 −0
Original line number Diff line number Diff line
@@ -4244,6 +4244,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NOLPM, },



	/* Sandisk devices which are known to not handle LPM well */

	{ "SanDisk SD7UB3Q*G1001",	NULL,	ATA_HORKAGE_NOLPM, },



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

	{ "Micron_M500_*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

drivers/infiniband/hw/mlx5/qp.c

+4 −0
Original line number Diff line number Diff line
@@ -174,7 +174,11 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap, 
	} else {

		if (ucmd) {

			qp->rq.wqe_cnt = ucmd->rq_wqe_count;

			if (ucmd->rq_wqe_shift > BITS_PER_BYTE * sizeof(ucmd->rq_wqe_shift))

				return -EINVAL;

			qp->rq.wqe_shift = ucmd->rq_wqe_shift;

			if ((1 << qp->rq.wqe_shift) / sizeof(struct mlx5_wqe_data_seg) < qp->wq_sig)

				return -EINVAL;

			qp->rq.max_gs = (1 << qp->rq.wqe_shift) / sizeof(struct mlx5_wqe_data_seg) - qp->wq_sig;

			qp->rq.max_post = qp->rq.wqe_cnt;

		} else {

drivers/net/can/usb/kvaser_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static void kvaser_usb_rx_can_msg(const struct kvaser_usb *dev, 


	skb = alloc_can_skb(priv->netdev, &cf);

	if (!skb) {

		stats->tx_dropped++;

		stats->rx_dropped++;

		return;

	}

drivers/net/usb/qmi_wwan.c

+1 −0
Original line number Diff line number Diff line
@@ -673,6 +673,7 @@ static const struct usb_device_id products[] = { 
	{QMI_FIXED_INTF(0x05c6, 0x9080, 8)},

	{QMI_FIXED_INTF(0x05c6, 0x9083, 3)},

	{QMI_FIXED_INTF(0x05c6, 0x9084, 4)},

	{QMI_FIXED_INTF(0x05c6, 0x90b2, 3)},    /* ublox R410M */

	{QMI_FIXED_INTF(0x05c6, 0x920d, 0)},

	{QMI_FIXED_INTF(0x05c6, 0x920d, 5)},

	{QMI_FIXED_INTF(0x0846, 0x68a2, 8)},