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

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

Merge 3.18.97 into android-3.18 



Changes in 3.18.97
	netfilter: drop outermost socket lock in getsockopt()
	PCI: keystone: Fix interrupt-controller-node lookup
	scsi: ibmvfc: fix misdefined reserved field in ibmvfc_fcp_rsp_info
	cfg80211: fix cfg80211_beacon_dup
	iio: buffer: check if a buffer has been set up when poll is called
	iio: adis_lib: Initialize trigger before requesting interrupt
	x86/oprofile: Fix bogus GCC-8 warning in nmi_setup()
	irqchip/gic-v3: Use wmb() instead of smb_wmb() in gic_raise_softirq()
	arm64: Disable unhandled signal log messages by default
	usb: dwc3: gadget: Set maxpacket size for ep0 IN
	usb: gadget: f_fs: Process all descriptors during bind
	ASN.1: fix out-of-bounds read when parsing indefinite length item
	Linux 3.18.97

Change-Id: If6429adcd886a6913038ab3e395c138511a0610a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 4bf7ab67 43a69271

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 96

SUBLEVEL = 97

EXTRAVERSION =

NAME = Diseased Newt

arch/arm64/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static const char *handler[]= { 
	"Error"

};



int show_unhandled_signals = 1;

int show_unhandled_signals = 0;



/*

 * Dump out the contents of some memory nicely...

arch/x86/oprofile/nmi_int.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ static int nmi_setup(void) 
		goto fail;



	for_each_possible_cpu(cpu) {

		if (!cpu)

		if (!IS_ENABLED(CONFIG_SMP) || !cpu)

			continue;



		memcpy(per_cpu(cpu_msrs, cpu).counters,

drivers/iio/imu/adis_trigger.c

+4 −3
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev) 
	if (adis->trig == NULL)

		return -ENOMEM;



	adis->trig->dev.parent = &adis->spi->dev;

	adis->trig->ops = &adis_trigger_ops;

	iio_trigger_set_drvdata(adis->trig, adis);



	ret = request_irq(adis->spi->irq,

			  &iio_trigger_generic_data_rdy_poll,

			  IRQF_TRIGGER_RISING,
@@ -55,9 +59,6 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev) 
	if (ret)

		goto error_free_trig;



	adis->trig->dev.parent = &adis->spi->dev;

	adis->trig->ops = &adis_trigger_ops;

	iio_trigger_set_drvdata(adis->trig, adis);

	ret = iio_trigger_register(adis->trig);



	indio_dev->trig = iio_trigger_get(adis->trig);

drivers/iio/industrialio-buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ unsigned int iio_buffer_poll(struct file *filp, 
	struct iio_dev *indio_dev = filp->private_data;

	struct iio_buffer *rb = indio_dev->buffer;



	if (!indio_dev->info)

	if (!indio_dev->info || rb == NULL)

		return 0;



	poll_wait(filp, &rb->pollq, wait);