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

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

Merge 4.9.304 into android-4.9-q 



Changes in 4.9.304
	mtd: rawnand: brcmnand: Fixed incorrect sub-page ECC status
	vhost/vsock: don't check owner in vhost_vsock_stop() while releasing
	parisc/unaligned: Fix fldd and fstd unaligned handlers on 32-bit kernel
	parisc/unaligned: Fix ldw() and stw() unalignment handlers
	sr9700: sanity check for packet length
	USB: zaurus: support another broken Zaurus
	serial: 8250: fix error handling in of_platform_serial_probe()
	serial: 8250: of: Fix mapped region size when using reg-offset property
	net: __pskb_pull_tail() & pskb_carve_frag_list() drop_monitor friends
	gso: do not skip outer ip header in case of ipip and net_failover
	openvswitch: Fix setting ipv6 fields causing hw csum failure
	drm/edid: Always set RGB444
	net/mlx5e: Fix wrong return value on ioctl EEPROM query failure
	configfs: fix a race in configfs_{,un}register_subsystem()
	RDMA/ib_srp: Fix a deadlock
	iio: adc: men_z188_adc: Fix a resource leak in an error handling path
	ata: pata_hpt37x: disable primary channel on HPT371
	Revert "USB: serial: ch341: add new Product ID for CH341A"
	usb: gadget: rndis: add spinlock for rndis response list
	USB: gadget: validate endpoint index for xilinx udc
	tracefs: Set the group ownership in apply_options() not parse_options()
	USB: serial: option: add support for DW5829e
	USB: serial: option: add Telit LE910R1 compositions
	usb: dwc3: gadget: Let the interrupt handler disable bottom halves.
	xhci: Prevent futile URB re-submissions due to incorrect return value.
	tty: n_gsm: fix encoding of control signal octet bit DV
	tty: n_gsm: fix proper link termination after failed open
	memblock: use kfree() to release kmalloced memblock regions
	fget: clarify and improve __fget_files() implementation
	Linux 4.9.304

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I2e6047b09e3b477b03005b985987d4bc9fe2d44a
parents 59a9798e 443d6630

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 303

SUBLEVEL = 304

EXTRAVERSION =

NAME = Roaring Lionus

arch/parisc/kernel/unaligned.c

+7 −7
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int emulate_stw(struct pt_regs *regs, int frreg, int flop) 
	: "r" (val), "r" (regs->ior), "r" (regs->isr)

	: "r19", "r20", "r21", "r22", "r1", FIXUP_BRANCH_CLOBBER );



	return 0;

	return ret;

}

static int emulate_std(struct pt_regs *regs, int frreg, int flop)

{
@@ -410,7 +410,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) 
	__asm__ __volatile__ (

"	mtsp	%4, %%sr1\n"

"	zdep	%2, 29, 2, %%r19\n"

"	dep	%%r0, 31, 2, %2\n"

"	dep	%%r0, 31, 2, %3\n"

"	mtsar	%%r19\n"

"	zvdepi	-2, 32, %%r19\n"

"1:	ldw	0(%%sr1,%3),%%r20\n"
@@ -422,7 +422,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) 
"	andcm	%%r21, %%r19, %%r21\n"

"	or	%1, %%r20, %1\n"

"	or	%2, %%r21, %2\n"

"3:	stw	%1,0(%%sr1,%1)\n"

"3:	stw	%1,0(%%sr1,%3)\n"

"4:	stw	%%r1,4(%%sr1,%3)\n"

"5:	stw	%2,8(%%sr1,%3)\n"

"	copy	%%r0, %0\n"
@@ -610,7 +610,6 @@ void handle_unaligned(struct pt_regs *regs) 
		ret = ERR_NOTHANDLED;	/* "undefined", but lets kill them. */

		break;

	}

#ifdef CONFIG_PA20

	switch (regs->iir & OPCODE2_MASK)

	{

	case OPCODE_FLDD_L:
@@ -621,22 +620,23 @@ void handle_unaligned(struct pt_regs *regs) 
		flop=1;

		ret = emulate_std(regs, R2(regs->iir),1);

		break;

#ifdef CONFIG_PA20

	case OPCODE_LDD_L:

		ret = emulate_ldd(regs, R2(regs->iir),0);

		break;

	case OPCODE_STD_L:

		ret = emulate_std(regs, R2(regs->iir),0);

		break;

	}

#endif

	}

	switch (regs->iir & OPCODE3_MASK)

	{

	case OPCODE_FLDW_L:

		flop=1;

		ret = emulate_ldw(regs, R2(regs->iir),0);

		ret = emulate_ldw(regs, R2(regs->iir), 1);

		break;

	case OPCODE_LDW_M:

		ret = emulate_ldw(regs, R2(regs->iir),1);

		ret = emulate_ldw(regs, R2(regs->iir), 0);

		break;



	case OPCODE_FSTW_L:

drivers/ata/pata_hpt37x.c

+14 −0
Original line number Diff line number Diff line
@@ -919,6 +919,20 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	irqmask &= ~0x10;

	pci_write_config_byte(dev, 0x5a, irqmask);



	/*

	 * HPT371 chips physically have only one channel, the secondary one,

	 * but the primary channel registers do exist!  Go figure...

	 * So,  we manually disable the non-existing channel here

	 * (if the BIOS hasn't done this already).

	 */

	if (dev->device == PCI_DEVICE_ID_TTI_HPT371) {

		u8 mcr1;



		pci_read_config_byte(dev, 0x50, &mcr1);

		mcr1 &= ~0x04;

		pci_write_config_byte(dev, 0x50, mcr1);

	}



	/*

	 * default to pci clock. make sure MA15/16 are set to output

	 * to prevent drives having problems with 40-pin cables. Needed

drivers/gpu/drm/drm_edid.c

+1 −1
Original line number Diff line number Diff line
@@ -3886,6 +3886,7 @@ static void drm_add_display_info(struct drm_connector *connector, 
	if (!(edid->input & DRM_EDID_INPUT_DIGITAL))

		return;



	info->color_formats |= DRM_COLOR_FORMAT_RGB444;

	drm_parse_cea_ext(connector, edid);



	/*
@@ -3934,7 +3935,6 @@ static void drm_add_display_info(struct drm_connector *connector, 
	DRM_DEBUG("%s: Assigning EDID-1.4 digital sink color depth as %d bpc.\n",

			  connector->name, info->bpc);



	info->color_formats |= DRM_COLOR_FORMAT_RGB444;

	if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB444)

		info->color_formats |= DRM_COLOR_FORMAT_YCRCB444;

	if (edid->features & DRM_EDID_FEATURE_RGB_YCRCB422)

drivers/iio/adc/men_z188_adc.c

+8 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static int men_z188_probe(struct mcb_device *dev, 
	struct z188_adc *adc;

	struct iio_dev *indio_dev;

	struct resource *mem;

	int ret;



	indio_dev = devm_iio_device_alloc(&dev->dev, sizeof(struct z188_adc));

	if (!indio_dev)
@@ -133,8 +134,14 @@ static int men_z188_probe(struct mcb_device *dev, 
	adc->mem = mem;

	mcb_set_drvdata(dev, indio_dev);



	return iio_device_register(indio_dev);

	ret = iio_device_register(indio_dev);

	if (ret)

		goto err_unmap;



	return 0;



err_unmap:

	iounmap(adc->base);

err:

	mcb_release_mem(mem);

	return -ENXIO;