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

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

Merge 4.19.260 into android-4.19-stable 



Changes in 4.19.260
	of: fdt: fix off-by-one error in unflatten_dt_nodes()
	gpio: mpc8xxx: Fix support for IRQ_TYPE_LEVEL_LOW flow_type in mpc85xx
	drm/meson: Correct OSD1 global alpha value
	parisc: ccio-dma: Add missing iounmap in error path in ccio_probe()
	nvmet: fix a use-after-free
	mvpp2: no need to check return value of debugfs_create functions
	cifs: don't send down the destination address to sendmsg for a SOCK_STREAM
	ASoC: nau8824: Fix semaphore unbalance at error paths
	regulator: pfuze100: Fix the global-out-of-bounds access in pfuze100_regulator_probe()
	rxrpc: Fix local destruction being repeated
	ALSA: hda/sigmatel: Keep power up while beep is enabled
	net: usb: qmi_wwan: add Quectel RM520N
	MIPS: OCTEON: irq: Fix octeon_irq_force_ciu_mapping()
	mksysmap: Fix the mismatch of 'L0' symbols in System.map
	video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
	ALSA: hda/sigmatel: Fix unused variable warning for beep power change
	usb: dwc3: pci: Add Support for Intel Elkhart Lake Devices
	usb: dwc3: pci: add support for TigerLake Devices
	usb: dwc3: pci: add support for the Intel Tiger Lake PCH -H variant
	usb: dwc3: pci: add support for the Intel Jasper Lake
	usb: dwc3: pci: add support for the Intel Alder Lake-S
	wifi: mac80211: Fix UAF in ieee80211_scan_rx()
	USB: core: Fix RST error in hub.c
	USB: serial: option: add Quectel BG95 0x0203 composition
	USB: serial: option: add Quectel RM520N
	ALSA: hda/tegra: set depop delay for tegra
	ALSA: hda: add Intel 5 Series / 3400 PCI DID
	ALSA: hda/realtek: Enable 4-speaker output Dell Precision 5530 laptop
	efi: libstub: check Shim mode using MokSBStateRT
	mm/slub: fix to return errno if kmalloc() fails
	arm64: dts: rockchip: Set RK3399-Gru PCLK_EDP to 24 MHz
	arm64: dts: rockchip: Remove 'enable-active-low' from rk3399-puma
	netfilter: nf_conntrack_sip: fix ct_sip_walk_headers
	netfilter: nf_conntrack_irc: Tighten matching on DCC message
	iavf: Fix cached head and tail value for iavf_get_tx_pending
	ipvlan: Fix out-of-bound bugs caused by unset skb->mac_header
	net: team: Unsync device addresses on ndo_stop
	MIPS: lantiq: export clk_get_io() for lantiq_wdt.ko
	i40e: Fix VF set max MTU size
	i40e: Fix set max_tx_rate when it is lower than 1 Mbps
	of: mdio: Add of_node_put() when breaking out of for_each_xx
	netfilter: ebtables: fix memory leak when blob is malformed
	can: gs_usb: gs_can_open(): fix race dev->can.state condition
	perf jit: Include program header in ELF files
	perf kcore_copy: Do not check /proc/modules is unchanged
	net: sunhme: Fix packet reception for len < RX_COPY_THRESHOLD
	serial: Create uart_xmit_advance()
	serial: tegra: Use uart_xmit_advance(), fixes icount.tx accounting
	s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup
	Drivers: hv: Never allocate anything besides framebuffer from framebuffer memory region
	drm/amd/display: Limit user regamma to a valid value
	drm/rockchip: Fix return type of cdn_dp_connector_mode_valid
	workqueue: don't skip lockdep work dependency in cancel_work_sync()
	usb: dwc3: pci: Allow Elkhart Lake to utilize DSM method for PM functionality
	ext4: make directory inode spreading reflect flexbg size
	Linux 4.19.260

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: If1ae526556d6ba20a452243e4a6bce84c0831d49
parents e5445835 16d5f34a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 259

SUBLEVEL = 260

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -232,6 +232,14 @@ 
&edp {

	status = "okay";



	/*

	 * eDP PHY/clk don't sync reliably at anything other than 24 MHz. Only

	 * set this here, because rk3399-gru.dtsi ensures we can generate this

	 * off GPLL=600MHz, whereas some other RK3399 boards may not.

	 */

	assigned-clocks = <&cru PCLK_EDP>;

	assigned-clock-rates = <24000000>;



	ports {

		edp_out: port@1 {

			reg = <1>;

arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
	vcc5v0_host: vcc5v0-host-regulator {

		compatible = "regulator-fixed";

		gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;

		enable-active-low;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_host_en>;

		regulator-name = "vcc5v0_host";

arch/mips/cavium-octeon/octeon-irq.c

+10 −0
Original line number Diff line number Diff line
@@ -127,6 +127,16 @@ static void octeon_irq_free_cd(struct irq_domain *d, unsigned int irq) 
static int octeon_irq_force_ciu_mapping(struct irq_domain *domain,

					int irq, int line, int bit)

{

	struct device_node *of_node;

	int ret;



	of_node = irq_domain_get_of_node(domain);

	if (!of_node)

		return -EINVAL;

	ret = irq_alloc_desc_at(irq, of_node_to_nid(of_node));

	if (ret < 0)

		return ret;



	return irq_domain_associate(domain, irq, line << 6 | bit);

}

arch/mips/lantiq/clk.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct clk *clk_get_io(void) 
{

	return &cpu_clk_generic[2];

}

EXPORT_SYMBOL_GPL(clk_get_io);



struct clk *clk_get_ppe(void)

{