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: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7778013d057c7b9d1c0749b9d80c00b71f23f116

block/bfq-iosched.c

@@ -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

@@ -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);