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

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

Merge 4.14.66 into android-4.14 



Changes in 4.14.66
	dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()
	l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache
	llc: use refcount_inc_not_zero() for llc_sap_find()
	net_sched: fix NULL pointer dereference when delete tcindex filter
	vsock: split dwork to avoid reinitializations
	net_sched: Fix missing res info when create new tc_index filter
	vhost: reset metadata cache when initializing new IOTLB
	ip6_tunnel: use the right value for ipv4 min mtu check in ip6_tnl_xmit
	net: aquantia: Fix IFF_ALLMULTI flag functionality
	ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs
	ALSA: hda - Turn CX8200 into D3 as well upon reboot
	ALSA: vx222: Fix invalid endian conversions
	ALSA: virmidi: Fix too long output trigger loop
	ALSA: cs5535audio: Fix invalid endian conversion
	ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry
	ALSA: memalloc: Don't exceed over the requested size
	ALSA: vxpocket: Fix invalid endian conversions
	USB: serial: sierra: fix potential deadlock at close
	USB: serial: pl2303: add a new device id for ATEN
	USB: option: add support for DW5821e
	ACPI / PM: save NVS memory for ASUS 1025C laptop
	tty: serial: 8250: Revert NXP SC16C2552 workaround
	serial: 8250_exar: Read INT0 from slave device, too
	serial: 8250_dw: always set baud rate in dw8250_set_termios
	serial: 8250_dw: Add ACPI support for uart on Broadcom SoC
	misc: sram: fix resource leaks in probe error path
	Bluetooth: avoid killing an already killed socket
	isdn: Disable IIOCDBGVAR
	cls_matchall: fix tcf_unbind_filter missing
	Linux 4.14.66

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ba451d32 c5f7d3c4

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 65

SUBLEVEL = 66

EXTRAVERSION =

NAME = Petit Gorille

drivers/acpi/sleep.c

+8 −0
Original line number Diff line number Diff line
@@ -338,6 +338,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"),

		},

	},

	{

	.callback = init_nvs_save_s3,

	.ident = "Asus 1025C",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

		DMI_MATCH(DMI_PRODUCT_NAME, "1025C"),

		},

	},

	/*

	 * https://bugzilla.kernel.org/show_bug.cgi?id=189431

	 * Lenovo G50-45 is a platform later than 2012, but needs nvs memory

drivers/isdn/i4l/isdn_common.c

+1 −7
Original line number Diff line number Diff line
@@ -1640,13 +1640,7 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) 
			} else

				return -EINVAL;

		case IIOCDBGVAR:

			if (arg) {

				if (copy_to_user(argp, &dev, sizeof(ulong)))

					return -EFAULT;

				return 0;

			} else

			return -EINVAL;

			break;

		default:

			if ((cmd & IIOCDRVCTL) == IIOCDRVCTL)

				cmd = ((cmd >> _IOC_NRSHIFT) & _IOC_NRMASK) & ISDN_DRVIOCTL_MASK;

drivers/misc/sram.c

+8 −1
Original line number Diff line number Diff line
@@ -407,13 +407,20 @@ static int sram_probe(struct platform_device *pdev) 
	if (init_func) {

		ret = init_func();

		if (ret)

			return ret;

			goto err_disable_clk;

	}



	dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n",

		gen_pool_size(sram->pool) / 1024, sram->virt_base);



	return 0;



err_disable_clk:

	if (sram->clk)

		clk_disable_unprepare(sram->clk);

	sram_free_partitions(sram);



	return ret;

}



static int sram_remove(struct platform_device *pdev)

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ static int hw_atl_b0_hw_packet_filter_set(struct aq_hw_s *self, 


	rpfl2promiscuous_mode_en_set(self, IS_FILTER_ENABLED(IFF_PROMISC));

	rpfl2multicast_flr_en_set(self,

				  IS_FILTER_ENABLED(IFF_MULTICAST), 0);

				  IS_FILTER_ENABLED(IFF_ALLMULTI), 0);



	rpfl2_accept_all_mc_packets_set(self,

					IS_FILTER_ENABLED(IFF_ALLMULTI));