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

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

Merge 4.19.202 into android-4.19-stable 



Changes in 4.19.202
	btrfs: mark compressed range uptodate only if all bio succeed
	regulator: rt5033: Fix n_voltages settings for BUCK and LDO
	ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits
	r8152: Fix potential PM refcount imbalance
	qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union()
	net: Fix zero-copy head len calculation.
	bdi: move bdi_dev_name out of line
	bdi: use bdi_dev_name() to get device name
	bdi: add a ->dev_name field to struct backing_dev_info
	Revert "Bluetooth: Shutdown controller after workqueues are flushed or cancelled"
	drm/i915: Ensure intel_engine_init_execlist() builds with Clang
	firmware: arm_scmi: Ensure drivers provide a probe function
	Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout"
	padata: validate cpumask without removed CPU during offline
	padata: add separate cpuhp node for CPUHP_PADATA_DEAD
	spi: mediatek: Fix fifo transfer
	Linux 4.19.202

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7778013d057c7b9d1c0749b9d80c00b71f23f116
parents f758dd08 5c66974a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 201

SUBLEVEL = 202

EXTRAVERSION =

NAME = "People's Front"

block/bfq-iosched.c

+4 −2
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ 
#include <linux/ioprio.h>

#include <linux/sbitmap.h>

#include <linux/delay.h>

#include <linux/backing-dev.h>



#include "blk.h"

#include "blk-mq.h"
@@ -4212,8 +4213,9 @@ bfq_set_next_ioprio_data(struct bfq_queue *bfqq, struct bfq_io_cq *bic) 
	ioprio_class = IOPRIO_PRIO_CLASS(bic->ioprio);

	switch (ioprio_class) {

	default:

		dev_err(bfqq->bfqd->queue->backing_dev_info->dev,

			"bfq: bad prio class %d\n", ioprio_class);

		pr_err("bdi %s: bfq: bad prio class %d\n",

				bdi_dev_name(bfqq->bfqd->queue->backing_dev_info),

				ioprio_class);

		/* fall through */

	case IOPRIO_CLASS_NONE:

		/*

block/blk-cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ const char *blkg_dev_name(struct blkcg_gq *blkg) 
{

	/* some drivers (floppy) instantiate a queue w/o disk registered */

	if (blkg->q->backing_dev_info->dev)

		return dev_name(blkg->q->backing_dev_info->dev);

		return bdi_dev_name(blkg->q->backing_dev_info);

	return NULL;

}

EXPORT_SYMBOL_GPL(blkg_dev_name);

drivers/firmware/arm_scmi/bus.c

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ int scmi_driver_register(struct scmi_driver *driver, struct module *owner, 
{

	int retval;



	if (!driver->probe)

		return -EINVAL;



	driver->driver.bus = &scmi_bus_type;

	driver->driver.name = driver->name;

	driver->driver.owner = owner;

drivers/gpu/drm/i915/intel_engine_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static void intel_engine_init_execlist(struct intel_engine_cs *engine) 
	struct intel_engine_execlists * const execlists = &engine->execlists;



	execlists->port_mask = 1;

	BUILD_BUG_ON_NOT_POWER_OF_2(execlists_num_ports(execlists));

	GEM_BUG_ON(!is_power_of_2(execlists_num_ports(execlists)));

	GEM_BUG_ON(execlists_num_ports(execlists) > EXECLIST_MAX_PORTS);



	execlists->queue_priority = INT_MIN;