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

Commit 595ad747 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Treehugger Robot
Browse files

Merge 4.19.308 into android-4.19-stable 



Changes in 4.19.308
	net/sched: Retire CBQ qdisc
	net/sched: Retire ATM qdisc
	net/sched: Retire dsmark qdisc
	stmmac: no need to check return value of debugfs_create functions
	net: stmmac: fix notifier registration
	memcg: add refcnt for pcpu stock to avoid UAF problem in drain_all_stock()
	nilfs2: replace WARN_ONs for invalid DAT metadata block requests
	userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb
	sched/rt: Fix sysctl_sched_rr_timeslice intial value
	sched/rt: sysctl_sched_rr_timeslice show default timeslice after reset
	sched/rt: Disallow writing invalid values to sched_rt_period_us
	scsi: target: core: Add TMF to tmr_list handling
	dmaengine: shdma: increase size of 'dev_id'
	wifi: cfg80211: fix missing interfaces when dumping
	wifi: mac80211: fix race condition on enabling fast-xmit
	fbdev: savage: Error out if pixclock equals zero
	fbdev: sis: Error out if pixclock equals zero
	ahci: asm1166: correct count of reported ports
	ext4: avoid allocating blocks from corrupted group in ext4_mb_try_best_found()
	ext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal()
	regulator: pwm-regulator: Add validity checks in continuous .get_voltage
	hwmon: (coretemp) Enlarge per package core count limit
	firewire: core: send bus reset promptly on gap count error
	virtio-blk: Ensure no requests in virtqueues before deleting vqs.
	s390/qeth: Fix potential loss of L3-IP@ in case of network issues
	pmdomain: renesas: r8a77980-sysc: CR7 must be always on
	IB/hfi1: Fix sdma.h tx->num_descs off-by-one error
	mm: memcontrol: switch to rcu protection in drain_all_stock()
	dm-crypt: don't modify the data when using authenticated encryption
	gtp: fix use-after-free and null-ptr-deref in gtp_genl_dump_pdp()
	l2tp: pass correct message length to ip6_append_data
	ARM: ep93xx: Add terminator to gpiod_lookup_table
	usb: gadget: ncm: Avoid dropping datagrams of properly parsed NTBs
	usb: roles: don't get/set_role() when usb_role_switch is unregistered
	IB/hfi1: Fix a memleak in init_credit_return
	RDMA/bnxt_re: Return error for SRQ resize
	RDMA/srpt: Support specifying the srpt_service_guid parameter
	RDMA/ulp: Use dev_name instead of ibdev->name
	RDMA/srpt: Make debug output more detailed
	RDMA/srpt: fix function pointer cast warnings
	scripts/bpf: teach bpf_helpers_doc.py to dump BPF helper definitions
	bpf, scripts: Correct GPL license name
	scsi: jazz_esp: Only build if SCSI core is builtin
	nouveau: fix function cast warnings
	ipv6: sr: fix possible use-after-free and null-ptr-deref
	packet: move from strlcpy with unused retval to strscpy
	s390: use the correct count for __iowrite64_copy()
	PCI/MSI: Prevent MSI hardware interrupt number truncation
	KVM: arm64: vgic-its: Test for valid IRQ in its_sync_lpi_pending_table()
	KVM: arm64: vgic-its: Test for valid IRQ in MOVALL handler
	fs/aio: Restrict kiocb_set_cancel_fn() to I/O submitted via libaio
	scripts/bpf: Fix xdp_md forward declaration typo
	Linux 4.19.308

Change-Id: I5d0daaa03dbc35f1460154d9b04fc4c625205974
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 45df1db3 18ba8236

Makefile

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

# SPDX-License-Identifier: GPL-2.0

VERSION = 4

VERSION = 4

PATCHLEVEL = 19

PATCHLEVEL = 19

SUBLEVEL = 307

SUBLEVEL = 308

EXTRAVERSION =

EXTRAVERSION =

NAME = "People's Front"

NAME = "People's Front"

arch/arm/mach-ep93xx/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -330,6 +330,7 @@ static struct gpiod_lookup_table ep93xx_i2c_gpiod_table = { 
				GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

				GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

		GPIO_LOOKUP_IDX("G", 0, NULL, 1,

		GPIO_LOOKUP_IDX("G", 0, NULL, 1,

				GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

				GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

		{ }

	},

	},

};

};

arch/s390/pci/pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -273,7 +273,7 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, 
/* combine single writes by using store-block insn */

/* combine single writes by using store-block insn */

void __iowrite64_copy(void __iomem *to, const void *from, size_t count)

void __iowrite64_copy(void __iomem *to, const void *from, size_t count)

{

{

       zpci_memcpy_toio(to, from, count);

	zpci_memcpy_toio(to, from, count * 8);

}

}





/* Create a virtual mapping cookie for a PCI BAR */

/* Create a virtual mapping cookie for a PCI BAR */

drivers/ata/ahci.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -634,6 +634,11 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets"); 
static void ahci_pci_save_initial_config(struct pci_dev *pdev,

static void ahci_pci_save_initial_config(struct pci_dev *pdev,

					 struct ahci_host_priv *hpriv)

					 struct ahci_host_priv *hpriv)

{

{

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == 0x1166) {

		dev_info(&pdev->dev, "ASM1166 has only six ports\n");

		hpriv->saved_port_map = 0x3f;

	}



	if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361) {

	if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361) {

		dev_info(&pdev->dev, "JMB361 has only one port\n");

		dev_info(&pdev->dev, "JMB361 has only one port\n");

		hpriv->force_port_map = 1;

		hpriv->force_port_map = 1;

drivers/block/virtio_blk.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -933,14 +933,15 @@ static int virtblk_freeze(struct virtio_device *vdev) 
{

{

	struct virtio_blk *vblk = vdev->priv;

	struct virtio_blk *vblk = vdev->priv;





	/* Ensure no requests in virtqueues before deleting vqs. */

	blk_mq_freeze_queue(vblk->disk->queue);



	/* Ensure we don't receive any more interrupts */

	/* Ensure we don't receive any more interrupts */

	vdev->config->reset(vdev);

	vdev->config->reset(vdev);





	/* Make sure no work handler is accessing the device. */

	/* Make sure no work handler is accessing the device. */

	flush_work(&vblk->config_work);

	flush_work(&vblk->config_work);





	blk_mq_quiesce_queue(vblk->disk->queue);



	vdev->config->del_vqs(vdev);

	vdev->config->del_vqs(vdev);

	kfree(vblk->vqs);

	kfree(vblk->vqs);
@@ -958,7 +959,7 @@ static int virtblk_restore(struct virtio_device *vdev) 




	virtio_device_ready(vdev);

	virtio_device_ready(vdev);





	blk_mq_unquiesce_queue(vblk->disk->queue);

	blk_mq_unfreeze_queue(vblk->disk->queue);

	return 0;

	return 0;

}

}

#endif

#endif