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

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

Merge 4.19.246 into android-4.19-stable 



Changes in 4.19.246
	x86/pci/xen: Disable PCI/MSI[-X] masking for XEN_HVM guests
	staging: rtl8723bs: prevent ->Ssid overflow in rtw_wx_set_scan()
	tcp: change source port randomizarion at connect() time
	secure_seq: use the 64 bits of the siphash for port offset calculation
	ACPI: sysfs: Make sparse happy about address space in use
	ACPI: sysfs: Fix BERT error region memory mapping
	net: af_key: check encryption module availability consistency
	net: ftgmac100: Disable hardware checksum on AST2600
	i2c: ismt: Provide a DMA buffer for Interrupt Cause Logging
	drivers: i2c: thunderx: Allow driver to work with ACPI defined TWSI controllers
	assoc_array: Fix BUG_ON during garbage collect
	cfg80211: set custom regdomain after wiphy registration
	libtraceevent: Fix build with binutils 2.35
	perf bench: Share some global variables to fix build with gcc 10
	perf tests bp_account: Make global variable static
	drm/i915: Fix -Wstringop-overflow warning in call to intel_read_wm_latency()
	block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
	exec: Force single empty string when argv is empty
	netfilter: conntrack: re-fetch conntrack after insertion
	zsmalloc: fix races between asynchronous zspage free and page migration
	dm integrity: fix error code in dm_integrity_ctr()
	dm crypt: make printing of the key constant-time
	dm stats: add cond_resched when looping over entries
	dm verity: set DM_TARGET_IMMUTABLE feature flag
	HID: multitouch: Add support for Google Whiskers Touchpad
	tpm: Fix buffer access in tpm2_get_tpm_pt()
	tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()
	docs: submitting-patches: Fix crossref to 'The canonical patch format'
	NFSD: Fix possible sleep during nfsd4_release_lockowner()
	bpf: Enlarge offset check value to INT_MAX in bpf_skb_{load,store}_bytes
	Linux 4.19.246

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibb2e43911c3fcd82ee8158ebfe7bc369e12aa872
parents f785d3e9 fb313cec

Documentation/process/submitting-patches.rst

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ as you intend it to. 


The maintainer will thank you if you write your patch description in a

form which can be easily pulled into Linux's source code management

system, ``git``, as a "commit log".  See :ref:`explicit_in_reply_to`.

system, ``git``, as a "commit log".  See :ref:`the_canonical_patch_format`.



Solve only one problem per patch.  If your description starts to get

long, that's a sign that you probably need to split up your patch.

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 245

SUBLEVEL = 246

EXTRAVERSION =

NAME = "People's Front"

arch/x86/pci/xen.c

+5 −0
Original line number Diff line number Diff line
@@ -441,6 +441,11 @@ void __init xen_msi_init(void) 


	x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;

	x86_msi.teardown_msi_irq = xen_teardown_msi_irq;

	/*

	 * With XEN PIRQ/Eventchannels in use PCI/MSI[-X] masking is solely

	 * controlled by the hypervisor.

	 */

	pci_msi_ignore_mask = 1;

}

#endif

block/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len, 
		if (bytes > len)

			bytes = len;



		page = alloc_page(q->bounce_gfp | gfp_mask);

		page = alloc_page(q->bounce_gfp | __GFP_ZERO | gfp_mask);

		if (!page)

			goto cleanup;

drivers/acpi/sysfs.c

+17 −6
Original line number Diff line number Diff line
@@ -439,18 +439,29 @@ static ssize_t acpi_data_show(struct file *filp, struct kobject *kobj, 
{

	struct acpi_data_attr *data_attr;

	void __iomem *base;

	ssize_t rc;

	ssize_t size;



	data_attr = container_of(bin_attr, struct acpi_data_attr, attr);

	size = data_attr->attr.size;



	if (offset < 0)

		return -EINVAL;



	if (offset >= size)

		return 0;



	base = acpi_os_map_memory(data_attr->addr, data_attr->attr.size);

	if (count > size - offset)

		count = size - offset;



	base = acpi_os_map_iomem(data_attr->addr, size);

	if (!base)

		return -ENOMEM;

	rc = memory_read_from_buffer(buf, count, &offset, base,

				     data_attr->attr.size);

	acpi_os_unmap_memory(base, data_attr->attr.size);



	return rc;

	memcpy_fromio(buf, base + offset, count);



	acpi_os_unmap_iomem(base, size);



	return count;

}



static int acpi_bert_data_init(void *th, struct acpi_data_attr *data_attr)