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

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

Merge 5.4.201 into android11-5.4-lts 



Changes in 5.4.201
	s390/mm: use non-quiescing sske for KVM switch to keyed guest
	dm: remove special-casing of bio-based immutable singleton target on NVMe
	usb: gadget: u_ether: fix regression in setting fixed MAC address
	tcp: add some entropy in __inet_hash_connect()
	tcp: use different parts of the port_offset for index and offset
	tcp: add small random increments to the source port
	tcp: dynamically allocate the perturb table used by source ports
	tcp: increase source port perturb table to 2^16
	tcp: drop the hash_32() part from the index calculation
	arm64: mm: Don't invalidate FROM_DEVICE buffers at start of DMA transfer
	Revert "hwmon: Make chip parameter for with_info API mandatory"
	Linux 5.4.201

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia0b51c88f15fe9e667d07e06fde3bc01787f365d
parents 1dd92ce7 23db944f

Documentation/hwmon/hwmon-kernel-api.rst

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ hwmon_device_register_with_info is the most comprehensive and preferred means 
to register a hardware monitoring device. It creates the standard sysfs

attributes in the hardware monitoring core, letting the driver focus on reading

from and writing to the chip instead of having to bother with sysfs attributes.

The parent device parameter as well as the chip parameter must not be NULL. Its

The parent device parameter cannot be NULL with non-NULL chip info. Its

parameters are described in more detail below.



devm_hwmon_device_register_with_info is similar to

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 200

SUBLEVEL = 201

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm64/mm/cache.S

+0 −2
Original line number Diff line number Diff line
@@ -228,8 +228,6 @@ ENDPIPROC(__dma_flush_area) 
 *	- dir	- DMA direction

 */

ENTRY(__dma_map_area)

	cmp	w2, #DMA_FROM_DEVICE

	b.eq	__dma_inv_area

	b	__dma_clean_area

ENDPIPROC(__dma_map_area)

arch/s390/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,7 @@ void ptep_zap_key(struct mm_struct *mm, unsigned long addr, pte_t *ptep) 
	pgste_val(pgste) |= PGSTE_GR_BIT | PGSTE_GC_BIT;

	ptev = pte_val(*ptep);

	if (!(ptev & _PAGE_INVALID) && (ptev & _PAGE_WRITE))

		page_set_storage_key(ptev & PAGE_MASK, PAGE_DEFAULT_KEY, 1);

		page_set_storage_key(ptev & PAGE_MASK, PAGE_DEFAULT_KEY, 0);

	pgste_set_unlock(ptep, pgste);

	preempt_enable();

}

drivers/hwmon/hwmon.c

+9 −7
Original line number Diff line number Diff line
@@ -715,12 +715,11 @@ EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups); 


/**

 * hwmon_device_register_with_info - register w/ hwmon

 * @dev: the parent device (mandatory)

 * @name: hwmon name attribute (mandatory)

 * @drvdata: driver data to attach to created device (optional)

 * @chip: pointer to hwmon chip information (mandatory)

 * @dev: the parent device

 * @name: hwmon name attribute

 * @drvdata: driver data to attach to created device

 * @chip: pointer to hwmon chip information

 * @extra_groups: pointer to list of additional non-standard attribute groups

 *	(optional)

 *

 * hwmon_device_unregister() must be called when the device is no

 * longer needed.
@@ -733,10 +732,13 @@ hwmon_device_register_with_info(struct device *dev, const char *name, 
				const struct hwmon_chip_info *chip,

				const struct attribute_group **extra_groups)

{

	if (!dev || !name || !chip)

	if (!name)

		return ERR_PTR(-EINVAL);



	if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info))

		return ERR_PTR(-EINVAL);



	if (!chip->ops || !chip->ops->is_visible || !chip->info)

	if (chip && !dev)

		return ERR_PTR(-EINVAL);



	return __hwmon_device_register(dev, name, drvdata, chip, extra_groups);