summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-17 12:38:08 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-17 12:38:08 -0400
commit6c0ec940c12e02873746caa74acb22fd7ff0c4f1 (patch)
treee85e159a6e05fb7b1f73c57891a2346a839eba6e
parent6383c59066e311f2fa903a8f31b2e9ce588e5ffa (diff)
downloadlongterm-queue-4.18-6c0ec940c12e02873746caa74acb22fd7ff0c4f1.tar.gz
re-export commits w/ SOB added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/ACPI-IORT-Reject-platform-device-creation-on-NUMA-no.patch11
-rw-r--r--queue/ASoC-davinci-mcasp-Fix-clang-warning-without-CONFIG_.patch3
-rw-r--r--queue/ASoC-eukrea-tlv320-fix-a-leaked-reference-by-adding-.patch3
-rw-r--r--queue/ASoC-fsl_utils-fix-a-leaked-reference-by-adding-miss.patch7
-rw-r--r--queue/HID-core-move-Usage-Page-concatenation-to-Main-item.patch25
-rw-r--r--queue/HID-logitech-hidpp-change-low-battery-level-threshol.patch7
-rw-r--r--queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch3
-rw-r--r--queue/Linux-4.18.42.patch3
-rw-r--r--queue/NFS-Fix-a-double-unlock-from-nfs_match-get_client.patch7
-rw-r--r--queue/PM-core-Propagate-dev-power.wakeup_path-when-no-call.patch5
-rw-r--r--queue/RDMA-cxgb4-Fix-null-pointer-dereference-on-alloc_skb.patch7
-rw-r--r--queue/RDMA-hns-Fix-bad-endianess-of-port_pd-variable.patch7
-rw-r--r--queue/USB-core-Don-t-unbind-interfaces-following-device-re.patch7
-rw-r--r--queue/arm64-cpu_ops-fix-a-leaked-reference-by-adding-missi.patch3
-rw-r--r--queue/arm64-vdso-Fix-clock_getres-for-CLOCK_REALTIME.patch17
-rw-r--r--queue/audit-fix-a-memory-leak-bug.patch7
-rw-r--r--queue/b43-shut-up-clang-Wuninitialized-variable-warning.patch9
-rw-r--r--queue/batman-adv-allow-updating-DAT-entry-timeouts-on-inco.patch9
-rw-r--r--queue/block-fix-use-after-free-on-gendisk.patch17
-rw-r--r--queue/block-sed-opal-fix-IOC_OPAL_ENABLE_DISABLE_MBR.patch3
-rw-r--r--queue/brcmfmac-convert-dev_init_lock-mutex-to-completion.patch15
-rw-r--r--queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch3
-rw-r--r--queue/brcmfmac-fix-WARNING-during-USB-disconnect-in-case-o.patch11
-rw-r--r--queue/brcmfmac-fix-missing-checks-for-kmemdup.patch9
-rw-r--r--queue/brcmfmac-fix-race-during-disconnect-when-USB-complet.patch7
-rw-r--r--queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch3
-rw-r--r--queue/chardev-add-additional-check-for-minor-range-overlap.patch3
-rw-r--r--queue/clk-rockchip-Fix-video-codec-clocks-on-rk3288.patch9
-rw-r--r--queue/clk-rockchip-Make-rkpwm-a-critical-clock-on-rk3288.patch3
-rw-r--r--queue/clk-rockchip-undo-several-noc-and-special-clocks-as-.patch3
-rw-r--r--queue/cpufreq-kirkwood-fix-possible-object-reference-leak.patch3
-rw-r--r--queue/cpufreq-pasemi-fix-possible-object-reference-leak.patch3
-rw-r--r--queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch2
-rw-r--r--queue/cpufreq-pmac32-fix-possible-object-reference-leak.patch5
-rw-r--r--queue/cpufreq-ppc_cbe-fix-possible-object-reference-leak.patch3
-rw-r--r--queue/cxgb3-l2t-Fix-undefined-behaviour.patch3
-rw-r--r--queue/dmaengine-at_xdmac-remove-BUG_ON-macro-in-tasklet.patch5
-rw-r--r--queue/dmaengine-tegra210-adma-use-devm_clk_-helpers.patch9
-rw-r--r--queue/drm-Wake-up-next-in-drm_read-chain-if-we-are-forced-.patch7
-rw-r--r--queue/drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch5
-rw-r--r--queue/drm-amd-display-Set-stream-mode_changed-when-connect.patch7
-rw-r--r--queue/drm-amd-display-fix-releasing-planes-when-exiting-od.patch7
-rw-r--r--queue/drm-amdgpu-fix-old-fence-check-in-amdgpu_fence_emit.patch5
-rw-r--r--queue/drm-drv-Hold-ref-on-parent-device-during-drm_device-.patch3
-rw-r--r--queue/drm-etnaviv-avoid-DMA-API-warning-when-importing-buf.patch11
-rw-r--r--queue/drm-msm-a5xx-fix-possible-object-reference-leak.patch9
-rw-r--r--queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch3
-rw-r--r--queue/drm-panel-otm8009a-Add-delay-at-the-end-of-initializ.patch7
-rw-r--r--queue/drm-pl111-fix-possible-object-reference-leak.patch3
-rw-r--r--queue/drm-sun4i-dsi-Change-the-start-delay-calculation.patch5
-rw-r--r--queue/drm-sun4i-dsi-Enforce-boundaries-on-the-start-delay.patch5
-rw-r--r--queue/drm-v3d-Handle-errors-from-IRQ-setup.patch3
-rw-r--r--queue/e1000e-Disable-runtime-PM-on-CNP.patch7
-rw-r--r--queue/extcon-arizona-Disable-mic-detect-if-running-when-dr.patch3
-rw-r--r--queue/hwmon-f71805f-Use-request_muxed_region-for-Super-IO-.patch5
-rw-r--r--queue/hwmon-pc87427-Use-request_muxed_region-for-Super-IO-.patch7
-rw-r--r--queue/hwmon-smsc47b397-Use-request_muxed_region-for-Super-.patch5
-rw-r--r--queue/hwmon-smsc47m1-Use-request_muxed_region-for-Super-IO.patch9
-rw-r--r--queue/hwmon-vt1211-Use-request_muxed_region-for-Super-IO-a.patch5
-rw-r--r--queue/hwrng-omap-Set-default-quality.patch3
-rw-r--r--queue/i40e-Able-to-add-up-to-16-MAC-filters-on-an-untruste.patch7
-rw-r--r--queue/i40e-don-t-allow-changes-to-HW-VLAN-stripping-on-act.patch9
-rw-r--r--queue/igb-Exclude-device-from-suspend-direct-complete-opti.patch7
-rw-r--r--queue/iio-ad_sigma_delta-Properly-handle-SPI-bus-locking-v.patch19
-rw-r--r--queue/iio-adc-stm32-dfsdm-fix-unmet-direct-dependencies-de.patch7
-rw-r--r--queue/iio-common-ssp_sensors-Initialize-calculated_time-in.patch3
-rw-r--r--queue/iio-hmc5843-fix-potential-NULL-pointer-dereferences.patch3
-rw-r--r--queue/irq_work-Do-not-raise-an-IPI-when-queueing-work-on-t.patch3
-rw-r--r--queue/kobject-Don-t-trigger-kobject_uevent-KOBJ_REMOVE-twi.patch9
-rw-r--r--queue/media-au0828-Fix-NULL-pointer-dereference-in-au0828_.patch5
-rw-r--r--queue/media-au0828-stop-video-streaming-only-when-last-use.patch11
-rw-r--r--queue/media-coda-clear-error-return-value-before-picture-r.patch7
-rw-r--r--queue/media-dvbsky-Avoid-leaking-dvb-frontend.patch3
-rw-r--r--queue/media-go7007-avoid-clang-frame-overflow-warning-with.patch3
-rw-r--r--queue/media-gspca-Kill-URBs-on-USB-device-disconnect.patch7
-rw-r--r--queue/media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch5
-rw-r--r--queue/media-m88ds3103-serialize-reset-messages-in-m88ds310.patch5
-rw-r--r--queue/media-ov2659-make-S_FMT-succeed-even-if-requested-fo.patch5
-rw-r--r--queue/media-ov6650-Move-v4l2_clk_get-to-ov6650_video_probe.patch11
-rw-r--r--queue/media-pvrusb2-Prevent-a-buffer-overflow.patch5
-rw-r--r--queue/media-saa7146-avoid-high-stack-usage-with-clang.patch3
-rw-r--r--queue/media-si2165-fix-a-missing-check-of-return-value.patch5
-rw-r--r--queue/media-staging-davinci_vpfe-disallow-building-with-CO.patch3
-rw-r--r--queue/media-stm32-dcmi-fix-crash-when-subdev-do-not-expose.patch9
-rw-r--r--queue/media-video-mux-fix-null-pointer-dereferences.patch3
-rw-r--r--queue/media-vimc-zero-the-media_device-on-probe.patch7
-rw-r--r--queue/media-wl128x-prevent-two-potential-buffer-overflows.patch7
-rw-r--r--queue/mmc-core-make-pwrseq_emmc-partially-support-sleepy-G.patch3
-rw-r--r--queue/mmc-sdhci-of-esdhc-add-erratum-A-009204-support.patch7
-rw-r--r--queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC-A001-and-A-0083.patch7
-rw-r--r--queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC5-support.patch7
-rw-r--r--queue/mmc_spi-add-a-status-check-for-spi_sync_locked.patch5
-rw-r--r--queue/mwifiex-Fix-mem-leak-in-mwifiex_tm_cmd.patch7
-rw-r--r--queue/perf-arm-cci-Remove-broken-race-mitigation.patch7
-rw-r--r--queue/perf-x86-intel-cstate-Add-Icelake-support.patch7
-rw-r--r--queue/perf-x86-intel-rapl-Add-Icelake-support.patch7
-rw-r--r--queue/perf-x86-msr-Add-Icelake-support.patch5
-rw-r--r--queue/phy-mapphone-mdm6600-add-gpiolib-dependency.patch3
-rw-r--r--queue/phy-sun4i-usb-Make-sure-to-disable-PHY0-passby-for-p.patch9
-rw-r--r--queue/pinctrl-pistachio-fix-leaked-of_node-references.patch9
-rw-r--r--queue/pinctrl-samsung-fix-leaked-of_node-references.patch5
-rw-r--r--queue/powerpc-64-Fix-booting-large-kernels-with-STRICT_KER.patch7
-rw-r--r--queue/powerpc-numa-improve-control-of-topology-updates.patch13
-rw-r--r--queue/random-add-a-spinlock_t-to-struct-batched_entropy.patch3
-rw-r--r--queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch3
-rw-r--r--queue/rcutorture-Fix-cleanup-path-for-invalid-torture_type.patch3
-rw-r--r--queue/rtc-xgene-fix-possible-race-condition.patch3
-rw-r--r--queue/rtlwifi-fix-a-potential-NULL-pointer-dereference.patch7
-rw-r--r--queue/rtlwifi-fix-potential-NULL-pointer-dereference.patch3
-rw-r--r--queue/s390-cio-fix-cio_irb-declaration.patch5
-rw-r--r--queue/s390-zcrypt-initialize-variables-before_use.patch13
-rw-r--r--queue/sched-core-Check-quota-and-period-overflow-at-usec-t.patch9
-rw-r--r--queue/sched-core-Handle-overflow-in-cpu_shares_write_u64.patch7
-rw-r--r--queue/sched-rt-Check-integer-overflow-at-usec-to-nsec-conv.patch9
-rw-r--r--queue/scsi-libsas-Do-discovery-on-empty-PHY-to-update-PHY-.patch7
-rw-r--r--queue/scsi-lpfc-Fix-SLI3-commands-being-issued-on-SLI4-dev.patch11
-rw-r--r--queue/scsi-lpfc-Fix-fc4type-information-for-FDMI.patch9
-rw-r--r--queue/scsi-lpfc-avoid-uninitialized-variable-warning.patch3
-rw-r--r--queue/scsi-qedf-Add-missing-return-in-qedf_post_io_req-in-.patch5
-rw-r--r--queue/scsi-qla4xxx-avoid-freeing-unallocated-dma-memory.patch7
-rw-r--r--queue/scsi-ufs-Avoid-configuring-regulator-with-undefined-.patch7
-rw-r--r--queue/scsi-ufs-Fix-regulator-load-and-icc-level-configurat.patch9
-rw-r--r--queue/selftests-bpf-ksym_search-won-t-check-symbols-exists.patch7
-rw-r--r--queue/selftests-cgroup-fix-cleanup-path-in-test_memcg_subt.patch9
-rw-r--r--queue/selinux-avoid-uninitialized-variable-warning.patch3
-rw-r--r--queue/sh-sh7786-Add-explicit-I-O-cast-to-sh7786_mm_sel.patch7
-rw-r--r--queue/spi-Fix-zero-length-xfer-bug.patch7
-rw-r--r--queue/spi-imx-stop-buffer-overflow-in-RX-FIFO-flush.patch7
-rw-r--r--queue/spi-rspi-Fix-sequencer-reset-during-initialization.patch11
-rw-r--r--queue/spi-spi-topcliff-pch-Fix-to-handle-empty-DMA-buffers.patch9
-rw-r--r--queue/spi-tegra114-reset-controller-on-probe.patch13
-rw-r--r--queue/staging-vc04_services-handle-kzalloc-failure.patch11
-rw-r--r--queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch3
-rw-r--r--queue/thunderbolt-Fix-to-check-return-value-of-ida_simple_.patch9
-rw-r--r--queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch3
-rw-r--r--queue/thunderbolt-Take-domain-lock-in-switch-sysfs-attribu.patch3
-rw-r--r--queue/thunderbolt-property-Fix-a-NULL-pointer-dereference.patch7
-rw-r--r--queue/thunderbolt-property-Fix-a-missing-check-of-kzalloc.patch7
-rw-r--r--queue/tinydrm-mipi-dbi-Use-dma-safe-buffers-for-all-SPI-tr.patch3
-rw-r--r--queue/tty-ipwireless-fix-missing-checks-for-ioremap.patch3
-rw-r--r--queue/usb-core-Add-PM-runtime-calls-to-usb_hcd_platform_sh.patch5
-rw-r--r--queue/vfio-ccw-Prevent-quiesce-function-going-into-an-infi.patch7
-rw-r--r--queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch3
-rw-r--r--queue/virtio_console-initialize-vtermno-value-for-ports.patch7
-rw-r--r--queue/x86-build-Keep-local-relocations-with-ld.lld.patch5
-rw-r--r--queue/x86-ia32-Fix-ia32_restore_sigcontext-AC-leak.patch5
-rw-r--r--queue/x86-irq-64-Limit-IST-stack-overflow-check-to-DB-stac.patch3
-rw-r--r--queue/x86-mce-Fix-machine_check_poll-tests-for-error-types.patch2
-rw-r--r--queue/x86-mce-Handle-varying-MCA-bank-counts.patch2
-rw-r--r--queue/x86-microcode-Fix-the-ancient-deprecated-microcode-l.patch5
-rw-r--r--queue/x86-uaccess-Fix-up-the-fixup.patch3
-rw-r--r--queue/x86-uaccess-ftrace-Fix-ftrace_likely_update-vs.-SMAP.patch3
-rw-r--r--queue/x86-uaccess-signal-Fix-AC-1-bloat.patch5
153 files changed, 556 insertions, 406 deletions
diff --git a/queue/ACPI-IORT-Reject-platform-device-creation-on-NUMA-no.patch b/queue/ACPI-IORT-Reject-platform-device-creation-on-NUMA-no.patch
index 9cfa79b..584bd49 100644
--- a/queue/ACPI-IORT-Reject-platform-device-creation-on-NUMA-no.patch
+++ b/queue/ACPI-IORT-Reject-platform-device-creation-on-NUMA-no.patch
@@ -1,4 +1,4 @@
-From 36a2ba07757df790b4a874efb1a105b9330a9ae7 Mon Sep 17 00:00:00 2001
+From 8c15a54d9454bef662c3c7604cb0623152160442 Mon Sep 17 00:00:00 2001
From: Kefeng Wang <wangkefeng.wang@huawei.com>
Date: Mon, 8 Apr 2019 23:21:12 +0800
Subject: [PATCH] ACPI/IORT: Reject platform device creation on NUMA node
@@ -61,12 +61,13 @@ Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Link: https://lore.kernel.org/linux-arm-kernel/20190315021940.86905-1-wangkefeng.wang@huawei.com/
Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
-index e48894e002ba..a46c2c162c03 100644
+index 08180c3ee6ad..6b385469e512 100644
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
-@@ -1232,18 +1232,24 @@ static bool __init arm_smmu_v3_is_coherent(struct acpi_iort_node *node)
+@@ -1208,18 +1208,24 @@ static bool __init arm_smmu_v3_is_coherent(struct acpi_iort_node *node)
/*
* set numa proximity domain for smmuv3 device
*/
@@ -93,7 +94,7 @@ index e48894e002ba..a46c2c162c03 100644
}
#else
#define arm_smmu_v3_set_proximity NULL
-@@ -1318,7 +1324,7 @@ struct iort_dev_config {
+@@ -1294,7 +1300,7 @@ struct iort_dev_config {
int (*dev_count_resources)(struct acpi_iort_node *node);
void (*dev_init_resources)(struct resource *res,
struct acpi_iort_node *node);
@@ -102,7 +103,7 @@ index e48894e002ba..a46c2c162c03 100644
struct acpi_iort_node *node);
};
-@@ -1369,8 +1375,11 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,
+@@ -1345,8 +1351,11 @@ static int __init iort_add_platform_device(struct acpi_iort_node *node,
if (!pdev)
return -ENOMEM;
diff --git a/queue/ASoC-davinci-mcasp-Fix-clang-warning-without-CONFIG_.patch b/queue/ASoC-davinci-mcasp-Fix-clang-warning-without-CONFIG_.patch
index 0c604d8..cc37040 100644
--- a/queue/ASoC-davinci-mcasp-Fix-clang-warning-without-CONFIG_.patch
+++ b/queue/ASoC-davinci-mcasp-Fix-clang-warning-without-CONFIG_.patch
@@ -1,4 +1,4 @@
-From dd456b80f0210459b8ee18133ceccf3b5b18cfcd Mon Sep 17 00:00:00 2001
+From 81566f6aa4966694c7c2e3c95ce7d0a520c5ea1b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 Mar 2019 11:11:30 +0100
Subject: [PATCH] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
@@ -19,6 +19,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 47c0c821d325..d7bd77ec88e1 100644
diff --git a/queue/ASoC-eukrea-tlv320-fix-a-leaked-reference-by-adding-.patch b/queue/ASoC-eukrea-tlv320-fix-a-leaked-reference-by-adding-.patch
index 9920964..e389b95 100644
--- a/queue/ASoC-eukrea-tlv320-fix-a-leaked-reference-by-adding-.patch
+++ b/queue/ASoC-eukrea-tlv320-fix-a-leaked-reference-by-adding-.patch
@@ -1,4 +1,4 @@
-From b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 Mon Sep 17 00:00:00 2001
+From 9a2b96927f9241de26b4d6515d6beb85af852888 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Tue, 26 Feb 2019 16:17:51 +0800
Subject: [PATCH] ASoC: eukrea-tlv320: fix a leaked reference by adding missing
@@ -22,6 +22,7 @@ Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index 191426a6d9ad..30a3d68b5c03 100644
diff --git a/queue/ASoC-fsl_utils-fix-a-leaked-reference-by-adding-miss.patch b/queue/ASoC-fsl_utils-fix-a-leaked-reference-by-adding-miss.patch
index 33b0e0c..61f8518 100644
--- a/queue/ASoC-fsl_utils-fix-a-leaked-reference-by-adding-miss.patch
+++ b/queue/ASoC-fsl_utils-fix-a-leaked-reference-by-adding-miss.patch
@@ -1,4 +1,4 @@
-From c705247136a523488eac806bd357c3e5d79a7acd Mon Sep 17 00:00:00 2001
+From b5da1dd9d5e90876ba88c570b9395c9ca1179d2e Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Tue, 26 Feb 2019 16:17:50 +0800
Subject: [PATCH] ASoC: fsl_utils: fix a leaked reference by adding missing
@@ -26,12 +26,13 @@ Cc: alsa-devel@alsa-project.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/soc/fsl/fsl_utils.c b/sound/soc/fsl/fsl_utils.c
-index 9981668ab590..040d06b89f00 100644
+index 7592b0406370..02e453ced234 100644
--- a/sound/soc/fsl/fsl_utils.c
+++ b/sound/soc/fsl/fsl_utils.c
-@@ -71,6 +71,7 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
+@@ -75,6 +75,7 @@ int fsl_asoc_get_dma_channel(struct device_node *ssi_np,
iprop = of_get_property(dma_np, "cell-index", NULL);
if (!iprop) {
of_node_put(dma_np);
diff --git a/queue/HID-core-move-Usage-Page-concatenation-to-Main-item.patch b/queue/HID-core-move-Usage-Page-concatenation-to-Main-item.patch
index 4c4938a..0d3870e 100644
--- a/queue/HID-core-move-Usage-Page-concatenation-to-Main-item.patch
+++ b/queue/HID-core-move-Usage-Page-concatenation-to-Main-item.patch
@@ -1,4 +1,4 @@
-From 58e75155009cc800005629955d3482f36a1e0eec Mon Sep 17 00:00:00 2001
+From c9f02dd360186d9333cfd4f0e87963d879a3263f Mon Sep 17 00:00:00 2001
From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Date: Wed, 27 Mar 2019 11:18:48 +0100
Subject: [PATCH] HID: core: move Usage Page concatenation to Main item
@@ -23,12 +23,13 @@ item parsing function to the main item parsing function.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Terry Junge <terry.junge@poly.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 9993b692598f..852bbd303d9a 100644
+index 3942ee61bd1c..1fd9c346537b 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
-@@ -218,13 +218,14 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)
+@@ -205,13 +205,14 @@ static unsigned hid_lookup_collection(struct hid_parser *parser, unsigned type)
* Add a usage to the temporary parser table.
*/
@@ -44,7 +45,7 @@ index 9993b692598f..852bbd303d9a 100644
parser->local.collection_index[parser->local.usage_index] =
parser->collection_stack_ptr ?
parser->collection_stack[parser->collection_stack_ptr - 1] : 0;
-@@ -486,10 +487,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
+@@ -472,10 +473,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
return 0;
}
@@ -56,7 +57,7 @@ index 9993b692598f..852bbd303d9a 100644
case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:
-@@ -498,9 +496,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
+@@ -484,9 +482,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
return 0;
}
@@ -66,7 +67,7 @@ index 9993b692598f..852bbd303d9a 100644
parser->local.usage_minimum = data;
return 0;
-@@ -511,9 +506,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
+@@ -497,9 +492,6 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
return 0;
}
@@ -76,7 +77,7 @@ index 9993b692598f..852bbd303d9a 100644
count = data - parser->local.usage_minimum;
if (count + parser->local.usage_index >= HID_MAX_USAGES) {
/*
-@@ -533,7 +525,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
+@@ -519,7 +511,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
}
for (n = parser->local.usage_minimum; n <= data; n++)
@@ -85,7 +86,7 @@ index 9993b692598f..852bbd303d9a 100644
dbg_hid("hid_add_usage failed\n");
return -1;
}
-@@ -548,6 +540,22 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
+@@ -534,6 +526,22 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
}
/*
@@ -108,7 +109,7 @@ index 9993b692598f..852bbd303d9a 100644
* Process a main item.
*/
-@@ -556,6 +564,8 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)
+@@ -542,6 +550,8 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item)
__u32 data;
int ret;
@@ -117,7 +118,7 @@ index 9993b692598f..852bbd303d9a 100644
data = item_udata(item);
switch (item->tag) {
-@@ -765,6 +775,8 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)
+@@ -751,6 +761,8 @@ static int hid_scan_main(struct hid_parser *parser, struct hid_item *item)
__u32 data;
int i;
@@ -127,10 +128,10 @@ index 9993b692598f..852bbd303d9a 100644
switch (item->tag) {
diff --git a/include/linux/hid.h b/include/linux/hid.h
-index f9707d1dcb58..ac0c70b4ce10 100644
+index 5482dd6ae9ef..62c560b2aa24 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
-@@ -417,6 +417,7 @@ struct hid_global {
+@@ -408,6 +408,7 @@ struct hid_global {
struct hid_local {
unsigned usage[HID_MAX_USAGES]; /* usage array */
diff --git a/queue/HID-logitech-hidpp-change-low-battery-level-threshol.patch b/queue/HID-logitech-hidpp-change-low-battery-level-threshol.patch
index 07ea3b9..4661650 100644
--- a/queue/HID-logitech-hidpp-change-low-battery-level-threshol.patch
+++ b/queue/HID-logitech-hidpp-change-low-battery-level-threshol.patch
@@ -1,4 +1,4 @@
-From 1f87b0cd32b3456d7efdfb017fcf74d0bfe3ec29 Mon Sep 17 00:00:00 2001
+From aded3ef3634b50d6355b546f5cfb3c535cef3275 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 22 Mar 2019 08:41:40 +0100
Subject: [PATCH] HID: logitech-hidpp: change low battery level threshold from
@@ -25,12 +25,13 @@ This commit fixes this by changing the low threshold to anything under
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
-index cd4b0befc0e8..e5897c292e8c 100644
+index edf224ad1336..e642cfaf303b 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
-@@ -1004,7 +1004,11 @@ static int hidpp_map_battery_level(int capacity)
+@@ -910,7 +910,11 @@ static int hidpp_map_battery_level(int capacity)
{
if (capacity < 11)
return POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
diff --git a/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch b/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch
index c1941a0..d3cf5f8 100644
--- a/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch
+++ b/queue/HID-logitech-hidpp-use-RAP-instead-of-FAP-to-get-the.patch
@@ -1,4 +1,4 @@
-From 20f2155c7c1f2ecb3b200d5b22b47ba48b53da53 Mon Sep 17 00:00:00 2001
+From 7448c197c8a8490d4ad08af8547a9c25dff3f0fd Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sat, 20 Apr 2019 13:22:10 +0200
Subject: [PATCH] HID: logitech-hidpp: use RAP instead of FAP to get the
@@ -27,6 +27,7 @@ k270 and m185 HID++-2.0 devices connected and on a unifying/dj receiver
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 8425d3548a41..edf224ad1336 100644
diff --git a/queue/Linux-4.18.42.patch b/queue/Linux-4.18.42.patch
index eb6b99c..f991826 100644
--- a/queue/Linux-4.18.42.patch
+++ b/queue/Linux-4.18.42.patch
@@ -1,8 +1,9 @@
-From cfa3c2e91ca3dc8cda65a26750abf8bdfc0ac806 Mon Sep 17 00:00:00 2001
+From 8754481a7183ec4c36a487c6589b18e00bd0c8b3 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 15 Aug 2019 21:17:07 -0400
Subject: [PATCH] Linux 4.18.42
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/Makefile b/Makefile
index 762e2b0a953a..dddd74d59ce5 100644
diff --git a/queue/NFS-Fix-a-double-unlock-from-nfs_match-get_client.patch b/queue/NFS-Fix-a-double-unlock-from-nfs_match-get_client.patch
index 9cf6799..9decaec 100644
--- a/queue/NFS-Fix-a-double-unlock-from-nfs_match-get_client.patch
+++ b/queue/NFS-Fix-a-double-unlock-from-nfs_match-get_client.patch
@@ -1,4 +1,4 @@
-From c260121a97a3e4df6536edbc2f26e166eff370ce Mon Sep 17 00:00:00 2001
+From bddad37c5d23d99b4624152d2a062dbc2e1f1b2a Mon Sep 17 00:00:00 2001
From: Benjamin Coddington <bcodding@redhat.com>
Date: Thu, 9 May 2019 07:25:21 -0400
Subject: [PATCH] NFS: Fix a double unlock from nfs_match,get_client
@@ -13,12 +13,13 @@ Fixes: 950a578c6128 ("NFS: make nfs_match_client killable")
Reported-by: syzbot+228a82b263b5da91883d@syzkaller.appspotmail.com
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
-index 06e8719655f0..da74c4c4a244 100644
+index f256c2165e8c..9adfb51e702d 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
-@@ -299,9 +299,9 @@ again:
+@@ -305,9 +305,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
spin_unlock(&nn->nfs_client_lock);
error = nfs_wait_client_init_complete(clp);
nfs_put_client(clp);
diff --git a/queue/PM-core-Propagate-dev-power.wakeup_path-when-no-call.patch b/queue/PM-core-Propagate-dev-power.wakeup_path-when-no-call.patch
index 628c4e7..171fdda 100644
--- a/queue/PM-core-Propagate-dev-power.wakeup_path-when-no-call.patch
+++ b/queue/PM-core-Propagate-dev-power.wakeup_path-when-no-call.patch
@@ -1,4 +1,4 @@
-From dc351d4c5f4fe4d0f274d6d660227be0c3a03317 Mon Sep 17 00:00:00 2001
+From c9fc2c636edf60db73b428c55ffd41c45363d7e4 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Wed, 10 Apr 2019 11:55:16 +0200
Subject: [PATCH] PM / core: Propagate dev->power.wakeup_path when no callbacks
@@ -22,9 +22,10 @@ Reported-by: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
[ rjw: Comment cleanup ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 9b8c829798f1..43e863cc0c1b 100644
+index a690fd400260..4abd7c6531d9 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1736,6 +1736,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
diff --git a/queue/RDMA-cxgb4-Fix-null-pointer-dereference-on-alloc_skb.patch b/queue/RDMA-cxgb4-Fix-null-pointer-dereference-on-alloc_skb.patch
index 030f392..79d7512 100644
--- a/queue/RDMA-cxgb4-Fix-null-pointer-dereference-on-alloc_skb.patch
+++ b/queue/RDMA-cxgb4-Fix-null-pointer-dereference-on-alloc_skb.patch
@@ -1,4 +1,4 @@
-From a6d2a5a92e67d151c98886babdc86d530d27111c Mon Sep 17 00:00:00 2001
+From 92025fc1a1f5f1c753ee3ac5d0d44f22b10b799c Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Sat, 13 Apr 2019 17:00:26 +0100
Subject: [PATCH] RDMA/cxgb4: Fix null pointer dereference on alloc_skb failure
@@ -15,12 +15,13 @@ Fixes: b38a0ad8ec11 ("RDMA/cxgb4: Set arp error handler for PASS_ACCEPT_RPL mess
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Potnuri Bharat Teja <bharat@chelsio.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
-index 1e68d87b663d..0f3b1193d5f8 100644
+index 0e38b1a5daa3..fa3ded59a284 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
-@@ -460,6 +460,8 @@ static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp)
+@@ -458,6 +458,8 @@ static struct sk_buff *get_skb(struct sk_buff *skb, int len, gfp_t gfp)
skb_reset_transport_header(skb);
} else {
skb = alloc_skb(len, gfp);
diff --git a/queue/RDMA-hns-Fix-bad-endianess-of-port_pd-variable.patch b/queue/RDMA-hns-Fix-bad-endianess-of-port_pd-variable.patch
index c0d4d7c..7a0bfb2 100644
--- a/queue/RDMA-hns-Fix-bad-endianess-of-port_pd-variable.patch
+++ b/queue/RDMA-hns-Fix-bad-endianess-of-port_pd-variable.patch
@@ -1,4 +1,4 @@
-From 6734b2973565e36659e97e12ab0d0faf1d9f3fbe Mon Sep 17 00:00:00 2001
+From af404396235f3b24971c8804d36afaae1a27597a Mon Sep 17 00:00:00 2001
From: Leon Romanovsky <leonro@mellanox.com>
Date: Tue, 19 Mar 2019 11:10:08 +0200
Subject: [PATCH] RDMA/hns: Fix bad endianess of port_pd variable
@@ -18,12 +18,13 @@ Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Reviewed-by: Gal Pressman <galpress@amazon.com>
Reviewed-by: Lijun Ou <ouliun@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/infiniband/hw/hns/hns_roce_ah.c b/drivers/infiniband/hw/hns/hns_roce_ah.c
-index 42067325ae5e..6ba505bc7cce 100644
+index d74928621559..f6d30a21079b 100644
--- a/drivers/infiniband/hw/hns/hns_roce_ah.c
+++ b/drivers/infiniband/hw/hns/hns_roce_ah.c
-@@ -70,7 +70,7 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd,
+@@ -77,7 +77,7 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd,
HNS_ROCE_VLAN_SL_BIT_MASK) <<
HNS_ROCE_VLAN_SL_SHIFT;
diff --git a/queue/USB-core-Don-t-unbind-interfaces-following-device-re.patch b/queue/USB-core-Don-t-unbind-interfaces-following-device-re.patch
index e3e9e4b..e681af1 100644
--- a/queue/USB-core-Don-t-unbind-interfaces-following-device-re.patch
+++ b/queue/USB-core-Don-t-unbind-interfaces-following-device-re.patch
@@ -1,4 +1,4 @@
-From 381419fa720060ba48b7bbc483be787d5b1dca6f Mon Sep 17 00:00:00 2001
+From 03976a8debbd7e8843bcecc5ae5316d91d261769 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Tue, 16 Apr 2019 10:50:01 -0400
Subject: [PATCH] USB: core: Don't unbind interfaces following device reset
@@ -46,12 +46,13 @@ CC: Bart Van Assche <bvanassche@acm.org>
CC: Martin K. Petersen <martin.petersen@oracle.com>
CC: Jacky Cao <Jacky.Cao@sony.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 15a2934dc29d..1949134f72e6 100644
+index 3c5819837cbe..0e17ae3c59fb 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5901,7 +5901,10 @@ int usb_reset_device(struct usb_device *udev)
+@@ -5781,7 +5781,10 @@ int usb_reset_device(struct usb_device *udev)
cintf->needs_binding = 1;
}
}
diff --git a/queue/arm64-cpu_ops-fix-a-leaked-reference-by-adding-missi.patch b/queue/arm64-cpu_ops-fix-a-leaked-reference-by-adding-missi.patch
index 4ca001a..c4264d8 100644
--- a/queue/arm64-cpu_ops-fix-a-leaked-reference-by-adding-missi.patch
+++ b/queue/arm64-cpu_ops-fix-a-leaked-reference-by-adding-missi.patch
@@ -1,4 +1,4 @@
-From 92606ec9285fb84cd9b5943df23f07d741384bfc Mon Sep 17 00:00:00 2001
+From 3db8a9e34ce387625f1d79317b2d2fb328165f0e Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Tue, 5 Mar 2019 19:34:05 +0800
Subject: [PATCH] arm64: cpu_ops: fix a leaked reference by adding missing
@@ -22,6 +22,7 @@ Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm64/kernel/cpu_ops.c b/arch/arm64/kernel/cpu_ops.c
index ea001241bdd4..00f8b8612b69 100644
diff --git a/queue/arm64-vdso-Fix-clock_getres-for-CLOCK_REALTIME.patch b/queue/arm64-vdso-Fix-clock_getres-for-CLOCK_REALTIME.patch
index b9ca4dd..d3cf543 100644
--- a/queue/arm64-vdso-Fix-clock_getres-for-CLOCK_REALTIME.patch
+++ b/queue/arm64-vdso-Fix-clock_getres-for-CLOCK_REALTIME.patch
@@ -1,4 +1,4 @@
-From 81fb8736dd81da3fe94f28968dac60f392ec6746 Mon Sep 17 00:00:00 2001
+From 3d4b8dc29eeb10ecdb1b5648c6745930beb1fbf5 Mon Sep 17 00:00:00 2001
From: Vincenzo Frascino <vincenzo.frascino@arm.com>
Date: Tue, 16 Apr 2019 17:14:30 +0100
Subject: [PATCH] arm64: vdso: Fix clock_getres() for CLOCK_REALTIME
@@ -24,6 +24,7 @@ Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
[will: Use WRITE_ONCE(), move adr off COARSE path, renumber labels, use 'w' reg]
Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h
index 2b9a63771eda..f89263c8e11a 100644
@@ -38,10 +39,10 @@ index 2b9a63771eda..f89263c8e11a 100644
#endif /* !__ASSEMBLY__ */
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
-index 7f40dcbdd51d..e10e2a5d9ddc 100644
+index 323aeb5f2fe6..92fba851ce53 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
-@@ -94,7 +94,7 @@ int main(void)
+@@ -99,7 +99,7 @@ int main(void)
DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
DEFINE(CLOCK_MONOTONIC_RAW, CLOCK_MONOTONIC_RAW);
@@ -51,10 +52,10 @@ index 7f40dcbdd51d..e10e2a5d9ddc 100644
DEFINE(CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE);
DEFINE(CLOCK_COARSE_RES, LOW_RES_NSEC);
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
-index 9fb0c0c95a85..42b7082029e1 100644
+index 2d419006ad43..ec0bb588d755 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
-@@ -230,6 +230,9 @@ void update_vsyscall(struct timekeeper *tk)
+@@ -232,6 +232,9 @@ void update_vsyscall(struct timekeeper *tk)
vdso_data->wtm_clock_sec = tk->wall_to_monotonic.tv_sec;
vdso_data->wtm_clock_nsec = tk->wall_to_monotonic.tv_nsec;
@@ -65,10 +66,10 @@ index 9fb0c0c95a85..42b7082029e1 100644
/* tkr_mono.cycle_last == tkr_raw.cycle_last */
vdso_data->cs_cycle_last = tk->tkr_mono.cycle_last;
diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S
-index c39872a7b03c..21805e416483 100644
+index e8f60112818f..856fee6d3512 100644
--- a/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
-@@ -301,13 +301,14 @@ ENTRY(__kernel_clock_getres)
+@@ -308,13 +308,14 @@ ENTRY(__kernel_clock_getres)
ccmp w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
b.ne 1f
@@ -85,7 +86,7 @@ index c39872a7b03c..21805e416483 100644
2:
cbz x1, 3f
stp xzr, x2, [x1]
-@@ -321,8 +322,6 @@ ENTRY(__kernel_clock_getres)
+@@ -328,8 +329,6 @@ ENTRY(__kernel_clock_getres)
svc #0
ret
5:
diff --git a/queue/audit-fix-a-memory-leak-bug.patch b/queue/audit-fix-a-memory-leak-bug.patch
index 5c0a7e1..281c7e5 100644
--- a/queue/audit-fix-a-memory-leak-bug.patch
+++ b/queue/audit-fix-a-memory-leak-bug.patch
@@ -1,4 +1,4 @@
-From 70c4cf17e445264453bc5323db3e50aa0ac9e81f Mon Sep 17 00:00:00 2001
+From c1e430f74792a8e7330e7455787a2d9d2fe07975 Mon Sep 17 00:00:00 2001
From: Wenwen Wang <wang6495@umn.edu>
Date: Fri, 19 Apr 2019 20:49:29 -0500
Subject: [PATCH] audit: fix a memory leak bug
@@ -22,12 +22,13 @@ or AUDIT_DEL_RULE.
Signed-off-by: Wenwen Wang <wang6495@umn.edu>
Reviewed-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
-index 2c3c2f349b23..1bc6410413e6 100644
+index eaa320148d97..454cf8d65676 100644
--- a/kernel/auditfilter.c
+++ b/kernel/auditfilter.c
-@@ -1114,22 +1114,24 @@ int audit_rule_change(int type, int seq, void *data, size_t datasz)
+@@ -1116,22 +1116,24 @@ int audit_rule_change(int type, int seq, void *data, size_t datasz)
int err = 0;
struct audit_entry *entry;
diff --git a/queue/b43-shut-up-clang-Wuninitialized-variable-warning.patch b/queue/b43-shut-up-clang-Wuninitialized-variable-warning.patch
index 3cdc477..403c048 100644
--- a/queue/b43-shut-up-clang-Wuninitialized-variable-warning.patch
+++ b/queue/b43-shut-up-clang-Wuninitialized-variable-warning.patch
@@ -1,4 +1,4 @@
-From d825db346270dbceef83b7b750dbc29f1d7dcc0e Mon Sep 17 00:00:00 2001
+From bc715f12a9f13426ccedf0ced58296748b9b5974 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 22 Mar 2019 15:37:02 +0100
Subject: [PATCH] b43: shut up clang -Wuninitialized variable warning
@@ -34,12 +34,13 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/broadcom/b43/phy_lp.c b/drivers/net/wireless/broadcom/b43/phy_lp.c
-index 46408a560814..aedee026c5e2 100644
+index 6922cbb99a04..5a0699fb4b9a 100644
--- a/drivers/net/wireless/broadcom/b43/phy_lp.c
+++ b/drivers/net/wireless/broadcom/b43/phy_lp.c
-@@ -1835,7 +1835,7 @@ static void lpphy_papd_cal(struct b43_wldev *dev, struct lpphy_tx_gains gains,
+@@ -1834,7 +1834,7 @@ static void lpphy_papd_cal(struct b43_wldev *dev, struct lpphy_tx_gains gains,
static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)
{
struct b43_phy_lp *lpphy = dev->phy.lp;
@@ -48,7 +49,7 @@ index 46408a560814..aedee026c5e2 100644
int old_txpctl, old_afe_ovr, old_rf, old_bbmult;
lpphy_read_tx_pctl_mode_from_hardware(dev);
-@@ -1849,9 +1849,9 @@ static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)
+@@ -1848,9 +1848,9 @@ static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)
lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
if (dev->dev->chip_id == 0x4325 && dev->dev->chip_rev == 0)
diff --git a/queue/batman-adv-allow-updating-DAT-entry-timeouts-on-inco.patch b/queue/batman-adv-allow-updating-DAT-entry-timeouts-on-inco.patch
index 94f0501..3f9fbf8 100644
--- a/queue/batman-adv-allow-updating-DAT-entry-timeouts-on-inco.patch
+++ b/queue/batman-adv-allow-updating-DAT-entry-timeouts-on-inco.patch
@@ -1,4 +1,4 @@
-From 099e6cc1582dc2903fecb898bbeae8f7cf4262c7 Mon Sep 17 00:00:00 2001
+From 2fd554282d704d164e634372306e7f3aec8c2f9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
Date: Thu, 14 Feb 2019 16:52:43 +0100
Subject: [PATCH] batman-adv: allow updating DAT entry timeouts on incoming ARP
@@ -29,12 +29,13 @@ Signed-off-by: Linus LĂ¼ssing <linus.luessing@c0d3.blue>
Acked-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
-index 81fc63fc1936..b0af3a11d406 100644
+index a60bacf7120b..2895e3b26e93 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
-@@ -1434,7 +1434,6 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
+@@ -1394,7 +1394,6 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
hw_src, &ip_src, hw_dst, &ip_dst,
dat_entry->mac_addr, &dat_entry->ip);
dropped = true;
@@ -42,7 +43,7 @@ index 81fc63fc1936..b0af3a11d406 100644
}
/* Update our internal cache with both the IP addresses the node got
-@@ -1443,6 +1442,9 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
+@@ -1403,6 +1402,9 @@ bool batadv_dat_snoop_incoming_arp_reply(struct batadv_priv *bat_priv,
batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid);
batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid);
diff --git a/queue/block-fix-use-after-free-on-gendisk.patch b/queue/block-fix-use-after-free-on-gendisk.patch
index 8e2724b..406f78e 100644
--- a/queue/block-fix-use-after-free-on-gendisk.patch
+++ b/queue/block-fix-use-after-free-on-gendisk.patch
@@ -1,4 +1,4 @@
-From 2c88e3c7ec32d7a40cc7c9b4a487cf90e4671bdd Mon Sep 17 00:00:00 2001
+From 29780a17b69328f2c9a012f9dfdbc2e87879521b Mon Sep 17 00:00:00 2001
From: Yufen Yu <yuyufen@huawei.com>
Date: Tue, 2 Apr 2019 20:06:34 +0800
Subject: [PATCH] block: fix use-after-free on gendisk
@@ -54,12 +54,13 @@ Reviewed-by: Jan Kara <jack@suse.cz>
Suggested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/block/genhd.c b/block/genhd.c
-index 1d0d25f7b0fe..83f5c33d1e80 100644
+index f1543a45e73b..0d43973fc6b7 100644
--- a/block/genhd.c
+++ b/block/genhd.c
-@@ -531,6 +531,18 @@ void blk_free_devt(dev_t devt)
+@@ -518,6 +518,18 @@ void blk_free_devt(dev_t devt)
}
}
@@ -78,7 +79,7 @@ index 1d0d25f7b0fe..83f5c33d1e80 100644
static char *bdevt_str(dev_t devt, char *buf)
{
if (MAJOR(devt) <= 0xff && MINOR(devt) <= 0xff) {
-@@ -793,6 +805,13 @@ void del_gendisk(struct gendisk *disk)
+@@ -769,6 +781,13 @@ void del_gendisk(struct gendisk *disk)
if (!(disk->flags & GENHD_FL_HIDDEN))
blk_unregister_region(disk_devt(disk), disk->minors);
@@ -93,10 +94,10 @@ index 1d0d25f7b0fe..83f5c33d1e80 100644
kobject_put(disk->part0.holder_dir);
kobject_put(disk->slave_dir);
diff --git a/block/partition-generic.c b/block/partition-generic.c
-index 8e596a8dff32..aee643ce13d1 100644
+index e10b0249082d..ba33775e2e8f 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
-@@ -285,6 +285,13 @@ void delete_partition(struct gendisk *disk, int partno)
+@@ -284,6 +284,13 @@ void delete_partition(struct gendisk *disk, int partno)
kobject_put(part->holder_dir);
device_del(part_to_dev(part));
@@ -111,10 +112,10 @@ index 8e596a8dff32..aee643ce13d1 100644
}
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
-index 6547c9256d5c..8b5330dd5ac0 100644
+index b8df891709ac..144238b5f2da 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
-@@ -617,6 +617,7 @@ struct unixware_disklabel {
+@@ -587,6 +587,7 @@ struct unixware_disklabel {
extern int blk_alloc_devt(struct hd_struct *part, dev_t *devt);
extern void blk_free_devt(dev_t devt);
diff --git a/queue/block-sed-opal-fix-IOC_OPAL_ENABLE_DISABLE_MBR.patch b/queue/block-sed-opal-fix-IOC_OPAL_ENABLE_DISABLE_MBR.patch
index a7500bc..6e480b6 100644
--- a/queue/block-sed-opal-fix-IOC_OPAL_ENABLE_DISABLE_MBR.patch
+++ b/queue/block-sed-opal-fix-IOC_OPAL_ENABLE_DISABLE_MBR.patch
@@ -1,4 +1,4 @@
-From 78bf47353b0041865564deeed257a54f047c2fdc Mon Sep 17 00:00:00 2001
+From f1767da597a31e77a745094ce7ce6b64d636c420 Mon Sep 17 00:00:00 2001
From: David Kozub <zub@linux.fjfi.cvut.cz>
Date: Thu, 14 Feb 2019 01:15:53 +0100
Subject: [PATCH] block: sed-opal: fix IOC_OPAL_ENABLE_DISABLE_MBR
@@ -23,6 +23,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Scott Bauer <sbauer@plzdonthack.me>
Signed-off-by: David Kozub <zub@linux.fjfi.cvut.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/block/sed-opal.c b/block/sed-opal.c
index e0de4dd448b3..119640897293 100644
diff --git a/queue/brcmfmac-convert-dev_init_lock-mutex-to-completion.patch b/queue/brcmfmac-convert-dev_init_lock-mutex-to-completion.patch
index c804160..5217b8a 100644
--- a/queue/brcmfmac-convert-dev_init_lock-mutex-to-completion.patch
+++ b/queue/brcmfmac-convert-dev_init_lock-mutex-to-completion.patch
@@ -1,4 +1,4 @@
-From a9fd0953fa4a62887306be28641b4b0809f3b2fd Mon Sep 17 00:00:00 2001
+From 087ef583739340af8f1847535323f40a8d128767 Mon Sep 17 00:00:00 2001
From: Piotr Figiel <p.figiel@camlintechnologies.com>
Date: Wed, 13 Mar 2019 09:52:42 +0000
Subject: [PATCH] brcmfmac: convert dev_init_lock mutex to completion
@@ -112,9 +112,10 @@ Exception stack(0xed1d9fb0 to 0xed1d9ff8)
Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
-index c00b9fd8876b..75fcd6752edc 100644
+index a4308c6e72d7..5aeb401d9a02 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -160,7 +160,7 @@ struct brcmf_usbdev_info {
@@ -126,7 +127,7 @@ index c00b9fd8876b..75fcd6752edc 100644
int ctl_in_pipe, ctl_out_pipe;
struct urb *ctl_urb; /* URB for control endpoint */
-@@ -1194,11 +1194,11 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
+@@ -1195,11 +1195,11 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret,
if (ret)
goto error;
@@ -140,7 +141,7 @@ index c00b9fd8876b..75fcd6752edc 100644
device_release_driver(dev);
}
-@@ -1266,7 +1266,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
+@@ -1267,7 +1267,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
if (ret)
goto fail;
/* we are done */
@@ -149,7 +150,7 @@ index c00b9fd8876b..75fcd6752edc 100644
return 0;
}
bus->chip = bus_pub->devid;
-@@ -1326,11 +1326,10 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1327,11 +1327,10 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
devinfo->usbdev = usb;
devinfo->dev = &usb->dev;
@@ -163,7 +164,7 @@ index c00b9fd8876b..75fcd6752edc 100644
usb_set_intfdata(intf, devinfo);
-@@ -1408,7 +1407,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1409,7 +1408,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
return 0;
fail:
@@ -172,7 +173,7 @@ index c00b9fd8876b..75fcd6752edc 100644
kfree(devinfo);
usb_set_intfdata(intf, NULL);
return ret;
-@@ -1423,7 +1422,7 @@ brcmf_usb_disconnect(struct usb_interface *intf)
+@@ -1424,7 +1423,7 @@ brcmf_usb_disconnect(struct usb_interface *intf)
devinfo = (struct brcmf_usbdev_info *)usb_get_intfdata(intf);
if (devinfo) {
diff --git a/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch b/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch
index 660c28d..4d2a57c 100644
--- a/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch
+++ b/queue/brcmfmac-fix-Oops-when-bringing-up-interface-during-.patch
@@ -1,4 +1,4 @@
-From 84566eb10bec2c039cf33dfde4b73d6d86abdd35 Mon Sep 17 00:00:00 2001
+From 8c079705a6fd30e32a2ec7facb05b3c4c194cf1f Mon Sep 17 00:00:00 2001
From: Piotr Figiel <p.figiel@camlintechnologies.com>
Date: Wed, 13 Mar 2019 09:52:01 +0000
Subject: [PATCH] brcmfmac: fix Oops when bringing up interface during USB
@@ -85,6 +85,7 @@ Code: e5970328 eb002021 e1a02006 e3a01002 (e5909008)
Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
index 6d1ff9fc278b..c2ed9ceb7b34 100644
diff --git a/queue/brcmfmac-fix-WARNING-during-USB-disconnect-in-case-o.patch b/queue/brcmfmac-fix-WARNING-during-USB-disconnect-in-case-o.patch
index d2e6273..bef7ce8 100644
--- a/queue/brcmfmac-fix-WARNING-during-USB-disconnect-in-case-o.patch
+++ b/queue/brcmfmac-fix-WARNING-during-USB-disconnect-in-case-o.patch
@@ -1,4 +1,4 @@
-From c80d26e81ef1802f30364b4ad1955c1443a592b9 Mon Sep 17 00:00:00 2001
+From 51ab89977d38367a15ed1d3ce0a465bdd347fd7d Mon Sep 17 00:00:00 2001
From: Piotr Figiel <p.figiel@camlintechnologies.com>
Date: Mon, 4 Mar 2019 15:42:49 +0000
Subject: [PATCH] brcmfmac: fix WARNING during USB disconnect in case of
@@ -55,12 +55,13 @@ dfe0: 00000000 00000000 00000000 00000000 00000013 00000000
Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
-index abeb305492e0..d48b8b2d946f 100644
+index f3cbf78c8899..5a0a29c4cdea 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
-@@ -580,24 +580,6 @@ static bool brcmf_fws_ifidx_match(struct sk_buff *skb, void *arg)
+@@ -579,24 +579,6 @@ static bool brcmf_fws_ifidx_match(struct sk_buff *skb, void *arg)
return ifidx == *(int *)arg;
}
@@ -85,7 +86,7 @@ index abeb305492e0..d48b8b2d946f 100644
static void brcmf_fws_hanger_init(struct brcmf_fws_hanger *hanger)
{
int i;
-@@ -669,6 +651,28 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,
+@@ -668,6 +650,28 @@ static inline int brcmf_fws_hanger_poppkt(struct brcmf_fws_hanger *h,
return 0;
}
@@ -114,7 +115,7 @@ index abeb305492e0..d48b8b2d946f 100644
static int brcmf_fws_hanger_mark_suppressed(struct brcmf_fws_hanger *h,
u32 slot_id)
{
-@@ -2200,6 +2204,8 @@ void brcmf_fws_del_interface(struct brcmf_if *ifp)
+@@ -2168,6 +2172,8 @@ void brcmf_fws_del_interface(struct brcmf_if *ifp)
brcmf_fws_lock(fws);
ifp->fws_desc = NULL;
brcmf_dbg(TRACE, "deleting %s\n", entry->name);
diff --git a/queue/brcmfmac-fix-missing-checks-for-kmemdup.patch b/queue/brcmfmac-fix-missing-checks-for-kmemdup.patch
index f3f532e..dba3874 100644
--- a/queue/brcmfmac-fix-missing-checks-for-kmemdup.patch
+++ b/queue/brcmfmac-fix-missing-checks-for-kmemdup.patch
@@ -1,4 +1,4 @@
-From 46953f97224d56a12ccbe9c6acaa84ca0dab2780 Mon Sep 17 00:00:00 2001
+From 25c4dad4ae23e4c985ee8e19463fbf6912df158c Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Fri, 15 Mar 2019 12:04:32 -0500
Subject: [PATCH] brcmfmac: fix missing checks for kmemdup
@@ -11,12 +11,13 @@ conn_info->resp_ie_len to zero to avoid buffer overflows.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index e92f6351bd22..8ee8af4e7ec4 100644
+index bfb3e735dfc2..159e49f23448 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -5464,6 +5464,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
+@@ -5368,6 +5368,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
conn_info->req_ie =
kmemdup(cfg->extra_buf, conn_info->req_ie_len,
GFP_KERNEL);
@@ -25,7 +26,7 @@ index e92f6351bd22..8ee8af4e7ec4 100644
} else {
conn_info->req_ie_len = 0;
conn_info->req_ie = NULL;
-@@ -5480,6 +5482,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
+@@ -5384,6 +5386,8 @@ static s32 brcmf_get_assoc_ies(struct brcmf_cfg80211_info *cfg,
conn_info->resp_ie =
kmemdup(cfg->extra_buf, conn_info->resp_ie_len,
GFP_KERNEL);
diff --git a/queue/brcmfmac-fix-race-during-disconnect-when-USB-complet.patch b/queue/brcmfmac-fix-race-during-disconnect-when-USB-complet.patch
index 9ef25d1..7d9077e 100644
--- a/queue/brcmfmac-fix-race-during-disconnect-when-USB-complet.patch
+++ b/queue/brcmfmac-fix-race-during-disconnect-when-USB-complet.patch
@@ -1,4 +1,4 @@
-From db3b9e2e1d58080d0754bdf9293dabf8c6491b67 Mon Sep 17 00:00:00 2001
+From ba20efd951cbbf21dbd77caa1984ae04f69b0c86 Mon Sep 17 00:00:00 2001
From: Piotr Figiel <p.figiel@camlintechnologies.com>
Date: Fri, 8 Mar 2019 15:25:04 +0000
Subject: [PATCH] brcmfmac: fix race during disconnect when USB completion is
@@ -57,12 +57,13 @@ arrays of requests instead of linked lists.
Signed-off-by: Piotr Figiel <p.figiel@camlintechnologies.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
-index e9cbfd077710..a7754092ef6a 100644
+index 5aeb401d9a02..44ead0fea7c6 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
-@@ -682,12 +682,18 @@ static int brcmf_usb_up(struct device *dev)
+@@ -684,12 +684,18 @@ static int brcmf_usb_up(struct device *dev)
static void brcmf_cancel_all_urbs(struct brcmf_usbdev_info *devinfo)
{
diff --git a/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch b/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch
index 153dd45..1aec765 100644
--- a/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch
+++ b/queue/cgroup-protect-cgroup-nr_-dying_-descendants-by-css_.patch
@@ -1,4 +1,4 @@
-From 59e7564cfc91a1afe6220559bb230d4b043c1ceb Mon Sep 17 00:00:00 2001
+From abeeeb95530e677ab90a976b2c4f90b94fa1663a Mon Sep 17 00:00:00 2001
From: Roman Gushchin <guro@fb.com>
Date: Fri, 19 Apr 2019 10:03:03 -0700
Subject: [PATCH] cgroup: protect cgroup->nr_(dying_)descendants by
@@ -24,6 +24,7 @@ css_set_lock locked, and for changing both locks should be acquired.
Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: kernel-team@fb.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index c2ef1c58624a..4b486a6fe952 100644
diff --git a/queue/chardev-add-additional-check-for-minor-range-overlap.patch b/queue/chardev-add-additional-check-for-minor-range-overlap.patch
index 10738ab..e8b7c5f 100644
--- a/queue/chardev-add-additional-check-for-minor-range-overlap.patch
+++ b/queue/chardev-add-additional-check-for-minor-range-overlap.patch
@@ -1,4 +1,4 @@
-From de36e16d1557a0b6eb328bc3516359a12ba5c25c Mon Sep 17 00:00:00 2001
+From af06b1b59b980aab15ad2bdf603031f839196378 Mon Sep 17 00:00:00 2001
From: Chengguang Xu <cgxu519@gmx.com>
Date: Fri, 15 Feb 2019 20:27:11 +0800
Subject: [PATCH] chardev: add additional check for minor range overlap
@@ -11,6 +11,7 @@ baseminor + minorct > existing baseminor + minorct.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/char_dev.c b/fs/char_dev.c
index a279c58fe360..8a63cfa29005 100644
diff --git a/queue/clk-rockchip-Fix-video-codec-clocks-on-rk3288.patch b/queue/clk-rockchip-Fix-video-codec-clocks-on-rk3288.patch
index 3c95a8e..2b916d3 100644
--- a/queue/clk-rockchip-Fix-video-codec-clocks-on-rk3288.patch
+++ b/queue/clk-rockchip-Fix-video-codec-clocks-on-rk3288.patch
@@ -1,4 +1,4 @@
-From 00c0cd9e59d265b393553e9afa54fee8b10e8158 Mon Sep 17 00:00:00 2001
+From ad51b891aaf2b757f6fc50d4e02601b593fa7aa2 Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Thu, 11 Apr 2019 06:55:55 -0700
Subject: [PATCH] clk: rockchip: Fix video codec clocks on rk3288
@@ -51,12 +51,13 @@ Suggested-by: Jonas Karlman <jonas@kwiboo.se>
Suggested-by: Randy Li <ayaka@soulik.info>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
-index f47d514cba36..94cbcb0aa49f 100644
+index 45cd2897e586..c6cd6d28af56 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
-@@ -219,7 +219,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" };
+@@ -198,7 +198,7 @@ PNAME(mux_hsadcout_p) = { "hsadc_src", "ext_hsadc" };
PNAME(mux_edp_24m_p) = { "ext_edp_24m", "xin24m" };
PNAME(mux_tspout_p) = { "cpll", "gpll", "npll", "xin27m" };
@@ -65,7 +66,7 @@ index f47d514cba36..94cbcb0aa49f 100644
PNAME(mux_usbphy480m_p) = { "sclk_otgphy1_480m", "sclk_otgphy2_480m",
"sclk_otgphy0_480m" };
PNAME(mux_hsicphy480m_p) = { "cpll", "gpll", "usbphy480m_src" };
-@@ -420,7 +420,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
+@@ -399,7 +399,7 @@ static struct rockchip_clk_branch rk3288_clk_branches[] __initdata = {
COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb480m_p, 0,
RK3288_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
RK3288_CLKGATE_CON(3), 11, GFLAGS),
diff --git a/queue/clk-rockchip-Make-rkpwm-a-critical-clock-on-rk3288.patch b/queue/clk-rockchip-Make-rkpwm-a-critical-clock-on-rk3288.patch
index 722988e..165dbc4 100644
--- a/queue/clk-rockchip-Make-rkpwm-a-critical-clock-on-rk3288.patch
+++ b/queue/clk-rockchip-Make-rkpwm-a-critical-clock-on-rk3288.patch
@@ -1,4 +1,4 @@
-From b9d2781126dffedf3d662f03f6d3100316cf61a2 Mon Sep 17 00:00:00 2001
+From 57f7266426c0e5b441eb6d46d44273ba5083aa49 Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Tue, 9 Apr 2019 13:47:06 -0700
Subject: [PATCH] clk: rockchip: Make rkpwm a critical clock on rk3288
@@ -22,6 +22,7 @@ clock rates for both clocks were the same.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index c6cd6d28af56..64191694ff6e 100644
diff --git a/queue/clk-rockchip-undo-several-noc-and-special-clocks-as-.patch b/queue/clk-rockchip-undo-several-noc-and-special-clocks-as-.patch
index 765b241..3b126a5 100644
--- a/queue/clk-rockchip-undo-several-noc-and-special-clocks-as-.patch
+++ b/queue/clk-rockchip-undo-several-noc-and-special-clocks-as-.patch
@@ -1,4 +1,4 @@
-From 6f2df8d3790e9515613468b3339f14811b0c9bea Mon Sep 17 00:00:00 2001
+From 4b30121251df813490f7cc39297cc86a42c16440 Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Fri, 12 Apr 2019 09:17:47 -0700
Subject: [PATCH] clk: rockchip: undo several noc and special clocks as
@@ -61,6 +61,7 @@ kernel which doesn't support DDRFreq.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 450de24a1b42..45cd2897e586 100644
diff --git a/queue/cpufreq-kirkwood-fix-possible-object-reference-leak.patch b/queue/cpufreq-kirkwood-fix-possible-object-reference-leak.patch
index d1232dc..f99acfd 100644
--- a/queue/cpufreq-kirkwood-fix-possible-object-reference-leak.patch
+++ b/queue/cpufreq-kirkwood-fix-possible-object-reference-leak.patch
@@ -1,4 +1,4 @@
-From 7c468966f05ac9c17bb5948275283d34e6fe0660 Mon Sep 17 00:00:00 2001
+From 5a0f294ca5448369175772645354b603bb775957 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Mon, 1 Apr 2019 09:37:50 +0800
Subject: [PATCH] cpufreq: kirkwood: fix possible object reference leak
@@ -25,6 +25,7 @@ Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/cpufreq/kirkwood-cpufreq.c b/drivers/cpufreq/kirkwood-cpufreq.c
index c2dd43f3f5d8..8d63a6dc8383 100644
diff --git a/queue/cpufreq-pasemi-fix-possible-object-reference-leak.patch b/queue/cpufreq-pasemi-fix-possible-object-reference-leak.patch
index 2c83e17..cc99181 100644
--- a/queue/cpufreq-pasemi-fix-possible-object-reference-leak.patch
+++ b/queue/cpufreq-pasemi-fix-possible-object-reference-leak.patch
@@ -1,4 +1,4 @@
-From a9acc26b75f652f697e02a9febe2ab0da648a571 Mon Sep 17 00:00:00 2001
+From 2a5086d90c897e064f0b110e6692a857dd70b94c Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Mon, 1 Apr 2019 09:37:52 +0800
Subject: [PATCH] cpufreq/pasemi: fix possible object reference leak
@@ -20,6 +20,7 @@ Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/cpufreq/pasemi-cpufreq.c b/drivers/cpufreq/pasemi-cpufreq.c
index 75dfbd2a58ea..c7710c149de8 100644
diff --git a/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch b/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch
index 7064702..1346f76 100644
--- a/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch
+++ b/queue/cpufreq-pasemi-fix-use-after-free-in-pas_cpufreq_cpu.patch
@@ -1,4 +1,4 @@
-From 325a6980ed331fcabe7dd5bd074267d8bb6f9805 Mon Sep 17 00:00:00 2001
+From 42fdd84bfc1ac3c0f3b724e62d77b0a193e67bd8 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Wed, 17 Jul 2019 11:55:04 +0800
Subject: [PATCH] cpufreq/pasemi: fix use-after-free in pas_cpufreq_cpu_init()
diff --git a/queue/cpufreq-pmac32-fix-possible-object-reference-leak.patch b/queue/cpufreq-pmac32-fix-possible-object-reference-leak.patch
index 023115b..77ebb2c 100644
--- a/queue/cpufreq-pmac32-fix-possible-object-reference-leak.patch
+++ b/queue/cpufreq-pmac32-fix-possible-object-reference-leak.patch
@@ -1,4 +1,4 @@
-From 8d10dc28a9ea6e8c02e825dab28699f3c72b02d9 Mon Sep 17 00:00:00 2001
+From 8041bc8fabafa4fa5d1aacb262dc0f15915b1bbe Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Mon, 1 Apr 2019 09:37:53 +0800
Subject: [PATCH] cpufreq: pmac32: fix possible object reference leak
@@ -24,9 +24,10 @@ Cc: linux-pm@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
-index 52f0d91d30c1..9b4ce2eb8222 100644
+index 61ae06ca008e..e225edb5c359 100644
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -552,6 +552,7 @@ static int pmac_cpufreq_init_7447A(struct device_node *cpunode)
diff --git a/queue/cpufreq-ppc_cbe-fix-possible-object-reference-leak.patch b/queue/cpufreq-ppc_cbe-fix-possible-object-reference-leak.patch
index 0d424a7..8fc1304 100644
--- a/queue/cpufreq-ppc_cbe-fix-possible-object-reference-leak.patch
+++ b/queue/cpufreq-ppc_cbe-fix-possible-object-reference-leak.patch
@@ -1,4 +1,4 @@
-From 233298032803f2802fe99892d0de4ab653bfece4 Mon Sep 17 00:00:00 2001
+From bfcc8db2b5f357286e99a6a0925687dec5931bb6 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Mon, 1 Apr 2019 09:37:54 +0800
Subject: [PATCH] cpufreq: ppc_cbe: fix possible object reference leak
@@ -19,6 +19,7 @@ Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/cpufreq/ppc_cbe_cpufreq.c b/drivers/cpufreq/ppc_cbe_cpufreq.c
index 41a0f0be3f9f..8414c3a4ea08 100644
diff --git a/queue/cxgb3-l2t-Fix-undefined-behaviour.patch b/queue/cxgb3-l2t-Fix-undefined-behaviour.patch
index 6900a26..53f8dda 100644
--- a/queue/cxgb3-l2t-Fix-undefined-behaviour.patch
+++ b/queue/cxgb3-l2t-Fix-undefined-behaviour.patch
@@ -1,4 +1,4 @@
-From 76497732932f15e7323dc805e8ea8dc11bb587cf Mon Sep 17 00:00:00 2001
+From a1cf771ca41e3fff77211313d4e02d5b228e263c Mon Sep 17 00:00:00 2001
From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
Date: Fri, 29 Mar 2019 10:27:26 -0500
Subject: [PATCH] cxgb3/l2t: Fix undefined behaviour
@@ -25,6 +25,7 @@ to cultivate a high-quality code.
Fixes: e48f129c2f20 ("[SCSI] cxgb3i: convert cdev->l2opt to use rcu to prevent NULL dereference")
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
index c2fd323c4078..ea75f275023f 100644
diff --git a/queue/dmaengine-at_xdmac-remove-BUG_ON-macro-in-tasklet.patch b/queue/dmaengine-at_xdmac-remove-BUG_ON-macro-in-tasklet.patch
index 771e9c2..2425c33 100644
--- a/queue/dmaengine-at_xdmac-remove-BUG_ON-macro-in-tasklet.patch
+++ b/queue/dmaengine-at_xdmac-remove-BUG_ON-macro-in-tasklet.patch
@@ -1,4 +1,4 @@
-From e2c114c06da2d9ffad5b16690abf008d6696f689 Mon Sep 17 00:00:00 2001
+From df50058c66806fc2b1d454d5b8b8ef016d27650e Mon Sep 17 00:00:00 2001
From: Nicolas Ferre <nicolas.ferre@microchip.com>
Date: Wed, 3 Apr 2019 12:23:57 +0200
Subject: [PATCH] dmaengine: at_xdmac: remove BUG_ON macro in tasklet
@@ -13,9 +13,10 @@ just finish the tasklet call.
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Acked-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
-index fe69dccfa0c0..37a269420435 100644
+index a75b95fac3bd..db5b8fe1dd4a 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1606,7 +1606,11 @@ static void at_xdmac_tasklet(unsigned long data)
diff --git a/queue/dmaengine-tegra210-adma-use-devm_clk_-helpers.patch b/queue/dmaengine-tegra210-adma-use-devm_clk_-helpers.patch
index b79ecf2..2c8be54 100644
--- a/queue/dmaengine-tegra210-adma-use-devm_clk_-helpers.patch
+++ b/queue/dmaengine-tegra210-adma-use-devm_clk_-helpers.patch
@@ -1,4 +1,4 @@
-From f6ed6491d565c336a360471e0c29228e34f4380e Mon Sep 17 00:00:00 2001
+From 06ab4fca0a4381878ceb867db96005124df30f18 Mon Sep 17 00:00:00 2001
From: Sameer Pujar <spujar@nvidia.com>
Date: Wed, 13 Mar 2019 17:02:36 +0530
Subject: [PATCH] dmaengine: tegra210-adma: use devm_clk_*() helpers
@@ -18,9 +18,10 @@ Suggested-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
Signed-off-by: Sameer Pujar <spujar@nvidia.com>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
-index 5ec0dd97b397..650cd9c6974e 100644
+index 08b10274284a..09b6756366c3 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -22,7 +22,6 @@
@@ -65,7 +66,7 @@ index 5ec0dd97b397..650cd9c6974e 100644
tdma_write(tdma, ADMA_GLOBAL_CMD, tdma->global_cmd);
return 0;
-@@ -693,13 +695,11 @@ static int tegra_adma_probe(struct platform_device *pdev)
+@@ -692,13 +694,11 @@ static int tegra_adma_probe(struct platform_device *pdev)
if (IS_ERR(tdma->base_addr))
return PTR_ERR(tdma->base_addr);
@@ -84,7 +85,7 @@ index 5ec0dd97b397..650cd9c6974e 100644
pm_runtime_enable(&pdev->dev);
-@@ -776,8 +776,6 @@ rpm_put:
+@@ -775,8 +775,6 @@ static int tegra_adma_probe(struct platform_device *pdev)
pm_runtime_put_sync(&pdev->dev);
rpm_disable:
pm_runtime_disable(&pdev->dev);
diff --git a/queue/drm-Wake-up-next-in-drm_read-chain-if-we-are-forced-.patch b/queue/drm-Wake-up-next-in-drm_read-chain-if-we-are-forced-.patch
index bec726f..b116d24 100644
--- a/queue/drm-Wake-up-next-in-drm_read-chain-if-we-are-forced-.patch
+++ b/queue/drm-Wake-up-next-in-drm_read-chain-if-we-are-forced-.patch
@@ -1,4 +1,4 @@
-From 60b801999c48b6c1dd04e653a38e2e613664264e Mon Sep 17 00:00:00 2001
+From 46cbafce163548ca1c04a958674f99c2ebc16521 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 4 Aug 2017 09:23:28 +0100
Subject: [PATCH] drm: Wake up next in drm_read() chain if we are forced to
@@ -21,12 +21,13 @@ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170804082328.17173-1-chris@chris-wilson.co.uk
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
-index ee4df8f8a62d..f782d3103d29 100644
+index ef753fb1c791..60b9b8057d35 100644
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
-@@ -567,6 +567,7 @@ put_back_event:
+@@ -523,6 +523,7 @@ ssize_t drm_read(struct file *filp, char __user *buffer,
file_priv->event_space -= length;
list_add(&e->link, &file_priv->event_list);
spin_unlock_irq(&dev->event_lock);
diff --git a/queue/drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch b/queue/drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch
index 65e84b0..293f0cf 100644
--- a/queue/drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch
+++ b/queue/drm-amd-display-Fix-Divide-by-0-in-memory-calculatio.patch
@@ -1,4 +1,4 @@
-From 59979bf8be1784ebfc44215031c6c88ca22ae65d Mon Sep 17 00:00:00 2001
+From 00af6b7e122bd30664368b736aa564bcc1e6489c Mon Sep 17 00:00:00 2001
From: Murton Liu <murton.liu@amd.com>
Date: Fri, 15 Feb 2019 15:05:43 -0500
Subject: [PATCH] drm/amd/display: Fix Divide by 0 in memory calculations
@@ -12,9 +12,10 @@ Reviewed-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Acked-by: Sivapiriyan Kumarasamy <Sivapiriyan.Kumarasamy@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
-index c7642e748297..ce21a290bf3e 100644
+index f862fd148cca..649a11d7be6b 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
@@ -406,15 +406,25 @@ void dpp1_dscl_calc_lb_num_partitions(
diff --git a/queue/drm-amd-display-Set-stream-mode_changed-when-connect.patch b/queue/drm-amd-display-Set-stream-mode_changed-when-connect.patch
index ea92634..5add4f5 100644
--- a/queue/drm-amd-display-Set-stream-mode_changed-when-connect.patch
+++ b/queue/drm-amd-display-Set-stream-mode_changed-when-connect.patch
@@ -1,4 +1,4 @@
-From b9952f93cd2cf5fca82b06a8179c0f5f7b769e83 Mon Sep 17 00:00:00 2001
+From 527773d7d00756aacece2e687c3324a7688c42d7 Mon Sep 17 00:00:00 2001
From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Date: Fri, 8 Feb 2019 13:21:05 -0500
Subject: [PATCH] drm/amd/display: Set stream->mode_changed when connectors
@@ -33,12 +33,13 @@ Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Sun peng Li <Sunpeng.Li@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index f9b57d32636b..b7cc14683065 100644
+index 5f7f7fae3cbc..6eac2441e67b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -4922,8 +4922,7 @@ cleanup:
+@@ -4228,8 +4228,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
static void amdgpu_dm_crtc_copy_transient_flags(struct drm_crtc_state *crtc_state,
struct dc_stream_state *stream_state)
{
diff --git a/queue/drm-amd-display-fix-releasing-planes-when-exiting-od.patch b/queue/drm-amd-display-fix-releasing-planes-when-exiting-od.patch
index abc4789..4a72828 100644
--- a/queue/drm-amd-display-fix-releasing-planes-when-exiting-od.patch
+++ b/queue/drm-amd-display-fix-releasing-planes-when-exiting-od.patch
@@ -1,4 +1,4 @@
-From bc2193992b00488f5734613ac95b78ef2d2803ab Mon Sep 17 00:00:00 2001
+From e28204147f6b8dfafa1f1d602a690f04746d6214 Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Thu, 7 Mar 2019 13:26:13 -0500
Subject: [PATCH] drm/amd/display: fix releasing planes when exiting odm
@@ -13,12 +13,13 @@ Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-index 79e760ac3600..ec0e2ad5f1c3 100644
+index b2c98871e90c..a1048ccde708 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
-@@ -1293,10 +1293,12 @@ bool dc_remove_plane_from_context(
+@@ -1242,10 +1242,12 @@ bool dc_remove_plane_from_context(
* For head pipe detach surfaces from pipe for tail
* pipe just zero it out
*/
diff --git a/queue/drm-amdgpu-fix-old-fence-check-in-amdgpu_fence_emit.patch b/queue/drm-amdgpu-fix-old-fence-check-in-amdgpu_fence_emit.patch
index a3e41c4..75b2df6 100644
--- a/queue/drm-amdgpu-fix-old-fence-check-in-amdgpu_fence_emit.patch
+++ b/queue/drm-amdgpu-fix-old-fence-check-in-amdgpu_fence_emit.patch
@@ -1,4 +1,4 @@
-From 3d2aca8c8620346abdba96c6300d2c0b90a1d0cc Mon Sep 17 00:00:00 2001
+From 71d2aa75219781dcc90b83049836d8cb8c58ec4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
Date: Fri, 29 Mar 2019 19:30:23 +0100
Subject: [PATCH] drm/amdgpu: fix old fence check in amdgpu_fence_emit
@@ -14,9 +14,10 @@ any time we are waiting for it to signal.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Chunming Zhou <david1.zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
-index ee47c11e92ce..4dee2326b29c 100644
+index e74d620d9699..c682906685b2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
@@ -136,8 +136,9 @@ int amdgpu_fence_emit(struct amdgpu_ring *ring, struct dma_fence **f,
diff --git a/queue/drm-drv-Hold-ref-on-parent-device-during-drm_device-.patch b/queue/drm-drv-Hold-ref-on-parent-device-during-drm_device-.patch
index 7b68da1..18b8fd4 100644
--- a/queue/drm-drv-Hold-ref-on-parent-device-during-drm_device-.patch
+++ b/queue/drm-drv-Hold-ref-on-parent-device-during-drm_device-.patch
@@ -1,4 +1,4 @@
-From cc2d829bfd5d5e7bf2a50facb0cb03a2804ecf54 Mon Sep 17 00:00:00 2001
+From 0bcb00fab4b47767fdca02c30be1337e1860ee4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Mon, 25 Feb 2019 15:42:26 +0100
Subject: [PATCH] drm/drv: Hold ref on parent device during drm_device lifetime
@@ -14,6 +14,7 @@ been removed/unplugged.
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190225144232.20761-2-noralf@tronnes.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 14356b24ab21..5b02ad629f28 100644
diff --git a/queue/drm-etnaviv-avoid-DMA-API-warning-when-importing-buf.patch b/queue/drm-etnaviv-avoid-DMA-API-warning-when-importing-buf.patch
index 64dfe46..279e5dc 100644
--- a/queue/drm-etnaviv-avoid-DMA-API-warning-when-importing-buf.patch
+++ b/queue/drm-etnaviv-avoid-DMA-API-warning-when-importing-buf.patch
@@ -1,4 +1,4 @@
-From 1262cc8893ecb0eb2c21e042d0d268cc180edb61 Mon Sep 17 00:00:00 2001
+From e2fb3eb4714179ae8604fe5896c1ac28a6272372 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Mon, 25 Feb 2019 10:51:30 +0000
Subject: [PATCH] drm: etnaviv: avoid DMA API warning when importing buffers
@@ -46,12 +46,13 @@ is set to 2GiB to cover the window found in MMUv1 GPUs.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
-index 18c27f795cf6..3156450723ba 100644
+index 540b59fb4103..a6babcf5c8f1 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
-@@ -515,6 +515,9 @@ static int etnaviv_bind(struct device *dev)
+@@ -528,6 +528,9 @@ static int etnaviv_bind(struct device *dev)
}
drm->dev_private = priv;
@@ -61,7 +62,7 @@ index 18c27f795cf6..3156450723ba 100644
mutex_init(&priv->gem_lock);
INIT_LIST_HEAD(&priv->gem_list);
priv->num_gpus = 0;
-@@ -552,6 +555,8 @@ static void etnaviv_unbind(struct device *dev)
+@@ -565,6 +568,8 @@ static void etnaviv_unbind(struct device *dev)
component_unbind_all(dev, drm);
@@ -71,7 +72,7 @@ index 18c27f795cf6..3156450723ba 100644
kfree(priv);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
-index a6a7ded37ef1..6a4ea127c4f1 100644
+index d36c7bbe66db..6a02661c9e4f 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h
@@ -42,6 +42,7 @@ struct etnaviv_file_private {
diff --git a/queue/drm-msm-a5xx-fix-possible-object-reference-leak.patch b/queue/drm-msm-a5xx-fix-possible-object-reference-leak.patch
index 607f084..2914c23 100644
--- a/queue/drm-msm-a5xx-fix-possible-object-reference-leak.patch
+++ b/queue/drm-msm-a5xx-fix-possible-object-reference-leak.patch
@@ -1,4 +1,4 @@
-From 6cd5235c3135ea84b32469ea51b2aae384eda8af Mon Sep 17 00:00:00 2001
+From 01d22f1b54f54479262210187318fc4fe089e061 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Thu, 4 Apr 2019 00:04:11 +0800
Subject: [PATCH] drm/msm: a5xx: fix possible object reference leak
@@ -33,12 +33,13 @@ Cc: linux-kernel@vger.kernel.org (open list)
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
-index d5f5e56422f5..270da14cba67 100644
+index d39400e5bc42..06cda44cb064 100644
--- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
-@@ -34,7 +34,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname)
+@@ -32,7 +32,7 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname)
{
struct device *dev = &gpu->pdev->dev;
const struct firmware *fw;
@@ -47,7 +48,7 @@ index d5f5e56422f5..270da14cba67 100644
struct resource r;
phys_addr_t mem_phys;
ssize_t mem_size;
-@@ -48,11 +48,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname)
+@@ -46,11 +46,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname)
if (!np)
return -ENODEV;
diff --git a/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch b/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch
index 7f0363c..a7884bf 100644
--- a/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch
+++ b/queue/drm-omap-dsi-Fix-PM-for-display-blank-with-paired-ds.patch
@@ -1,4 +1,4 @@
-From 7840e7b2bc4d5ae079adfe5f88c18d2fe8bc06af Mon Sep 17 00:00:00 2001
+From 80312f60d4d05116e169aad4c3961cd5b49d7b49 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 7 Feb 2019 07:45:16 -0800
Subject: [PATCH] drm/omap: dsi: Fix PM for display blank with paired dss_pll
@@ -35,6 +35,7 @@ slight renumbering of the error path for dsi_display_init_dsi().
Suggested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index d4a680629825..516a7cca75e8 100644
diff --git a/queue/drm-panel-otm8009a-Add-delay-at-the-end-of-initializ.patch b/queue/drm-panel-otm8009a-Add-delay-at-the-end-of-initializ.patch
index e17f7e8..216bbc8 100644
--- a/queue/drm-panel-otm8009a-Add-delay-at-the-end-of-initializ.patch
+++ b/queue/drm-panel-otm8009a-Add-delay-at-the-end-of-initializ.patch
@@ -1,4 +1,4 @@
-From 0084c3c71126fc878c6dab8a6ab8ecc484c2be02 Mon Sep 17 00:00:00 2001
+From d92229fccef461eaa5eef35dde9c22ed3649c00c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yannick=20Fertr=C3=A9?= <yannick.fertre@st.com>
Date: Thu, 21 Mar 2019 09:04:05 +0100
Subject: [PATCH] drm/panel: otm8009a: Add delay at the end of initialization
@@ -17,12 +17,13 @@ Reviewed-by: Philippe Cornu <philippe.cornu@st.com>
Tested-by: Philippe Cornu <philippe.cornu@st.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1553155445-13407-1-git-send-email-yannick.fertre@st.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
-index 87fa316e1d7b..58ccf648b70f 100644
+index 90f1ae4af93c..42f8d587b12f 100644
--- a/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
+++ b/drivers/gpu/drm/panel/panel-orisetech-otm8009a.c
-@@ -248,6 +248,9 @@ static int otm8009a_init_sequence(struct otm8009a *ctx)
+@@ -236,6 +236,9 @@ static int otm8009a_init_sequence(struct otm8009a *ctx)
/* Send Command GRAM memory write (no parameters) */
dcs_write_seq(ctx, MIPI_DCS_WRITE_MEMORY_START);
diff --git a/queue/drm-pl111-fix-possible-object-reference-leak.patch b/queue/drm-pl111-fix-possible-object-reference-leak.patch
index 375a753..b4ff055 100644
--- a/queue/drm-pl111-fix-possible-object-reference-leak.patch
+++ b/queue/drm-pl111-fix-possible-object-reference-leak.patch
@@ -1,4 +1,4 @@
-From bc29d3a69d4c1bd1a103e8b3c1ed81b807c1870b Mon Sep 17 00:00:00 2001
+From 651475937f0660c9e901857ff0596e25bde5130f Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Thu, 4 Apr 2019 00:04:13 +0800
Subject: [PATCH] drm/pl111: fix possible object reference leak
@@ -25,6 +25,7 @@ Cc: dri-devel@lists.freedesktop.org (open list:DRM DRIVERS)
Cc: linux-kernel@vger.kernel.org (open list)
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/1554307455-40361-6-git-send-email-wen.yang99@zte.com.cn
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/pl111/pl111_versatile.c b/drivers/gpu/drm/pl111/pl111_versatile.c
index b9baefdba38a..1c318ad32a8c 100644
diff --git a/queue/drm-sun4i-dsi-Change-the-start-delay-calculation.patch b/queue/drm-sun4i-dsi-Change-the-start-delay-calculation.patch
index f5106c4..75ef39c 100644
--- a/queue/drm-sun4i-dsi-Change-the-start-delay-calculation.patch
+++ b/queue/drm-sun4i-dsi-Change-the-start-delay-calculation.patch
@@ -1,4 +1,4 @@
-From da676c6aa6413d59ab0a80c97bbc273025e640b2 Mon Sep 17 00:00:00 2001
+From 944d224bbd87011d2d7d718b17922da9a0ed4aa5 Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@bootlin.com>
Date: Mon, 11 Feb 2019 15:41:23 +0100
Subject: [PATCH] drm/sun4i: dsi: Change the start delay calculation
@@ -21,9 +21,10 @@ timeouts with vertical white stripes at the bottom of the panel).
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/6e5f72e68f47ca0223877464bf12f0c3f3978de8.1549896081.git-series.maxime.ripard@bootlin.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-index 318994cd1b85..25d8cb9f9266 100644
+index d4e7d16a2514..7072221bd008 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -358,7 +358,9 @@ static void sun6i_dsi_inst_init(struct sun6i_dsi *dsi,
diff --git a/queue/drm-sun4i-dsi-Enforce-boundaries-on-the-start-delay.patch b/queue/drm-sun4i-dsi-Enforce-boundaries-on-the-start-delay.patch
index a6a4f83..07c62b2 100644
--- a/queue/drm-sun4i-dsi-Enforce-boundaries-on-the-start-delay.patch
+++ b/queue/drm-sun4i-dsi-Enforce-boundaries-on-the-start-delay.patch
@@ -1,4 +1,4 @@
-From efa31801203ac2f5c6a82a28cb991c7163ee0f1d Mon Sep 17 00:00:00 2001
+From 3d0828f5d5a243bcbdc9b638ebf36ae9e953efdf Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@bootlin.com>
Date: Mon, 11 Feb 2019 15:41:24 +0100
Subject: [PATCH] drm/sun4i: dsi: Enforce boundaries on the start delay
@@ -14,9 +14,10 @@ so make sure we enforce the same boundaries.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/c9889cf5f7a3d101ef380905900b45a182596f56.1549896081.git-series.maxime.ripard@bootlin.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-index 25d8cb9f9266..869e0aedf343 100644
+index 7072221bd008..3439c2479f8c 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -359,8 +359,12 @@ static u16 sun6i_dsi_get_video_start_delay(struct sun6i_dsi *dsi,
diff --git a/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch b/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch
index 7abff85..f9ce7fc 100644
--- a/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch
+++ b/queue/drm-v3d-Handle-errors-from-IRQ-setup.patch
@@ -1,4 +1,4 @@
-From 8e31d2ea8c200d244d6c1ab57f09ca335d6b4d46 Mon Sep 17 00:00:00 2001
+From 9481cd3064cef63033b2f3bfd9a082319f6147f0 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Fri, 8 Mar 2019 09:43:35 -0800
Subject: [PATCH] drm/v3d: Handle errors from IRQ setup.
@@ -10,6 +10,7 @@ Noted in review by Dave Emett for V3D 4.2 support.
Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190308174336.7866-1-eric@anholt.net
Reviewed-by: Dave Emett <david.emett@broadcom.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
index cdb582043b4f..7d3da9638cac 100644
diff --git a/queue/e1000e-Disable-runtime-PM-on-CNP.patch b/queue/e1000e-Disable-runtime-PM-on-CNP.patch
index 5682291..aa13cc5 100644
--- a/queue/e1000e-Disable-runtime-PM-on-CNP.patch
+++ b/queue/e1000e-Disable-runtime-PM-on-CNP.patch
@@ -1,4 +1,4 @@
-From 459d69c407f9ba122f12216555c3012284dc9fd7 Mon Sep 17 00:00:00 2001
+From 2b6f516d05799998638b4f40cad3c53e4b0cd4ef Mon Sep 17 00:00:00 2001
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Sun, 3 Feb 2019 01:40:16 +0800
Subject: [PATCH] e1000e: Disable runtime PM on CNP+
@@ -21,12 +21,13 @@ Bugzilla: https://bugzilla.kernel.org/attachment.cgi?id=280819
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
-index ae68d5685c10..745c1242a2d9 100644
+index 8b11682ebba2..8cd339c92c1a 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
-@@ -7350,7 +7350,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -7329,7 +7329,7 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dev_pm_set_driver_flags(&pdev->dev, DPM_FLAG_NEVER_SKIP);
diff --git a/queue/extcon-arizona-Disable-mic-detect-if-running-when-dr.patch b/queue/extcon-arizona-Disable-mic-detect-if-running-when-dr.patch
index 22d4c1f..633a067 100644
--- a/queue/extcon-arizona-Disable-mic-detect-if-running-when-dr.patch
+++ b/queue/extcon-arizona-Disable-mic-detect-if-running-when-dr.patch
@@ -1,4 +1,4 @@
-From 00053de52231117ddc154042549f2256183ffb86 Mon Sep 17 00:00:00 2001
+From fb6120e4deacfe1c8205d1e73451f42912baafb5 Mon Sep 17 00:00:00 2001
From: Charles Keepax <ckeepax@opensource.cirrus.com>
Date: Thu, 4 Apr 2019 17:33:56 +0100
Subject: [PATCH] extcon: arizona: Disable mic detect if running when driver is
@@ -18,6 +18,7 @@ runtime reference that was currently held.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index da0e9bc4262f..9327479c719c 100644
diff --git a/queue/hwmon-f71805f-Use-request_muxed_region-for-Super-IO-.patch b/queue/hwmon-f71805f-Use-request_muxed_region-for-Super-IO-.patch
index a6e6988..34338ee 100644
--- a/queue/hwmon-f71805f-Use-request_muxed_region-for-Super-IO-.patch
+++ b/queue/hwmon-f71805f-Use-request_muxed_region-for-Super-IO-.patch
@@ -1,4 +1,4 @@
-From 73e6ff71a7ea924fb7121d576a2d41e3be3fc6b5 Mon Sep 17 00:00:00 2001
+From cb33b5c0891cd301e0344b2129c3f5a5cf818be4 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Thu, 4 Apr 2019 10:52:43 -0700
Subject: [PATCH] hwmon: (f71805f) Use request_muxed_region for Super-IO
@@ -31,6 +31,7 @@ Reported-by: John Garry <john.garry@huawei.com>
Cc: John Garry <john.garry@huawei.com>
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 73c681162653..623736d2a7c1 100644
@@ -61,7 +62,7 @@ index 73c681162653..623736d2a7c1 100644
}
/*
-@@ -1561,7 +1567,7 @@ exit:
+@@ -1561,7 +1567,7 @@ static int __init f71805f_device_add(unsigned short address,
static int __init f71805f_find(int sioaddr, unsigned short *address,
struct f71805f_sio_data *sio_data)
{
diff --git a/queue/hwmon-pc87427-Use-request_muxed_region-for-Super-IO-.patch b/queue/hwmon-pc87427-Use-request_muxed_region-for-Super-IO-.patch
index de2a3a8..9652c7b 100644
--- a/queue/hwmon-pc87427-Use-request_muxed_region-for-Super-IO-.patch
+++ b/queue/hwmon-pc87427-Use-request_muxed_region-for-Super-IO-.patch
@@ -1,4 +1,4 @@
-From 755a9b0f8aaa5639ba5671ca50080852babb89ce Mon Sep 17 00:00:00 2001
+From 799ba2eb97d95de2fd15128fb56dd793179baf56 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Thu, 4 Apr 2019 11:16:20 -0700
Subject: [PATCH] hwmon: (pc87427) Use request_muxed_region for Super-IO
@@ -21,9 +21,10 @@ Reported-by: John Garry <john.garry@huawei.com>
Cc: John Garry <john.garry@huawei.com>
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c
-index d1a3f2040c00..58eee8fa3e6d 100644
+index dc5a9d5ada51..81a05cd1a512 100644
--- a/drivers/hwmon/pc87427.c
+++ b/drivers/hwmon/pc87427.c
@@ -106,6 +106,13 @@ static const char *logdev_str[2] = { DRVNAME " FMC", DRVNAME " HMC" };
@@ -48,7 +49,7 @@ index d1a3f2040c00..58eee8fa3e6d 100644
}
/*
-@@ -1195,7 +1203,11 @@ static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data)
+@@ -1220,7 +1228,11 @@ static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data)
{
u16 val;
u8 cfg, cfg_b;
diff --git a/queue/hwmon-smsc47b397-Use-request_muxed_region-for-Super-.patch b/queue/hwmon-smsc47b397-Use-request_muxed_region-for-Super-.patch
index 44ef870..d825cbd 100644
--- a/queue/hwmon-smsc47b397-Use-request_muxed_region-for-Super-.patch
+++ b/queue/hwmon-smsc47b397-Use-request_muxed_region-for-Super-.patch
@@ -1,4 +1,4 @@
-From 8c0826756744c0ac1df600a5e4cca1a341b13101 Mon Sep 17 00:00:00 2001
+From abc836c6050b7523fa6bd79f4470f7a1ab840ec5 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Thu, 4 Apr 2019 11:22:42 -0700
Subject: [PATCH] hwmon: (smsc47b397) Use request_muxed_region for Super-IO
@@ -21,9 +21,10 @@ Reported-by: John Garry <john.garry@huawei.com>
Cc: John Garry <john.garry@huawei.com>
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
-index c0775084dde0..60e193f2e970 100644
+index 6bd200756560..cbdb5c4991ae 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -72,14 +72,19 @@ static inline void superio_select(int ld)
diff --git a/queue/hwmon-smsc47m1-Use-request_muxed_region-for-Super-IO.patch b/queue/hwmon-smsc47m1-Use-request_muxed_region-for-Super-IO.patch
index 7794ab2..5798b38 100644
--- a/queue/hwmon-smsc47m1-Use-request_muxed_region-for-Super-IO.patch
+++ b/queue/hwmon-smsc47m1-Use-request_muxed_region-for-Super-IO.patch
@@ -1,4 +1,4 @@
-From d6410408ad2a798c4cc685252c1baa713be0ad69 Mon Sep 17 00:00:00 2001
+From 66bc6a839e86cd494d755f3352faf9b0884ad499 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Thu, 4 Apr 2019 11:28:37 -0700
Subject: [PATCH] hwmon: (smsc47m1) Use request_muxed_region for Super-IO
@@ -21,9 +21,10 @@ Reported-by: John Garry <john.garry@huawei.com>
Cc: John Garry <john.garry@huawei.com>
Acked-by: John Garry <john.garry@huawei.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
-index 5d0c6eaae6f2..5f92eab24c62 100644
+index c7b6a425e2c0..5eeac9853d0a 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -73,16 +73,21 @@ superio_inb(int reg)
@@ -49,7 +50,7 @@ index 5d0c6eaae6f2..5f92eab24c62 100644
}
#define SUPERIO_REG_ACT 0x30
-@@ -535,8 +540,12 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)
+@@ -531,8 +536,12 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)
{
u8 val;
unsigned short addr;
@@ -63,7 +64,7 @@ index 5d0c6eaae6f2..5f92eab24c62 100644
val = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
/*
-@@ -612,13 +621,14 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)
+@@ -608,13 +617,14 @@ static int __init smsc47m1_find(struct smsc47m1_sio_data *sio_data)
static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
{
if ((sio_data->activate & 0x01) == 0) {
diff --git a/queue/hwmon-vt1211-Use-request_muxed_region-for-Super-IO-a.patch b/queue/hwmon-vt1211-Use-request_muxed_region-for-Super-IO-a.patch
index c2f10d7..c496c5f 100644
--- a/queue/hwmon-vt1211-Use-request_muxed_region-for-Super-IO-a.patch
+++ b/queue/hwmon-vt1211-Use-request_muxed_region-for-Super-IO-a.patch
@@ -1,4 +1,4 @@
-From 14b97ba5c20056102b3dd22696bf17b057e60976 Mon Sep 17 00:00:00 2001
+From 9df2c51ed1de87d9f6dd7e0d6108a8699d0b872c Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Fri, 5 Apr 2019 08:53:08 -0700
Subject: [PATCH] hwmon: (vt1211) Use request_muxed_region for Super-IO
@@ -17,6 +17,7 @@ is synchronized.
Fixes: 2219cd81a6cd ("hwmon/vt1211: Add probing of alternate config index port")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index 3a6bfa51cb94..95d5e8ec8b7f 100644
@@ -45,7 +46,7 @@ index 3a6bfa51cb94..95d5e8ec8b7f 100644
}
/* ---------------------------------------------------------------------
-@@ -1282,11 +1288,14 @@ EXIT:
+@@ -1282,11 +1288,14 @@ static int __init vt1211_device_add(unsigned short address)
static int __init vt1211_find(int sio_cip, unsigned short *address)
{
diff --git a/queue/hwrng-omap-Set-default-quality.patch b/queue/hwrng-omap-Set-default-quality.patch
index 12e05dd..544d1e0 100644
--- a/queue/hwrng-omap-Set-default-quality.patch
+++ b/queue/hwrng-omap-Set-default-quality.patch
@@ -1,4 +1,4 @@
-From 62f95ae805fa9e1e84d47d3219adddd97b2654b7 Mon Sep 17 00:00:00 2001
+From f0f5be4a8db474c8ec0a5e61714069851d7b6f78 Mon Sep 17 00:00:00 2001
From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Date: Mon, 11 Mar 2019 11:58:57 +0100
Subject: [PATCH] hwrng: omap - Set default quality
@@ -20,6 +20,7 @@ hwrng as an entropy source at boot.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index b65ff6962899..e9b6ac61fb7f 100644
diff --git a/queue/i40e-Able-to-add-up-to-16-MAC-filters-on-an-untruste.patch b/queue/i40e-Able-to-add-up-to-16-MAC-filters-on-an-untruste.patch
index 166f0b3..df89720 100644
--- a/queue/i40e-Able-to-add-up-to-16-MAC-filters-on-an-untruste.patch
+++ b/queue/i40e-Able-to-add-up-to-16-MAC-filters-on-an-untruste.patch
@@ -1,4 +1,4 @@
-From 06b6e2a2333eb3581567a7ac43ca465ef45f4daa Mon Sep 17 00:00:00 2001
+From 898348be7a4e92298fab658663842e09ce3a7125 Mon Sep 17 00:00:00 2001
From: Adam Ludkiewicz <adam.ludkiewicz@intel.com>
Date: Wed, 6 Feb 2019 15:08:25 -0800
Subject: [PATCH] i40e: Able to add up to 16 MAC filters on an untrusted VF
@@ -14,12 +14,13 @@ broadcast).
Signed-off-by: Adam Ludkiewicz <adam.ludkiewicz@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
-index 831d52bc3c9a..71cd159e7902 100644
+index c6d24eaede18..d86f3fa7aa6a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
-@@ -2454,8 +2454,10 @@ error_param:
+@@ -2399,8 +2399,10 @@ static int i40e_vc_get_stats_msg(struct i40e_vf *vf, u8 *msg, u16 msglen)
(u8 *)&stats, sizeof(stats));
}
diff --git a/queue/i40e-don-t-allow-changes-to-HW-VLAN-stripping-on-act.patch b/queue/i40e-don-t-allow-changes-to-HW-VLAN-stripping-on-act.patch
index 20c7e4f..e40cf26 100644
--- a/queue/i40e-don-t-allow-changes-to-HW-VLAN-stripping-on-act.patch
+++ b/queue/i40e-don-t-allow-changes-to-HW-VLAN-stripping-on-act.patch
@@ -1,4 +1,4 @@
-From bfb0ebed53857cfc57f11c63fa3689940d71c1c8 Mon Sep 17 00:00:00 2001
+From 71d1baa09fd937501c1b8acbb443971bc23fc548 Mon Sep 17 00:00:00 2001
From: Nicholas Nunley <nicholas.d.nunley@intel.com>
Date: Wed, 6 Feb 2019 15:08:17 -0800
Subject: [PATCH] i40e: don't allow changes to HW VLAN stripping on active port
@@ -12,12 +12,13 @@ so don't allow this.
Signed-off-by: Nicholas Nunley <nicholas.d.nunley@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
-index 9de18aa8fa86..ba6c65555235 100644
+index 2fb430f78e9a..8da9d58b9a25 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
-@@ -2654,6 +2654,10 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)
+@@ -2653,6 +2653,10 @@ void i40e_vlan_stripping_enable(struct i40e_vsi *vsi)
struct i40e_vsi_context ctxt;
i40e_status ret;
@@ -28,7 +29,7 @@ index 9de18aa8fa86..ba6c65555235 100644
if ((vsi->info.valid_sections &
cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) &&
((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_MODE_MASK) == 0))
-@@ -2684,6 +2688,10 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)
+@@ -2683,6 +2687,10 @@ void i40e_vlan_stripping_disable(struct i40e_vsi *vsi)
struct i40e_vsi_context ctxt;
i40e_status ret;
diff --git a/queue/igb-Exclude-device-from-suspend-direct-complete-opti.patch b/queue/igb-Exclude-device-from-suspend-direct-complete-opti.patch
index 1600c83..e0202d9 100644
--- a/queue/igb-Exclude-device-from-suspend-direct-complete-opti.patch
+++ b/queue/igb-Exclude-device-from-suspend-direct-complete-opti.patch
@@ -1,4 +1,4 @@
-From 5b6e13216be29ced7350d9c354a1af8fe0ad9a3e Mon Sep 17 00:00:00 2001
+From 3c1f2df3e115436cacdb9b4149df50aa56c46b9d Mon Sep 17 00:00:00 2001
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Tue, 11 Dec 2018 15:59:38 +0800
Subject: [PATCH] igb: Exclude device from suspend direct complete optimization
@@ -18,12 +18,13 @@ suspend.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 45f3c19d063a..bea7175d171b 100644
+index 1ddaef252a02..3d8715415d09 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -3452,6 +3452,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -3367,6 +3367,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
break;
}
}
diff --git a/queue/iio-ad_sigma_delta-Properly-handle-SPI-bus-locking-v.patch b/queue/iio-ad_sigma_delta-Properly-handle-SPI-bus-locking-v.patch
index 42bde42..31f3795 100644
--- a/queue/iio-ad_sigma_delta-Properly-handle-SPI-bus-locking-v.patch
+++ b/queue/iio-ad_sigma_delta-Properly-handle-SPI-bus-locking-v.patch
@@ -1,4 +1,4 @@
-From df1d80aee963480c5c2938c64ec0ac3e4a0df2e0 Mon Sep 17 00:00:00 2001
+From bd1872442d43866812c91302cd8b826f5058e5c1 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Tue, 19 Mar 2019 13:37:55 +0200
Subject: [PATCH] iio: ad_sigma_delta: Properly handle SPI bus locking vs CS
@@ -21,9 +21,10 @@ done while holding the SPI bus lock de-asserts the CS signal.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Alexandru Ardelean <Alexandru.Ardelean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
-index ff5f2da2e1b1..af6cbc683214 100644
+index a4ca11cc0650..0d84663656bd 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -62,7 +62,7 @@ int ad_sd_write_reg(struct ad_sigma_delta *sigma_delta, unsigned int reg,
@@ -55,7 +56,7 @@ index ff5f2da2e1b1..af6cbc683214 100644
return ret;
}
-@@ -289,6 +291,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
+@@ -288,6 +290,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
spi_bus_lock(sigma_delta->spi->master);
sigma_delta->bus_locked = true;
@@ -63,7 +64,7 @@ index ff5f2da2e1b1..af6cbc683214 100644
reinit_completion(&sigma_delta->completion);
ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_SINGLE);
-@@ -298,9 +301,6 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
+@@ -297,9 +300,6 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
ret = wait_for_completion_interruptible_timeout(
&sigma_delta->completion, HZ);
@@ -73,7 +74,7 @@ index ff5f2da2e1b1..af6cbc683214 100644
if (ret == 0)
ret = -EIO;
if (ret < 0)
-@@ -321,7 +321,10 @@ out:
+@@ -315,7 +315,10 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev,
sigma_delta->irq_dis = true;
}
@@ -84,7 +85,7 @@ index ff5f2da2e1b1..af6cbc683214 100644
mutex_unlock(&indio_dev->mlock);
if (ret)
-@@ -358,6 +361,8 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
+@@ -352,6 +355,8 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
spi_bus_lock(sigma_delta->spi->master);
sigma_delta->bus_locked = true;
@@ -93,7 +94,7 @@ index ff5f2da2e1b1..af6cbc683214 100644
ret = ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_CONTINUOUS);
if (ret)
goto err_unlock;
-@@ -386,6 +391,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev)
+@@ -380,6 +385,7 @@ static int ad_sd_buffer_postdisable(struct iio_dev *indio_dev)
sigma_delta->irq_dis = true;
}
@@ -102,10 +103,10 @@ index ff5f2da2e1b1..af6cbc683214 100644
sigma_delta->bus_locked = false;
diff --git a/include/linux/iio/adc/ad_sigma_delta.h b/include/linux/iio/adc/ad_sigma_delta.h
-index 7e84351fa2c0..6e9fb1932dde 100644
+index 730ead1a46df..57c122ae5452 100644
--- a/include/linux/iio/adc/ad_sigma_delta.h
+++ b/include/linux/iio/adc/ad_sigma_delta.h
-@@ -69,6 +69,7 @@ struct ad_sigma_delta {
+@@ -66,6 +66,7 @@ struct ad_sigma_delta {
bool irq_dis;
bool bus_locked;
diff --git a/queue/iio-adc-stm32-dfsdm-fix-unmet-direct-dependencies-de.patch b/queue/iio-adc-stm32-dfsdm-fix-unmet-direct-dependencies-de.patch
index f039572..815b4f2 100644
--- a/queue/iio-adc-stm32-dfsdm-fix-unmet-direct-dependencies-de.patch
+++ b/queue/iio-adc-stm32-dfsdm-fix-unmet-direct-dependencies-de.patch
@@ -1,4 +1,4 @@
-From ba7ecfe43d6bf12e2aa76705c45f7d187ae3d7c0 Mon Sep 17 00:00:00 2001
+From 37aefb5750ba48df60cc8290f1520338680fda1c Mon Sep 17 00:00:00 2001
From: Fabrice Gasnier <fabrice.gasnier@st.com>
Date: Mon, 15 Apr 2019 15:00:50 +0200
Subject: [PATCH] iio: adc: stm32-dfsdm: fix unmet direct dependencies detected
@@ -18,12 +18,13 @@ Fixes: e2e6771c6462 ("IIO: ADC: add STM32 DFSDM sigma delta ADC support")
Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
-index e3e068480ff7..28965093ce28 100644
+index 9da79070357c..b491678283c8 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
-@@ -821,6 +821,7 @@ config STM32_DFSDM_ADC
+@@ -688,6 +688,7 @@ config STM32_DFSDM_ADC
depends on (ARCH_STM32 && OF) || COMPILE_TEST
select STM32_DFSDM_CORE
select REGMAP_MMIO
diff --git a/queue/iio-common-ssp_sensors-Initialize-calculated_time-in.patch b/queue/iio-common-ssp_sensors-Initialize-calculated_time-in.patch
index 68b91ec..0587b61 100644
--- a/queue/iio-common-ssp_sensors-Initialize-calculated_time-in.patch
+++ b/queue/iio-common-ssp_sensors-Initialize-calculated_time-in.patch
@@ -1,4 +1,4 @@
-From 6f9ca1d3eb74b81f811a87002de2d51640d135b1 Mon Sep 17 00:00:00 2001
+From 252fb27c5d292ec7b045d6a260bd8e470a6ca133 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Thu, 7 Mar 2019 14:45:46 -0700
Subject: [PATCH] iio: common: ssp_sensors: Initialize calculated_time in
@@ -26,6 +26,7 @@ Link: https://github.com/ClangBuiltLinux/linux/issues/394
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iio/common/ssp_sensors/ssp_iio.c b/drivers/iio/common/ssp_sensors/ssp_iio.c
index 645f2e3975db..e38f704d88b7 100644
diff --git a/queue/iio-hmc5843-fix-potential-NULL-pointer-dereferences.patch b/queue/iio-hmc5843-fix-potential-NULL-pointer-dereferences.patch
index 4429766..6ab8a06 100644
--- a/queue/iio-hmc5843-fix-potential-NULL-pointer-dereferences.patch
+++ b/queue/iio-hmc5843-fix-potential-NULL-pointer-dereferences.patch
@@ -1,4 +1,4 @@
-From 536cc27deade8f1ec3c1beefa60d5fbe0f6fcb28 Mon Sep 17 00:00:00 2001
+From dc7528b55784f2f7c5d5439d9ad41e9298267773 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Sat, 16 Mar 2019 17:08:33 -0500
Subject: [PATCH] iio: hmc5843: fix potential NULL pointer dereferences
@@ -10,6 +10,7 @@ the error when it fails.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iio/magnetometer/hmc5843_i2c.c b/drivers/iio/magnetometer/hmc5843_i2c.c
index 3de7f4426ac4..86abba5827a2 100644
diff --git a/queue/irq_work-Do-not-raise-an-IPI-when-queueing-work-on-t.patch b/queue/irq_work-Do-not-raise-an-IPI-when-queueing-work-on-t.patch
index 285be16..c2c8bf2 100644
--- a/queue/irq_work-Do-not-raise-an-IPI-when-queueing-work-on-t.patch
+++ b/queue/irq_work-Do-not-raise-an-IPI-when-queueing-work-on-t.patch
@@ -1,4 +1,4 @@
-From 471ba0e686cb13752bc1ff3216c54b69a2d250ea Mon Sep 17 00:00:00 2001
+From 9657a35bd1f4dce3413eec20a4d824b5ba22f069 Mon Sep 17 00:00:00 2001
From: Nicholas Piggin <npiggin@gmail.com>
Date: Tue, 9 Apr 2019 19:34:03 +1000
Subject: [PATCH] irq_work: Do not raise an IPI when queueing work on the local
@@ -27,6 +27,7 @@ Link: https://lkml.kernel.org/r/20190409093403.20994-1-npiggin@gmail.com
[ Simplified the preprocessor comments.
Fixed unbalanced curly brackets pointed out by Thomas. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index 6b7cdf17ccf8..73288914ed5e 100644
diff --git a/queue/kobject-Don-t-trigger-kobject_uevent-KOBJ_REMOVE-twi.patch b/queue/kobject-Don-t-trigger-kobject_uevent-KOBJ_REMOVE-twi.patch
index 3b0249c..b9dec22 100644
--- a/queue/kobject-Don-t-trigger-kobject_uevent-KOBJ_REMOVE-twi.patch
+++ b/queue/kobject-Don-t-trigger-kobject_uevent-KOBJ_REMOVE-twi.patch
@@ -1,4 +1,4 @@
-From c03a0fd0b609e2f5c669c2b7f27c8e1928e9196e Mon Sep 17 00:00:00 2001
+From 9b9e667d6076ddc07f164c619820a199fc2ef5d0 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Sun, 17 Mar 2019 14:02:31 +0900
Subject: [PATCH] kobject: Don't trigger kobject_uevent(KOBJ_REMOVE) twice.
@@ -33,12 +33,13 @@ Fixes: 0f4dafc0563c6c49 ("Kobject: auto-cleanup on final unref")
Cc: Kay Sievers <kay@vrfy.org>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
-index f05802687ba4..7998affa45d4 100644
+index 63d0816ab23b..7761f3294339 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
-@@ -466,6 +466,13 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
+@@ -464,6 +464,13 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
int i = 0;
int retval = 0;
@@ -52,7 +53,7 @@ index f05802687ba4..7998affa45d4 100644
pr_debug("kobject: '%s' (%p): %s\n",
kobject_name(kobj), kobj, __func__);
-@@ -567,10 +574,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
+@@ -565,10 +572,6 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
kobj->state_add_uevent_sent = 1;
break;
diff --git a/queue/media-au0828-Fix-NULL-pointer-dereference-in-au0828_.patch b/queue/media-au0828-Fix-NULL-pointer-dereference-in-au0828_.patch
index f5c3be1..6ccc197 100644
--- a/queue/media-au0828-Fix-NULL-pointer-dereference-in-au0828_.patch
+++ b/queue/media-au0828-Fix-NULL-pointer-dereference-in-au0828_.patch
@@ -1,4 +1,4 @@
-From 898bc40bfcc26abb6e06e960d6d4754c36c58b50 Mon Sep 17 00:00:00 2001
+From 6f14d072e540d703eeff662b247cdaca6ff5b578 Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah@kernel.org>
Date: Mon, 1 Apr 2019 20:43:17 -0400
Subject: [PATCH] media: au0828: Fix NULL pointer dereference in
@@ -54,9 +54,10 @@ kernel: [ 590.359718] entry_SYSCALL_64_after_hwframe+0x44/0xa9
Signed-off-by: Shuah Khan <shuah@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
-index e17047b94b87..536bd8bbb624 100644
+index 87871b42a878..8f8b10cb083e 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -758,6 +758,9 @@ static int au0828_analog_stream_enable(struct au0828_dev *d)
diff --git a/queue/media-au0828-stop-video-streaming-only-when-last-use.patch b/queue/media-au0828-stop-video-streaming-only-when-last-use.patch
index 2df0890..47e0e81 100644
--- a/queue/media-au0828-stop-video-streaming-only-when-last-use.patch
+++ b/queue/media-au0828-stop-video-streaming-only-when-last-use.patch
@@ -1,4 +1,4 @@
-From f604f0f5afb88045944567f604409951b5eb6af8 Mon Sep 17 00:00:00 2001
+From f4b0dcbeb67de87ffbe3fc6dd68785297241a449 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 2 Apr 2019 03:24:15 -0400
Subject: [PATCH] media: au0828: stop video streaming only when last user stops
@@ -17,12 +17,13 @@ at all when dev->streaming_users reached 0.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Tested-by: Shuah Khan <shuah@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
-index 536bd8bbb624..4bde3db83aa2 100644
+index 70e187971590..87871b42a878 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
-@@ -842,9 +842,9 @@ int au0828_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -839,9 +839,9 @@ int au0828_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
return rc;
}
@@ -34,7 +35,7 @@ index 536bd8bbb624..4bde3db83aa2 100644
dev->vid_timeout_running = 1;
mod_timer(&dev->vid_timeout, jiffies + (HZ / 10));
} else if (vq->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-@@ -864,10 +864,11 @@ static void au0828_stop_streaming(struct vb2_queue *vq)
+@@ -861,10 +861,11 @@ static void au0828_stop_streaming(struct vb2_queue *vq)
dprintk(1, "au0828_stop_streaming called %d\n", dev->streaming_users);
@@ -48,7 +49,7 @@ index 536bd8bbb624..4bde3db83aa2 100644
dev->vid_timeout_running = 0;
del_timer_sync(&dev->vid_timeout);
-@@ -896,8 +897,10 @@ void au0828_stop_vbi_streaming(struct vb2_queue *vq)
+@@ -893,8 +894,10 @@ void au0828_stop_vbi_streaming(struct vb2_queue *vq)
dprintk(1, "au0828_stop_vbi_streaming called %d\n",
dev->streaming_users);
diff --git a/queue/media-coda-clear-error-return-value-before-picture-r.patch b/queue/media-coda-clear-error-return-value-before-picture-r.patch
index 09736e0..3d8dd9d 100644
--- a/queue/media-coda-clear-error-return-value-before-picture-r.patch
+++ b/queue/media-coda-clear-error-return-value-before-picture-r.patch
@@ -1,4 +1,4 @@
-From bbeefa7357a648afe70e7183914c87c3878d528d Mon Sep 17 00:00:00 2001
+From 2449f5a4dda0fb530ed90273bba206cda5ee3a66 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Mon, 8 Apr 2019 08:32:49 -0400
Subject: [PATCH] media: coda: clear error return value before picture run
@@ -13,12 +13,13 @@ sequence initialization as error return value.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
-index b4f396c2e72c..eaa86737fa04 100644
+index 6048f223579b..20053897f17e 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
-@@ -2010,6 +2010,9 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
+@@ -1974,6 +1974,9 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
/* Clear decode success flag */
coda_write(dev, 0, CODA_RET_DEC_PIC_SUCCESS);
diff --git a/queue/media-dvbsky-Avoid-leaking-dvb-frontend.patch b/queue/media-dvbsky-Avoid-leaking-dvb-frontend.patch
index a7b3fe2..2eee091 100644
--- a/queue/media-dvbsky-Avoid-leaking-dvb-frontend.patch
+++ b/queue/media-dvbsky-Avoid-leaking-dvb-frontend.patch
@@ -1,4 +1,4 @@
-From fdfa59cd63b184e1e96d51ff170fcac739bc6f6f Mon Sep 17 00:00:00 2001
+From f4ed13e61d41a6032aafb713a321f5b2bd8af302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sat, 19 Jan 2019 20:30:04 -0500
Subject: [PATCH] media: dvbsky: Avoid leaking dvb frontend
@@ -44,6 +44,7 @@ unregistration identically, apply the change for all device types.
Signed-off-by: Stefan BrĂ¼ns <stefan.bruens@rwth-aachen.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
index e28bd8836751..ae0814dd202a 100644
diff --git a/queue/media-go7007-avoid-clang-frame-overflow-warning-with.patch b/queue/media-go7007-avoid-clang-frame-overflow-warning-with.patch
index 24e960b..782e7a9 100644
--- a/queue/media-go7007-avoid-clang-frame-overflow-warning-with.patch
+++ b/queue/media-go7007-avoid-clang-frame-overflow-warning-with.patch
@@ -1,4 +1,4 @@
-From ed713a4a1367aca5c0f2f329579465db00c17995 Mon Sep 17 00:00:00 2001
+From 97d96d878e258c96ec901dde6bf68bd715964a60 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2019 12:01:58 -0500
Subject: [PATCH] media: go7007: avoid clang frame overflow warning with KASAN
@@ -20,6 +20,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: fix checkpatch warning]
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/go7007/go7007-fw.c b/drivers/media/usb/go7007/go7007-fw.c
index 24f5b615dc7a..dfa9f899d0c2 100644
diff --git a/queue/media-gspca-Kill-URBs-on-USB-device-disconnect.patch b/queue/media-gspca-Kill-URBs-on-USB-device-disconnect.patch
index 4801381..5f415bf 100644
--- a/queue/media-gspca-Kill-URBs-on-USB-device-disconnect.patch
+++ b/queue/media-gspca-Kill-URBs-on-USB-device-disconnect.patch
@@ -1,4 +1,4 @@
-From 9b9ea7c2b57a0c9c3341fc6db039d1f7971a432e Mon Sep 17 00:00:00 2001
+From 930ea8b9ae1c18fa1ba58c92660bad0e5b38f1e6 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@collabora.com>
Date: Thu, 28 Feb 2019 10:28:34 -0500
Subject: [PATCH] media: gspca: Kill URBs on USB device disconnect
@@ -17,9 +17,10 @@ from the URB completion handler.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
-index 9448ac0b8bc9..4d7517411cc2 100644
+index 405a6a76d820..fd4a1456b6ca 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -294,7 +294,7 @@ static void fill_frame(struct gspca_dev *gspca_dev,
@@ -31,7 +32,7 @@ index 9448ac0b8bc9..4d7517411cc2 100644
i, len, st);
gspca_dev->last_packet_type = DISCARD_PACKET;
continue;
-@@ -1642,6 +1642,8 @@ void gspca_disconnect(struct usb_interface *intf)
+@@ -1630,6 +1630,8 @@ void gspca_disconnect(struct usb_interface *intf)
mutex_lock(&gspca_dev->usb_lock);
gspca_dev->present = false;
diff --git a/queue/media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch b/queue/media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch
index f034c93..2869595 100644
--- a/queue/media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch
+++ b/queue/media-gspca-do-not-resubmit-URBs-when-streaming-has-.patch
@@ -1,4 +1,4 @@
-From e6f8bd59c28f758feea403a70d6c3ef28c50959f Mon Sep 17 00:00:00 2001
+From e27298151fda3657e813714498181018cdf32e83 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Date: Tue, 26 Feb 2019 07:54:22 -0500
Subject: [PATCH] media: gspca: do not resubmit URBs when streaming has stopped
@@ -19,9 +19,10 @@ Fixes: 6992effe5344 ("gspca: Kill all URBs before releasing any of them")
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
-index ac70b36d67b7..9448ac0b8bc9 100644
+index fd4a1456b6ca..b12356c533a6 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -314,6 +314,8 @@ static void fill_frame(struct gspca_dev *gspca_dev,
diff --git a/queue/media-m88ds3103-serialize-reset-messages-in-m88ds310.patch b/queue/media-m88ds3103-serialize-reset-messages-in-m88ds310.patch
index 0f347bc..e4e7823 100644
--- a/queue/media-m88ds3103-serialize-reset-messages-in-m88ds310.patch
+++ b/queue/media-m88ds3103-serialize-reset-messages-in-m88ds310.patch
@@ -1,4 +1,4 @@
-From 981fbe3da20a6f35f17977453bce7dfc1664d74f Mon Sep 17 00:00:00 2001
+From 28e2e72efdba6cd283d4e0f0d381a65d926d924d Mon Sep 17 00:00:00 2001
From: James Hutchinson <jahutchinson99@googlemail.com>
Date: Sun, 13 Jan 2019 16:13:47 -0500
Subject: [PATCH] media: m88ds3103: serialize reset messages in
@@ -66,9 +66,10 @@ Signed-off-by: James Hutchinson <jahutchinson99@googlemail.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
-index 123f2a33738b..403f42806455 100644
+index 65d157fe76d1..b4bd1af34745 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -309,6 +309,9 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
diff --git a/queue/media-ov2659-make-S_FMT-succeed-even-if-requested-fo.patch b/queue/media-ov2659-make-S_FMT-succeed-even-if-requested-fo.patch
index 4d76a9b..d7c18ff 100644
--- a/queue/media-ov2659-make-S_FMT-succeed-even-if-requested-fo.patch
+++ b/queue/media-ov2659-make-S_FMT-succeed-even-if-requested-fo.patch
@@ -1,4 +1,4 @@
-From bccb89cf9cd07a0690d519696a00c00a973b3fe4 Mon Sep 17 00:00:00 2001
+From f8c57282bbe2dee04cb7a1a543fbc32d9855f7a8 Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 30 Mar 2019 10:01:31 -0400
Subject: [PATCH] media: ov2659: make S_FMT succeed even if requested format
@@ -24,9 +24,10 @@ Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
-index 799acce803fe..a1e9a980a445 100644
+index 4715edc8ca33..e6a8b5669b9c 100644
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -1117,8 +1117,10 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
diff --git a/queue/media-ov6650-Move-v4l2_clk_get-to-ov6650_video_probe.patch b/queue/media-ov6650-Move-v4l2_clk_get-to-ov6650_video_probe.patch
index 528ca4d..1b34417 100644
--- a/queue/media-ov6650-Move-v4l2_clk_get-to-ov6650_video_probe.patch
+++ b/queue/media-ov6650-Move-v4l2_clk_get-to-ov6650_video_probe.patch
@@ -1,4 +1,4 @@
-From ccdd85d518d8b9320ace1d87271f0ba2175f21fa Mon Sep 17 00:00:00 2001
+From e490b6c2f6ede7d954fe40dadd42acce54d163ba Mon Sep 17 00:00:00 2001
From: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Date: Fri, 29 Mar 2019 21:06:09 -0400
Subject: [PATCH] media: ov6650: Move v4l2_clk_get() to ov6650_video_probe()
@@ -16,12 +16,13 @@ callback, executed only when the bridge driver is ready.
Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c
-index f9359b11fa5c..de7d9790f054 100644
+index a9264d515e54..edded869d792 100644
--- a/drivers/media/i2c/ov6650.c
+++ b/drivers/media/i2c/ov6650.c
-@@ -810,9 +810,16 @@ static int ov6650_video_probe(struct i2c_client *client)
+@@ -811,9 +811,16 @@ static int ov6650_video_probe(struct i2c_client *client)
u8 pidh, pidl, midh, midl;
int ret;
@@ -39,7 +40,7 @@ index f9359b11fa5c..de7d9790f054 100644
msleep(20);
-@@ -849,6 +856,11 @@ static int ov6650_video_probe(struct i2c_client *client)
+@@ -850,6 +857,11 @@ static int ov6650_video_probe(struct i2c_client *client)
done:
ov6650_s_power(&priv->subdev, 0);
@@ -51,7 +52,7 @@ index f9359b11fa5c..de7d9790f054 100644
return ret;
}
-@@ -991,18 +1003,9 @@ static int ov6650_probe(struct i2c_client *client,
+@@ -992,18 +1004,9 @@ static int ov6650_probe(struct i2c_client *client,
priv->code = MEDIA_BUS_FMT_YUYV8_2X8;
priv->colorspace = V4L2_COLORSPACE_JPEG;
diff --git a/queue/media-pvrusb2-Prevent-a-buffer-overflow.patch b/queue/media-pvrusb2-Prevent-a-buffer-overflow.patch
index 65228ea..0012df3 100644
--- a/queue/media-pvrusb2-Prevent-a-buffer-overflow.patch
+++ b/queue/media-pvrusb2-Prevent-a-buffer-overflow.patch
@@ -1,4 +1,4 @@
-From c1ced46c7b49ad7bc064e68d966e0ad303f917fb Mon Sep 17 00:00:00 2001
+From 040cb87842a901116b2c75ce2d194d5efa8b5b98 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 8 Apr 2019 05:52:38 -0400
Subject: [PATCH] media: pvrusb2: Prevent a buffer overflow
@@ -24,9 +24,10 @@ Fixes: 7fb20fa38caa ("V4L/DVB (7299): pvrusb2: Improve logic which handles input
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
-index 51112b7988e4..816c85786c2a 100644
+index a8519da0020b..673fdca8d2da 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ctrl *cptr,int *vp)
diff --git a/queue/media-saa7146-avoid-high-stack-usage-with-clang.patch b/queue/media-saa7146-avoid-high-stack-usage-with-clang.patch
index ff7802d..85eb999 100644
--- a/queue/media-saa7146-avoid-high-stack-usage-with-clang.patch
+++ b/queue/media-saa7146-avoid-high-stack-usage-with-clang.patch
@@ -1,4 +1,4 @@
-From 03aa4f191a36f33fce015387f84efa0eee94408e Mon Sep 17 00:00:00 2001
+From bccc1ca88e4e03cda45d3d67ff83c53239acf167 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2019 12:01:56 -0500
Subject: [PATCH] media: saa7146: avoid high stack usage with clang
@@ -29,6 +29,7 @@ Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: fix checkpatch warnings]
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/pci/saa7146/hexium_gemini.c b/drivers/media/pci/saa7146/hexium_gemini.c
index 5817d9cde4d0..6d8e4afe9673 100644
diff --git a/queue/media-si2165-fix-a-missing-check-of-return-value.patch b/queue/media-si2165-fix-a-missing-check-of-return-value.patch
index 19474db..7b32627 100644
--- a/queue/media-si2165-fix-a-missing-check-of-return-value.patch
+++ b/queue/media-si2165-fix-a-missing-check-of-return-value.patch
@@ -1,4 +1,4 @@
-From 0ab34a08812a3334350dbaf69a018ee0ab3d2ddd Mon Sep 17 00:00:00 2001
+From f29a8e8619f76609a3ea8308022b1bc11830e83b Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Thu, 20 Dec 2018 23:54:03 -0500
Subject: [PATCH] media: si2165: fix a missing check of return value
@@ -17,9 +17,10 @@ Reviewed-by: Matthias Schwarzott <zzam@gentoo.org>
Tested-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
-index feacd8da421d..d55d8f169dca 100644
+index 2dd336f95cbf..5e2b1b945c9d 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -275,18 +275,20 @@ static u32 si2165_get_fe_clk(struct si2165_state *state)
diff --git a/queue/media-staging-davinci_vpfe-disallow-building-with-CO.patch b/queue/media-staging-davinci_vpfe-disallow-building-with-CO.patch
index 96e73e2..8a3faef 100644
--- a/queue/media-staging-davinci_vpfe-disallow-building-with-CO.patch
+++ b/queue/media-staging-davinci_vpfe-disallow-building-with-CO.patch
@@ -1,4 +1,4 @@
-From 49dc762cffd8305a861ca649e82dc5533b3e3344 Mon Sep 17 00:00:00 2001
+From 0d595f441c52c840fee10e9e737d8806c3c74ad5 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 5 Mar 2019 08:29:48 -0500
Subject: [PATCH] media: staging: davinci_vpfe: disallow building with
@@ -41,6 +41,7 @@ Fixes: 4907c73deefe ("media: staging: davinci_vpfe: allow building with COMPILE_
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/staging/media/davinci_vpfe/Kconfig b/drivers/staging/media/davinci_vpfe/Kconfig
index aea449a8dbf8..76818cc48ddc 100644
diff --git a/queue/media-stm32-dcmi-fix-crash-when-subdev-do-not-expose.patch b/queue/media-stm32-dcmi-fix-crash-when-subdev-do-not-expose.patch
index 6427591..97a12b8 100644
--- a/queue/media-stm32-dcmi-fix-crash-when-subdev-do-not-expose.patch
+++ b/queue/media-stm32-dcmi-fix-crash-when-subdev-do-not-expose.patch
@@ -1,4 +1,4 @@
-From 33dfeb62e23c31619d2197850f7e8b50e8cc5466 Mon Sep 17 00:00:00 2001
+From 5b758b9a9f489f89a12cc6889240acfae6ec2f0f Mon Sep 17 00:00:00 2001
From: Hugues Fruchet <hugues.fruchet@st.com>
Date: Mon, 1 Apr 2019 04:56:09 -0400
Subject: [PATCH] media: stm32-dcmi: fix crash when subdev do not expose any
@@ -12,12 +12,13 @@ subdev sensor didn't expose any formats.
Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
-index b63d57cd89e5..906e71b19039 100644
+index bcb352a11b7d..6a38ea6e3989 100644
--- a/drivers/media/platform/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/stm32/stm32-dcmi.c
-@@ -831,6 +831,9 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f,
+@@ -838,6 +838,9 @@ static int dcmi_try_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f,
sd_fmt = find_format_by_fourcc(dcmi, pix->pixelformat);
if (!sd_fmt) {
@@ -27,7 +28,7 @@ index b63d57cd89e5..906e71b19039 100644
sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats - 1];
pix->pixelformat = sd_fmt->fourcc;
}
-@@ -1009,6 +1012,9 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi,
+@@ -1022,6 +1025,9 @@ static int dcmi_set_sensor_format(struct stm32_dcmi *dcmi,
sd_fmt = find_format_by_fourcc(dcmi, pix->pixelformat);
if (!sd_fmt) {
diff --git a/queue/media-video-mux-fix-null-pointer-dereferences.patch b/queue/media-video-mux-fix-null-pointer-dereferences.patch
index daf89a0..1727cb5 100644
--- a/queue/media-video-mux-fix-null-pointer-dereferences.patch
+++ b/queue/media-video-mux-fix-null-pointer-dereferences.patch
@@ -1,4 +1,4 @@
-From 5027cf118c236abb25ff8d7aa7468737d9aecaf3 Mon Sep 17 00:00:00 2001
+From 2b523a89140fcd7225a621f2fe58757cdbcd2ef9 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Sat, 9 Mar 2019 02:20:56 -0500
Subject: [PATCH] media: video-mux: fix null pointer dereferences
@@ -12,6 +12,7 @@ Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/platform/video-mux.c b/drivers/media/platform/video-mux.c
index 1fb887293337..8de4506ae263 100644
diff --git a/queue/media-vimc-zero-the-media_device-on-probe.patch b/queue/media-vimc-zero-the-media_device-on-probe.patch
index 934222a..3c15fad 100644
--- a/queue/media-vimc-zero-the-media_device-on-probe.patch
+++ b/queue/media-vimc-zero-the-media_device-on-probe.patch
@@ -1,4 +1,4 @@
-From f74267b51cb36321f777807b2e04ca02167ecc08 Mon Sep 17 00:00:00 2001
+From 9585a05444ae45a09601c676bc91fb733c94dc03 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Date: Fri, 8 Mar 2019 08:02:26 -0500
Subject: [PATCH] media: vimc: zero the media_device on probe
@@ -15,12 +15,13 @@ So call memset to ensure any left-over values are cleared.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
-index 0fbb7914098f..3aa62d7e3d0e 100644
+index fe088a953860..9a24c547450c 100644
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
-@@ -304,6 +304,8 @@ static int vimc_probe(struct platform_device *pdev)
+@@ -303,6 +303,8 @@ static int vimc_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "probe");
diff --git a/queue/media-wl128x-prevent-two-potential-buffer-overflows.patch b/queue/media-wl128x-prevent-two-potential-buffer-overflows.patch
index 3beea7b..bf03f7a 100644
--- a/queue/media-wl128x-prevent-two-potential-buffer-overflows.patch
+++ b/queue/media-wl128x-prevent-two-potential-buffer-overflows.patch
@@ -1,4 +1,4 @@
-From 9c2ccc324b3a6cbc865ab8b3e1a09e93d3c8ade9 Mon Sep 17 00:00:00 2001
+From 235576c02c1b25e5de851bdf02ebd341c79bb826 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 26 Mar 2019 01:12:07 -0400
Subject: [PATCH] media: wl128x: prevent two potential buffer overflows
@@ -20,9 +20,10 @@ Fixes: e8454ff7b9a4 ("[media] drivers:media:radio: wl128x: FM Driver Common sour
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
-index 1614809f7d35..a1fcb80a2191 100644
+index 800d69c3f80b..1cf4019689a5 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -489,7 +489,8 @@ int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,
@@ -44,7 +45,7 @@ index 1614809f7d35..a1fcb80a2191 100644
/* Skip header info and copy only response data */
skb_pull(skb, sizeof(struct fm_event_msg_hdr));
-@@ -1309,7 +1312,7 @@ static int load_default_rx_configuration(struct fmdev *fmdev)
+@@ -1308,7 +1311,7 @@ static int load_default_rx_configuration(struct fmdev *fmdev)
static int fm_power_up(struct fmdev *fmdev, u8 mode)
{
u16 payload;
diff --git a/queue/mmc-core-make-pwrseq_emmc-partially-support-sleepy-G.patch b/queue/mmc-core-make-pwrseq_emmc-partially-support-sleepy-G.patch
index 3fbd872..ee67b6e 100644
--- a/queue/mmc-core-make-pwrseq_emmc-partially-support-sleepy-G.patch
+++ b/queue/mmc-core-make-pwrseq_emmc-partially-support-sleepy-G.patch
@@ -1,4 +1,4 @@
-From 002ee28e8b322d4d4b7b83234b5d0f4ebd428eda Mon Sep 17 00:00:00 2001
+From 74ba8ef5609127096c26ba69255816c981d765f0 Mon Sep 17 00:00:00 2001
From: Andrea Merello <andrea.merello@gmail.com>
Date: Fri, 5 Apr 2019 10:34:58 +0200
Subject: [PATCH] mmc: core: make pwrseq_emmc (partially) support sleepy GPIO
@@ -39,6 +39,7 @@ otherwise. Maybe worth to RFT.
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mmc/core/pwrseq_emmc.c b/drivers/mmc/core/pwrseq_emmc.c
index efb8a7965dd4..154f4204d58c 100644
diff --git a/queue/mmc-sdhci-of-esdhc-add-erratum-A-009204-support.patch b/queue/mmc-sdhci-of-esdhc-add-erratum-A-009204-support.patch
index 50931d3..9cb060d 100644
--- a/queue/mmc-sdhci-of-esdhc-add-erratum-A-009204-support.patch
+++ b/queue/mmc-sdhci-of-esdhc-add-erratum-A-009204-support.patch
@@ -1,4 +1,4 @@
-From 5dd195522562542bc6ebe6e7bd47890d8b7ca93c Mon Sep 17 00:00:00 2001
+From 004683680d507e8cb11f741aafc13361b3c8dfea Mon Sep 17 00:00:00 2001
From: Yinbo Zhu <yinbo.zhu@nxp.com>
Date: Mon, 11 Mar 2019 02:16:44 +0000
Subject: [PATCH] mmc: sdhci-of-esdhc: add erratum A-009204 support
@@ -18,12 +18,13 @@ erratum is to fix this issue.
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
-index 04d7d95e9bba..57a44896668a 100644
+index 9207820514ce..e26efda46b99 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -694,6 +694,9 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)
+@@ -610,6 +610,9 @@ static void esdhc_reset(struct sdhci_host *host, u8 mask)
sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
diff --git a/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC-A001-and-A-0083.patch b/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC-A001-and-A-0083.patch
index f30fa99..d02ec90 100644
--- a/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC-A001-and-A-0083.patch
+++ b/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC-A001-and-A-0083.patch
@@ -1,4 +1,4 @@
-From 05cb6b2a66fa7837211a060878e91be5eb10cb07 Mon Sep 17 00:00:00 2001
+From e39fe152b3621c5ebee37c257a9998a7385cda33 Mon Sep 17 00:00:00 2001
From: Yinbo Zhu <yinbo.zhu@nxp.com>
Date: Mon, 11 Mar 2019 02:16:40 +0000
Subject: [PATCH] mmc: sdhci-of-esdhc: add erratum eSDHC-A001 and A-008358
@@ -25,12 +25,13 @@ SDHCI_QUIRK_RESET_AFTER_REQUEST to fix above issue.
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
-index b3310ea90231..04d7d95e9bba 100644
+index e26efda46b99..bcfa84aa2113 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -1075,8 +1075,10 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
+@@ -883,8 +883,10 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
if (esdhc->vendor_ver > VENDOR_V_22)
host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ;
diff --git a/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC5-support.patch b/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC5-support.patch
index 5a9b73a..45b7d38 100644
--- a/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC5-support.patch
+++ b/queue/mmc-sdhci-of-esdhc-add-erratum-eSDHC5-support.patch
@@ -1,4 +1,4 @@
-From a46e42712596b51874f04c73f1cdf1017f88df52 Mon Sep 17 00:00:00 2001
+From aff280862b8fb8b93e54b73c639addd0d1f7ee70 Mon Sep 17 00:00:00 2001
From: Yinbo Zhu <yinbo.zhu@nxp.com>
Date: Mon, 11 Mar 2019 02:16:36 +0000
Subject: [PATCH] mmc: sdhci-of-esdhc: add erratum eSDHC5 support
@@ -14,12 +14,13 @@ write preceded by read. this erratum is to fix this issue.
Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c
-index e8cb7a92b9e6..b3310ea90231 100644
+index 7b7d077e40fd..9207820514ce 100644
--- a/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
-@@ -1075,6 +1075,9 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
+@@ -880,6 +880,9 @@ static int sdhci_esdhc_probe(struct platform_device *pdev)
if (esdhc->vendor_ver > VENDOR_V_22)
host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ;
diff --git a/queue/mmc_spi-add-a-status-check-for-spi_sync_locked.patch b/queue/mmc_spi-add-a-status-check-for-spi_sync_locked.patch
index 4a4d8a8..308979b 100644
--- a/queue/mmc_spi-add-a-status-check-for-spi_sync_locked.patch
+++ b/queue/mmc_spi-add-a-status-check-for-spi_sync_locked.patch
@@ -1,4 +1,4 @@
-From 611025983b7976df0183390a63a2166411d177f1 Mon Sep 17 00:00:00 2001
+From eda4e40cfc54814229e667926b1d90181b30e3c9 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 11 Mar 2019 00:53:33 -0500
Subject: [PATCH] mmc_spi: add a status check for spi_sync_locked
@@ -11,9 +11,10 @@ returns the error code upstream.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
-index 1b1498805972..a3533935e282 100644
+index 67f6bd24a9d0..ea254d00541f 100644
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -819,6 +819,10 @@ mmc_spi_readblock(struct mmc_spi_host *host, struct spi_transfer *t,
diff --git a/queue/mwifiex-Fix-mem-leak-in-mwifiex_tm_cmd.patch b/queue/mwifiex-Fix-mem-leak-in-mwifiex_tm_cmd.patch
index bd1e96c..436b3c3 100644
--- a/queue/mwifiex-Fix-mem-leak-in-mwifiex_tm_cmd.patch
+++ b/queue/mwifiex-Fix-mem-leak-in-mwifiex_tm_cmd.patch
@@ -1,4 +1,4 @@
-From 003b686ace820ce2d635a83f10f2d7f9c147dabc Mon Sep 17 00:00:00 2001
+From bef44340bf372e90b8df7a6d311be78455a60c1b Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Tue, 12 Mar 2019 15:03:58 +0800
Subject: [PATCH] mwifiex: Fix mem leak in mwifiex_tm_cmd
@@ -12,12 +12,13 @@ cause mem leak.
Fixes: 3935ccc14d2c ("mwifiex: add cfg80211 testmode support")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/marvell/mwifiex/cfg80211.c b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-index c46f0a54a0c7..e582d9b3e50c 100644
+index 30a2eb2df0fe..076726b7fd2e 100644
--- a/drivers/net/wireless/marvell/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/marvell/mwifiex/cfg80211.c
-@@ -4082,16 +4082,20 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,
+@@ -4044,16 +4044,20 @@ static int mwifiex_tm_cmd(struct wiphy *wiphy, struct wireless_dev *wdev,
if (mwifiex_send_cmd(priv, 0, 0, 0, hostcmd, true)) {
dev_err(priv->adapter->dev, "Failed to process hostcmd\n");
diff --git a/queue/perf-arm-cci-Remove-broken-race-mitigation.patch b/queue/perf-arm-cci-Remove-broken-race-mitigation.patch
index 2ad8f94..1675195 100644
--- a/queue/perf-arm-cci-Remove-broken-race-mitigation.patch
+++ b/queue/perf-arm-cci-Remove-broken-race-mitigation.patch
@@ -1,4 +1,4 @@
-From 0d2e2a82d4de298d006bf8eddc86829e3c7da820 Mon Sep 17 00:00:00 2001
+From a0bb10478fa1dfdadb09b47083ade09c629799ba Mon Sep 17 00:00:00 2001
From: Robin Murphy <robin.murphy@arm.com>
Date: Tue, 16 Apr 2019 16:24:24 +0100
Subject: [PATCH] perf/arm-cci: Remove broken race mitigation
@@ -52,12 +52,13 @@ Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c
-index bfd03e023308..8f8606b9bc9e 100644
+index 0d09d8e669cd..5ab26aacae3e 100644
--- a/drivers/perf/arm-cci.c
+++ b/drivers/perf/arm-cci.c
-@@ -1684,21 +1684,24 @@ static int cci_pmu_probe(struct platform_device *pdev)
+@@ -1678,21 +1678,24 @@ static int cci_pmu_probe(struct platform_device *pdev)
raw_spin_lock_init(&cci_pmu->hw_events.pmu_lock);
mutex_init(&cci_pmu->reserve_mutex);
atomic_set(&cci_pmu->active_events, 0);
diff --git a/queue/perf-x86-intel-cstate-Add-Icelake-support.patch b/queue/perf-x86-intel-cstate-Add-Icelake-support.patch
index 0072ca9..1386b42 100644
--- a/queue/perf-x86-intel-cstate-Add-Icelake-support.patch
+++ b/queue/perf-x86-intel-cstate-Add-Icelake-support.patch
@@ -1,4 +1,4 @@
-From f08c47d1f86c6dc666c7e659d94bf6d4492aa9d7 Mon Sep 17 00:00:00 2001
+From a56c149d796ca5cb651960c6ba14267af2808479 Mon Sep 17 00:00:00 2001
From: Kan Liang <kan.liang@linux.intel.com>
Date: Tue, 2 Apr 2019 12:45:06 -0700
Subject: [PATCH] perf/x86/intel/cstate: Add Icelake support
@@ -21,12 +21,13 @@ Cc: acme@kernel.org
Cc: jolsa@kernel.org
Link: https://lkml.kernel.org/r/20190402194509.2832-10-kan.liang@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
-index 94a4b7fc75d0..dd5658ec31d5 100644
+index 56194c571299..4a650eb3d94a 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
-@@ -578,6 +578,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
+@@ -584,6 +584,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_X, glm_cstates),
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
diff --git a/queue/perf-x86-intel-rapl-Add-Icelake-support.patch b/queue/perf-x86-intel-rapl-Add-Icelake-support.patch
index 6bbb3f1..9fb1590 100644
--- a/queue/perf-x86-intel-rapl-Add-Icelake-support.patch
+++ b/queue/perf-x86-intel-rapl-Add-Icelake-support.patch
@@ -1,4 +1,4 @@
-From b3377c3acb9e54cf86efcfe25f2e792bca599ed4 Mon Sep 17 00:00:00 2001
+From 4f9288b0cfe30e5da95fac9fa7705863e7816d06 Mon Sep 17 00:00:00 2001
From: Kan Liang <kan.liang@linux.intel.com>
Date: Tue, 2 Apr 2019 12:45:07 -0700
Subject: [PATCH] perf/x86/intel/rapl: Add Icelake support
@@ -21,12 +21,13 @@ Cc: acme@kernel.org
Cc: jolsa@kernel.org
Link: https://lkml.kernel.org/r/20190402194509.2832-11-kan.liang@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
-index 94dc564146ca..37ebf6fc5415 100644
+index 91039ffed633..2413169ce362 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
-@@ -775,6 +775,8 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
+@@ -780,6 +780,8 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X, hsw_rapl_init),
X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, hsw_rapl_init),
diff --git a/queue/perf-x86-msr-Add-Icelake-support.patch b/queue/perf-x86-msr-Add-Icelake-support.patch
index efa82b6..4b10a1d 100644
--- a/queue/perf-x86-msr-Add-Icelake-support.patch
+++ b/queue/perf-x86-msr-Add-Icelake-support.patch
@@ -1,4 +1,4 @@
-From cf50d79a8cfe5adae37fec026220b009559bbeed Mon Sep 17 00:00:00 2001
+From cb5776fbc32b9c61099d6f78b00105b8fcd5fe01 Mon Sep 17 00:00:00 2001
From: Kan Liang <kan.liang@linux.intel.com>
Date: Tue, 2 Apr 2019 12:45:08 -0700
Subject: [PATCH] perf/x86/msr: Add Icelake support
@@ -21,9 +21,10 @@ Cc: acme@kernel.org
Cc: jolsa@kernel.org
Link: https://lkml.kernel.org/r/20190402194509.2832-12-kan.liang@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/events/msr.c b/arch/x86/events/msr.c
-index a878e6286e4a..f3f4c2263501 100644
+index 1b9f85abf9bc..ace6c1e752fb 100644
--- a/arch/x86/events/msr.c
+++ b/arch/x86/events/msr.c
@@ -89,6 +89,7 @@ static bool test_intel(int idx)
diff --git a/queue/phy-mapphone-mdm6600-add-gpiolib-dependency.patch b/queue/phy-mapphone-mdm6600-add-gpiolib-dependency.patch
index c14db25..b8b9e7c 100644
--- a/queue/phy-mapphone-mdm6600-add-gpiolib-dependency.patch
+++ b/queue/phy-mapphone-mdm6600-add-gpiolib-dependency.patch
@@ -1,4 +1,4 @@
-From 208d3423ee463ab257908456f6bbca4024ab63f7 Mon Sep 17 00:00:00 2001
+From 09ab94b81e6529995a17ec9d8faab94903f3e9ed Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 4 Mar 2019 21:23:58 +0100
Subject: [PATCH] phy: mapphone-mdm6600: add gpiolib dependency
@@ -19,6 +19,7 @@ Fixes: 5d1ebbda0318 ("phy: mapphone-mdm6600: Add USB PHY driver for MDM6600 on D
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/phy/motorola/Kconfig b/drivers/phy/motorola/Kconfig
index 82651524ffb9..718f8729701d 100644
diff --git a/queue/phy-sun4i-usb-Make-sure-to-disable-PHY0-passby-for-p.patch b/queue/phy-sun4i-usb-Make-sure-to-disable-PHY0-passby-for-p.patch
index 5a459e6..54262ef 100644
--- a/queue/phy-sun4i-usb-Make-sure-to-disable-PHY0-passby-for-p.patch
+++ b/queue/phy-sun4i-usb-Make-sure-to-disable-PHY0-passby-for-p.patch
@@ -1,4 +1,4 @@
-From e6f32efb1b128344a2c7df9875bc1a1abaa1d395 Mon Sep 17 00:00:00 2001
+From ebbb195e6db3da296ed5c803db7c617fd8325a16 Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Thu, 14 Mar 2019 14:05:18 +0100
Subject: [PATCH] phy: sun4i-usb: Make sure to disable PHY0 passby for
@@ -17,12 +17,13 @@ Fixes: ba4bdc9e1dc0 ("PHY: sunxi: Add driver for sunxi usb phy")
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
-index 5163097b43df..7b23920e0068 100644
+index 15c8fc2abf01..1f8809bab002 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
-@@ -551,6 +551,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
+@@ -550,6 +550,7 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
struct sun4i_usb_phy_data *data =
container_of(work, struct sun4i_usb_phy_data, detect.work);
struct phy *phy0 = data->phys[0].phy;
@@ -30,7 +31,7 @@ index 5163097b43df..7b23920e0068 100644
bool force_session_end, id_notify = false, vbus_notify = false;
int id_det, vbus_det;
-@@ -607,6 +608,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
+@@ -606,6 +607,9 @@ static void sun4i_usb_phy0_id_vbus_det_scan(struct work_struct *work)
mutex_unlock(&phy0->mutex);
}
diff --git a/queue/pinctrl-pistachio-fix-leaked-of_node-references.patch b/queue/pinctrl-pistachio-fix-leaked-of_node-references.patch
index 873831f..3e62e0d 100644
--- a/queue/pinctrl-pistachio-fix-leaked-of_node-references.patch
+++ b/queue/pinctrl-pistachio-fix-leaked-of_node-references.patch
@@ -1,4 +1,4 @@
-From 44a4455ac2c6b0981eace683a2b6eccf47689022 Mon Sep 17 00:00:00 2001
+From 9d08c14bcbb8e55b3891510e1a27543a54f7b27a Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Fri, 12 Apr 2019 14:02:19 +0800
Subject: [PATCH] pinctrl: pistachio: fix leaked of_node references
@@ -17,12 +17,13 @@ Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pinctrl/pinctrl-pistachio.c b/drivers/pinctrl/pinctrl-pistachio.c
-index aa5f949ef219..5b0678f310e5 100644
+index 302190d1558d..0d7d379e9bb8 100644
--- a/drivers/pinctrl/pinctrl-pistachio.c
+++ b/drivers/pinctrl/pinctrl-pistachio.c
-@@ -1367,6 +1367,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)
+@@ -1368,6 +1368,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)
if (!of_find_property(child, "gpio-controller", NULL)) {
dev_err(pctl->dev,
"No gpio-controller property for bank %u\n", i);
@@ -30,7 +31,7 @@ index aa5f949ef219..5b0678f310e5 100644
ret = -ENODEV;
goto err;
}
-@@ -1374,6 +1375,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)
+@@ -1375,6 +1376,7 @@ static int pistachio_gpio_register(struct pistachio_pinctrl *pctl)
irq = irq_of_parse_and_map(child, 0);
if (irq < 0) {
dev_err(pctl->dev, "No IRQ for bank %u: %d\n", i, irq);
diff --git a/queue/pinctrl-samsung-fix-leaked-of_node-references.patch b/queue/pinctrl-samsung-fix-leaked-of_node-references.patch
index 1f7f42e..4633ddf 100644
--- a/queue/pinctrl-samsung-fix-leaked-of_node-references.patch
+++ b/queue/pinctrl-samsung-fix-leaked-of_node-references.patch
@@ -1,4 +1,4 @@
-From 44b9f86cd41db6c522effa5aec251d664a52fbc0 Mon Sep 17 00:00:00 2001
+From 6219b98f43c2f2cc17a249568338fe9491803447 Mon Sep 17 00:00:00 2001
From: Wen Yang <wen.yang99@zte.com.cn>
Date: Fri, 12 Apr 2019 14:02:22 +0800
Subject: [PATCH] pinctrl: samsung: fix leaked of_node references
@@ -23,9 +23,10 @@ Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c
-index 44c6b753f692..85ddf49a5188 100644
+index d82820fc349a..7f293ea6814d 100644
--- a/drivers/pinctrl/samsung/pinctrl-exynos-arm.c
+++ b/drivers/pinctrl/samsung/pinctrl-exynos-arm.c
@@ -71,6 +71,7 @@ s5pv210_retention_init(struct samsung_pinctrl_drv_data *drvdata,
diff --git a/queue/powerpc-64-Fix-booting-large-kernels-with-STRICT_KER.patch b/queue/powerpc-64-Fix-booting-large-kernels-with-STRICT_KER.patch
index d455ced..b4e75fd 100644
--- a/queue/powerpc-64-Fix-booting-large-kernels-with-STRICT_KER.patch
+++ b/queue/powerpc-64-Fix-booting-large-kernels-with-STRICT_KER.patch
@@ -1,4 +1,4 @@
-From 56c46bba9bbfe229b4472a5be313c44c5b714a39 Mon Sep 17 00:00:00 2001
+From 7e8dde1e19f8acda0ae7c34cd3e0f5831f2af676 Mon Sep 17 00:00:00 2001
From: Russell Currey <ruscur@russell.cc>
Date: Wed, 27 Mar 2019 14:35:54 +1100
Subject: [PATCH] powerpc/64: Fix booting large kernels with STRICT_KERNEL_RWX
@@ -17,12 +17,13 @@ Fixes: 1e0fc9d1eb2b ("powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs
Signed-off-by: Russell Currey <ruscur@russell.cc>
[mpe: Fix it to work on BE by using DOTSYM()]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
-index 3fad8d499767..5321a11c2835 100644
+index 6eca15f25c73..b5f051d15603 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
-@@ -968,7 +968,9 @@ start_here_multiplatform:
+@@ -969,7 +969,9 @@ start_here_multiplatform:
/* Restore parameters passed from prom_init/kexec */
mr r3,r31
diff --git a/queue/powerpc-numa-improve-control-of-topology-updates.patch b/queue/powerpc-numa-improve-control-of-topology-updates.patch
index 1c08599..9eea181 100644
--- a/queue/powerpc-numa-improve-control-of-topology-updates.patch
+++ b/queue/powerpc-numa-improve-control-of-topology-updates.patch
@@ -1,4 +1,4 @@
-From 2d4d9b308f8f8dec68f6dbbff18c68ec7c6bd26f Mon Sep 17 00:00:00 2001
+From 1ba4be698d5d30b99c1a0bff4c3a15f663bad30b Mon Sep 17 00:00:00 2001
From: Nathan Lynch <nathanl@linux.ibm.com>
Date: Thu, 18 Apr 2019 13:56:57 -0500
Subject: [PATCH] powerpc/numa: improve control of topology updates
@@ -19,12 +19,13 @@ migrations and suspensions.
Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
-index f3ee0e18edd6..952ada44df62 100644
+index 10fb43efef50..f473c05e9649 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
-@@ -1497,6 +1497,9 @@ int start_topology_update(void)
+@@ -1495,6 +1495,9 @@ int start_topology_update(void)
{
int rc = 0;
@@ -34,7 +35,7 @@ index f3ee0e18edd6..952ada44df62 100644
if (firmware_has_feature(FW_FEATURE_PRRN)) {
if (!prrn_enabled) {
prrn_enabled = 1;
-@@ -1530,6 +1533,9 @@ int stop_topology_update(void)
+@@ -1524,6 +1527,9 @@ int stop_topology_update(void)
{
int rc = 0;
@@ -44,7 +45,7 @@ index f3ee0e18edd6..952ada44df62 100644
if (prrn_enabled) {
prrn_enabled = 0;
#ifdef CONFIG_SMP
-@@ -1587,11 +1593,13 @@ static ssize_t topology_write(struct file *file, const char __user *buf,
+@@ -1579,11 +1585,13 @@ static ssize_t topology_write(struct file *file, const char __user *buf,
kbuf[read_len] = '\0';
@@ -61,7 +62,7 @@ index f3ee0e18edd6..952ada44df62 100644
return -EINVAL;
return count;
-@@ -1606,9 +1614,7 @@ static const struct file_operations topology_ops = {
+@@ -1598,9 +1606,7 @@ static const struct file_operations topology_ops = {
static int topology_update_init(void)
{
diff --git a/queue/random-add-a-spinlock_t-to-struct-batched_entropy.patch b/queue/random-add-a-spinlock_t-to-struct-batched_entropy.patch
index a263bfa..d088105 100644
--- a/queue/random-add-a-spinlock_t-to-struct-batched_entropy.patch
+++ b/queue/random-add-a-spinlock_t-to-struct-batched_entropy.patch
@@ -1,4 +1,4 @@
-From 7e51835ac51a99dc9d6f6bac3632a3f0c77456f0 Mon Sep 17 00:00:00 2001
+From 743d3e3f3eaecad9dcc8a08eb434d8463f61db0a Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Sat, 20 Apr 2019 00:09:51 -0400
Subject: [PATCH] random: add a spinlock_t to struct batched_entropy
@@ -67,6 +67,7 @@ the data scructure, we can access it from a remote CPU.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/char/random.c b/drivers/char/random.c
index bd449ad52442..13c69a681659 100644
diff --git a/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch b/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch
index 9b0cd93..8541921 100644
--- a/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch
+++ b/queue/rcuperf-Fix-cleanup-path-for-invalid-perf_type-strin.patch
@@ -1,4 +1,4 @@
-From dbd28ebc4a819ab9eacc96c30b40adb2d60333ed Mon Sep 17 00:00:00 2001
+From b3adbb291fbd2d3e085213935b7cca03acd8a943 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.ibm.com>
Date: Thu, 21 Mar 2019 10:26:41 -0700
Subject: [PATCH] rcuperf: Fix cleanup path for invalid perf_type strings
@@ -19,6 +19,7 @@ inserts a check near the beginning of rcu_perf_cleanup(), thus avoiding
relying on an irrelevant cur_ops value.
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
index e232846516b3..3d2a93f16bcd 100644
diff --git a/queue/rcutorture-Fix-cleanup-path-for-invalid-torture_type.patch b/queue/rcutorture-Fix-cleanup-path-for-invalid-torture_type.patch
index dfe3f4f..d3035ec 100644
--- a/queue/rcutorture-Fix-cleanup-path-for-invalid-torture_type.patch
+++ b/queue/rcutorture-Fix-cleanup-path-for-invalid-torture_type.patch
@@ -1,4 +1,4 @@
-From 7e7f76c7dba53bc619fcca0cb89264a071f3bb2d Mon Sep 17 00:00:00 2001
+From 0024cacea9a4345d43d18962e61fdce575c3fae2 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.ibm.com>
Date: Thu, 21 Mar 2019 09:27:28 -0700
Subject: [PATCH] rcutorture: Fix cleanup path for invalid torture_type strings
@@ -20,6 +20,7 @@ thus avoiding relying on an irrelevant cur_ops value.
Reported-by: kernel test robot <rong.a.chen@intel.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index f42cf69ef539..0910baea3cbc 100644
diff --git a/queue/rtc-xgene-fix-possible-race-condition.patch b/queue/rtc-xgene-fix-possible-race-condition.patch
index 6ad866a..4106bea 100644
--- a/queue/rtc-xgene-fix-possible-race-condition.patch
+++ b/queue/rtc-xgene-fix-possible-race-condition.patch
@@ -1,4 +1,4 @@
-From a652e00ee1233e251a337c28e18a1da59224e5ce Mon Sep 17 00:00:00 2001
+From 90734d5a6d9d539524f003ea73ca81d654430386 Mon Sep 17 00:00:00 2001
From: Alexandre Belloni <alexandre.belloni@bootlin.com>
Date: Wed, 20 Mar 2019 13:32:27 +0100
Subject: [PATCH] rtc: xgene: fix possible race condition
@@ -13,6 +13,7 @@ Switch to devm_rtc_allocate_device/rtc_register_device to allocate the rtc
struct before requesting the IRQ.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/rtc/rtc-xgene.c b/drivers/rtc/rtc-xgene.c
index 153820876a82..2f741f455c30 100644
diff --git a/queue/rtlwifi-fix-a-potential-NULL-pointer-dereference.patch b/queue/rtlwifi-fix-a-potential-NULL-pointer-dereference.patch
index ca93c55..cb21c1d 100644
--- a/queue/rtlwifi-fix-a-potential-NULL-pointer-dereference.patch
+++ b/queue/rtlwifi-fix-a-potential-NULL-pointer-dereference.patch
@@ -1,4 +1,4 @@
-From 765976285a8c8db3f0eb7f033829a899d0c2786e Mon Sep 17 00:00:00 2001
+From a745154df8a097099b6838291fab068beeaf10a6 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Tue, 12 Mar 2019 02:56:33 -0500
Subject: [PATCH] rtlwifi: fix a potential NULL pointer dereference
@@ -10,12 +10,13 @@ returns to avoid NULL pointer dereference.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c
-index 217d2a7a43c7..ac746c322554 100644
+index a46bcf676e42..9035f35eb874 100644
--- a/drivers/net/wireless/realtek/rtlwifi/base.c
+++ b/drivers/net/wireless/realtek/rtlwifi/base.c
-@@ -448,6 +448,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
+@@ -469,6 +469,11 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
/* <2> work queue */
rtlpriv->works.hw = hw;
rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
diff --git a/queue/rtlwifi-fix-potential-NULL-pointer-dereference.patch b/queue/rtlwifi-fix-potential-NULL-pointer-dereference.patch
index 604fba1..c1bd5c2 100644
--- a/queue/rtlwifi-fix-potential-NULL-pointer-dereference.patch
+++ b/queue/rtlwifi-fix-potential-NULL-pointer-dereference.patch
@@ -1,4 +1,4 @@
-From 9d1956b9eae5fdedef51432ae3151a2ac4c9fc2c Mon Sep 17 00:00:00 2001
+From fa5fde7d04692cbbf6b6e663c262f2035adf5037 Mon Sep 17 00:00:00 2001
From: Ping-Ke Shih <pkshih@realtek.com>
Date: Tue, 12 Mar 2019 17:06:48 +0800
Subject: [PATCH] rtlwifi: fix potential NULL pointer dereference
@@ -10,6 +10,7 @@ potential NULL pointer dereference.
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
index 63874512598b..b5f91c994c79 100644
diff --git a/queue/s390-cio-fix-cio_irb-declaration.patch b/queue/s390-cio-fix-cio_irb-declaration.patch
index 28d5178..29c761c 100644
--- a/queue/s390-cio-fix-cio_irb-declaration.patch
+++ b/queue/s390-cio-fix-cio_irb-declaration.patch
@@ -1,4 +1,4 @@
-From e91012ee855ad9f5ef2ab106a3de51db93fe4d0c Mon Sep 17 00:00:00 2001
+From 01aa3b7f4dd2ccb241fb05bb453f95ba44bd11d5 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Apr 2019 23:26:20 +0200
Subject: [PATCH] s390: cio: fix cio_irb declaration
@@ -38,9 +38,10 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
-index 9811fd8a0c73..92eabbb5f18d 100644
+index 94cd813bdcfe..d23d43cf9cbc 100644
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -115,7 +115,7 @@ struct subchannel {
diff --git a/queue/s390-zcrypt-initialize-variables-before_use.patch b/queue/s390-zcrypt-initialize-variables-before_use.patch
index e6d91b8..36c7988 100644
--- a/queue/s390-zcrypt-initialize-variables-before_use.patch
+++ b/queue/s390-zcrypt-initialize-variables-before_use.patch
@@ -1,4 +1,4 @@
-From 913140e221567b3ecd21b4242257a7e3fa279026 Mon Sep 17 00:00:00 2001
+From c606d82f7e36c741478018d38a32ebaf33373fee Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Apr 2019 23:26:18 +0200
Subject: [PATCH] s390: zcrypt: initialize variables before_use
@@ -28,12 +28,13 @@ and make the warning output consistent.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c
-index 689c2af7026a..c31b2d31cd83 100644
+index febcdb5135bf..e520dd119c94 100644
--- a/drivers/s390/crypto/zcrypt_api.c
+++ b/drivers/s390/crypto/zcrypt_api.c
-@@ -659,6 +659,7 @@ static long zcrypt_rsa_modexpo(struct ap_perms *perms,
+@@ -222,6 +222,7 @@ static long zcrypt_rsa_modexpo(struct ica_rsa_modexpo *mex)
trace_s390_zcrypt_req(mex, TP_ICARSAMODEXPO);
if (mex->outputdatalength < mex->inputdatalength) {
@@ -41,7 +42,7 @@ index 689c2af7026a..c31b2d31cd83 100644
rc = -EINVAL;
goto out;
}
-@@ -742,6 +743,7 @@ static long zcrypt_rsa_crt(struct ap_perms *perms,
+@@ -296,6 +297,7 @@ static long zcrypt_rsa_crt(struct ica_rsa_modexpo_crt *crt)
trace_s390_zcrypt_req(crt, TP_ICARSACRT);
if (crt->outputdatalength < crt->inputdatalength) {
@@ -49,7 +50,7 @@ index 689c2af7026a..c31b2d31cd83 100644
rc = -EINVAL;
goto out;
}
-@@ -951,6 +953,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,
+@@ -481,6 +483,7 @@ static long zcrypt_send_ep11_cprb(struct ep11_urb *xcrb)
targets = kcalloc(target_num, sizeof(*targets), GFP_KERNEL);
if (!targets) {
@@ -57,7 +58,7 @@ index 689c2af7026a..c31b2d31cd83 100644
rc = -ENOMEM;
goto out;
}
-@@ -958,6 +961,7 @@ static long zcrypt_send_ep11_cprb(struct ap_perms *perms,
+@@ -488,6 +491,7 @@ static long zcrypt_send_ep11_cprb(struct ep11_urb *xcrb)
uptr = (struct ep11_target_dev __force __user *) xcrb->targets;
if (copy_from_user(targets, uptr,
target_num * sizeof(*targets))) {
diff --git a/queue/sched-core-Check-quota-and-period-overflow-at-usec-t.patch b/queue/sched-core-Check-quota-and-period-overflow-at-usec-t.patch
index c4509ba..d6e2832 100644
--- a/queue/sched-core-Check-quota-and-period-overflow-at-usec-t.patch
+++ b/queue/sched-core-Check-quota-and-period-overflow-at-usec-t.patch
@@ -1,4 +1,4 @@
-From 1a8b4540db732ca16c9e43ac7c08b1b8f0b252d8 Mon Sep 17 00:00:00 2001
+From 98609290e8f53f23401539931b161fec405b61a8 Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date: Wed, 27 Feb 2019 11:10:20 +0300
Subject: [PATCH] sched/core: Check quota and period overflow at usec to nsec
@@ -25,12 +25,13 @@ Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/155125502079.293431.3947497929372138600.stgit@buzz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 685b1541ce51..de8ab411826c 100644
+index c59b5e8e8f14..2d332a87cb7e 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -6611,8 +6611,10 @@ static int tg_set_cfs_quota(struct task_group *tg, long cfs_quota_us)
+@@ -6632,8 +6632,10 @@ int tg_set_cfs_quota(struct task_group *tg, long cfs_quota_us)
period = ktime_to_ns(tg->cfs_bandwidth.period);
if (cfs_quota_us < 0)
quota = RUNTIME_INF;
@@ -42,7 +43,7 @@ index 685b1541ce51..de8ab411826c 100644
return tg_set_cfs_bandwidth(tg, period, quota);
}
-@@ -6634,6 +6636,9 @@ static int tg_set_cfs_period(struct task_group *tg, long cfs_period_us)
+@@ -6655,6 +6657,9 @@ int tg_set_cfs_period(struct task_group *tg, long cfs_period_us)
{
u64 quota, period;
diff --git a/queue/sched-core-Handle-overflow-in-cpu_shares_write_u64.patch b/queue/sched-core-Handle-overflow-in-cpu_shares_write_u64.patch
index c43a1c7..7b929c7 100644
--- a/queue/sched-core-Handle-overflow-in-cpu_shares_write_u64.patch
+++ b/queue/sched-core-Handle-overflow-in-cpu_shares_write_u64.patch
@@ -1,4 +1,4 @@
-From 5b61d50ab4ef590f5e1d4df15cd2cea5f5715308 Mon Sep 17 00:00:00 2001
+From 77552898f047b23208ccd50f9ce1c96db130d72a Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date: Wed, 27 Feb 2019 11:10:18 +0300
Subject: [PATCH] sched/core: Handle overflow in cpu_shares_write_u64
@@ -23,12 +23,13 @@ Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/155125501891.293431.3345233332801109696.stgit@buzz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index fb09eaad1d3a..685b1541ce51 100644
+index 2d332a87cb7e..2c5b222d4de6 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
-@@ -6507,6 +6507,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset)
+@@ -6530,6 +6530,8 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset)
static int cpu_shares_write_u64(struct cgroup_subsys_state *css,
struct cftype *cftype, u64 shareval)
{
diff --git a/queue/sched-rt-Check-integer-overflow-at-usec-to-nsec-conv.patch b/queue/sched-rt-Check-integer-overflow-at-usec-to-nsec-conv.patch
index a945633..35cd4b3 100644
--- a/queue/sched-rt-Check-integer-overflow-at-usec-to-nsec-conv.patch
+++ b/queue/sched-rt-Check-integer-overflow-at-usec-to-nsec-conv.patch
@@ -1,4 +1,4 @@
-From 1a010e29cfa00fee2888fd2fd4983f848cbafb58 Mon Sep 17 00:00:00 2001
+From 17046f839e8db94d81001b7ac75eb78c09f4ae11 Mon Sep 17 00:00:00 2001
From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Date: Wed, 27 Feb 2019 11:10:17 +0300
Subject: [PATCH] sched/rt: Check integer overflow at usec to nsec conversion
@@ -24,12 +24,13 @@ Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/155125501739.293431.5252197504404771496.stgit@buzz
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
-index 90fa23d36565..1e6b909dca36 100644
+index eaaec8364f96..a8e1a778bf6e 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
-@@ -2555,6 +2555,8 @@ int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)
+@@ -2548,6 +2548,8 @@ int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)
rt_runtime = (u64)rt_runtime_us * NSEC_PER_USEC;
if (rt_runtime_us < 0)
rt_runtime = RUNTIME_INF;
@@ -38,7 +39,7 @@ index 90fa23d36565..1e6b909dca36 100644
return tg_set_rt_bandwidth(tg, rt_period, rt_runtime);
}
-@@ -2575,6 +2577,9 @@ int sched_group_set_rt_period(struct task_group *tg, u64 rt_period_us)
+@@ -2568,6 +2570,9 @@ int sched_group_set_rt_period(struct task_group *tg, u64 rt_period_us)
{
u64 rt_runtime, rt_period;
diff --git a/queue/scsi-libsas-Do-discovery-on-empty-PHY-to-update-PHY-.patch b/queue/scsi-libsas-Do-discovery-on-empty-PHY-to-update-PHY-.patch
index 3edd4a7..39388b5 100644
--- a/queue/scsi-libsas-Do-discovery-on-empty-PHY-to-update-PHY-.patch
+++ b/queue/scsi-libsas-Do-discovery-on-empty-PHY-to-update-PHY-.patch
@@ -1,4 +1,4 @@
-From d8649fc1c5e40e691d589ed825998c36a947491c Mon Sep 17 00:00:00 2001
+From aeeca537babc12f0a71bfb09064cbd725add8db2 Mon Sep 17 00:00:00 2001
From: John Garry <john.garry@huawei.com>
Date: Fri, 12 Apr 2019 16:57:56 +0800
Subject: [PATCH] scsi: libsas: Do discovery on empty PHY to update PHY info
@@ -29,12 +29,13 @@ We must do this after unregistering the device associated with the PHY
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
-index 6f569a65d791..ad96bc843acc 100644
+index e9ecc667e3fb..231eb79efa32 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
-@@ -2068,6 +2068,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id,
+@@ -2040,6 +2040,11 @@ static int sas_rediscover_dev(struct domain_device *dev, int phy_id, bool last)
if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) {
phy->phy_state = PHY_EMPTY;
sas_unregister_devs_sas_addr(dev, phy_id, last);
diff --git a/queue/scsi-lpfc-Fix-SLI3-commands-being-issued-on-SLI4-dev.patch b/queue/scsi-lpfc-Fix-SLI3-commands-being-issued-on-SLI4-dev.patch
index 824f57a..e2e8f6f 100644
--- a/queue/scsi-lpfc-Fix-SLI3-commands-being-issued-on-SLI4-dev.patch
+++ b/queue/scsi-lpfc-Fix-SLI3-commands-being-issued-on-SLI4-dev.patch
@@ -1,4 +1,4 @@
-From c95a3b4b0fb8d351e2329a96f87c4fc96a149505 Mon Sep 17 00:00:00 2001
+From e41fa666c7653d85b10d03066f88dbda73007b50 Mon Sep 17 00:00:00 2001
From: James Smart <jsmart2021@gmail.com>
Date: Tue, 12 Mar 2019 16:30:07 -0700
Subject: [PATCH] scsi: lpfc: Fix SLI3 commands being issued on SLI4 devices
@@ -14,12 +14,13 @@ Revise the code to stop sending these commands on a SLI4 adapter.
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
-index 3fb20ade9005..75e9d46d44d4 100644
+index 2fef54fab86d..6cdc99435ffe 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
-@@ -932,7 +932,11 @@ lpfc_linkdown(struct lpfc_hba *phba)
+@@ -921,7 +921,11 @@ lpfc_linkdown(struct lpfc_hba *phba)
}
}
lpfc_destroy_vport_work_array(phba, vports);
@@ -32,7 +33,7 @@ index 3fb20ade9005..75e9d46d44d4 100644
mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
if (mb) {
lpfc_unreg_did(phba, 0xffff, LPFC_UNREG_ALL_DFLT_RPIS, mb);
-@@ -944,6 +948,7 @@ lpfc_linkdown(struct lpfc_hba *phba)
+@@ -933,6 +937,7 @@ lpfc_linkdown(struct lpfc_hba *phba)
}
}
@@ -40,7 +41,7 @@ index 3fb20ade9005..75e9d46d44d4 100644
/* Setup myDID for link up if we are in pt2pt mode */
if (phba->pport->fc_flag & FC_PT2PT) {
mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-@@ -4983,6 +4988,10 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport)
+@@ -4855,6 +4860,10 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport)
LPFC_MBOXQ_t *mbox;
int rc;
diff --git a/queue/scsi-lpfc-Fix-fc4type-information-for-FDMI.patch b/queue/scsi-lpfc-Fix-fc4type-information-for-FDMI.patch
index 46809a0..fff2f56 100644
--- a/queue/scsi-lpfc-Fix-fc4type-information-for-FDMI.patch
+++ b/queue/scsi-lpfc-Fix-fc4type-information-for-FDMI.patch
@@ -1,4 +1,4 @@
-From 32a80c093b524a0682f1c6166c910387b116ffce Mon Sep 17 00:00:00 2001
+From 1deb9695ab4dfefe2b61319488c0cc12e582a05f Mon Sep 17 00:00:00 2001
From: James Smart <jsmart2021@gmail.com>
Date: Tue, 12 Mar 2019 16:30:21 -0700
Subject: [PATCH] scsi: lpfc: Fix fc4type information for FDMI
@@ -13,12 +13,13 @@ Fix (and make more readable) when NVME protocol support is indicated.
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
-index 0f09e9b41435..48a3633bce67 100644
+index 8656f3c50546..bdda0f66645f 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
-@@ -2363,10 +2363,11 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport,
+@@ -2117,10 +2117,11 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport,
ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
memset(ae, 0, 32);
@@ -34,7 +35,7 @@ index 0f09e9b41435..48a3633bce67 100644
size = FOURBYTES + 32;
ad->AttrLen = cpu_to_be16(size);
ad->AttrType = cpu_to_be16(RPRT_SUPPORTED_FC4_TYPES);
-@@ -2676,9 +2677,11 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport,
+@@ -2425,9 +2426,11 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport,
ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
memset(ae, 0, 32);
diff --git a/queue/scsi-lpfc-avoid-uninitialized-variable-warning.patch b/queue/scsi-lpfc-avoid-uninitialized-variable-warning.patch
index 494f7ec..c5cc002 100644
--- a/queue/scsi-lpfc-avoid-uninitialized-variable-warning.patch
+++ b/queue/scsi-lpfc-avoid-uninitialized-variable-warning.patch
@@ -1,4 +1,4 @@
-From 85fce46b4f999ab94af2f28c80cc6cf8de271ac0 Mon Sep 17 00:00:00 2001
+From 239867d11decf9b8b8b477ffe3db5507b4401b75 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 22 Mar 2019 15:25:49 +0100
Subject: [PATCH] scsi: lpfc: avoid uninitialized variable warning
@@ -28,6 +28,7 @@ makes the code more readable and gets rid of the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c
index ecb922241287..b4920f83ebb2 100644
diff --git a/queue/scsi-qedf-Add-missing-return-in-qedf_post_io_req-in-.patch b/queue/scsi-qedf-Add-missing-return-in-qedf_post_io_req-in-.patch
index 0965305..3b90d19 100644
--- a/queue/scsi-qedf-Add-missing-return-in-qedf_post_io_req-in-.patch
+++ b/queue/scsi-qedf-Add-missing-return-in-qedf_post_io_req-in-.patch
@@ -1,4 +1,4 @@
-From c5e06ba2f76809ad1492fdad312e81335df46bc5 Mon Sep 17 00:00:00 2001
+From c801599898b93981ec6e07312b1bfbd4cc95a168 Mon Sep 17 00:00:00 2001
From: Chad Dupuis <cdupuis@marvell.com>
Date: Tue, 26 Mar 2019 00:38:35 -0700
Subject: [PATCH] scsi: qedf: Add missing return in qedf_post_io_req() in the
@@ -58,9 +58,10 @@ invalid task which can lead to the crash:
Signed-off-by: Chad Dupuis <cdupuis@marvell.com>
Signed-off-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c
-index 7c2ecf35036b..da728d2e17b3 100644
+index 6bbc38b1b465..a17c13846d1e 100644
--- a/drivers/scsi/qedf/qedf_io.c
+++ b/drivers/scsi/qedf/qedf_io.c
@@ -902,6 +902,7 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)
diff --git a/queue/scsi-qla4xxx-avoid-freeing-unallocated-dma-memory.patch b/queue/scsi-qla4xxx-avoid-freeing-unallocated-dma-memory.patch
index 71da6c1..d0d3da0 100644
--- a/queue/scsi-qla4xxx-avoid-freeing-unallocated-dma-memory.patch
+++ b/queue/scsi-qla4xxx-avoid-freeing-unallocated-dma-memory.patch
@@ -1,4 +1,4 @@
-From 608f729c31d4caf52216ea00d20092a80959256d Mon Sep 17 00:00:00 2001
+From cc35553386e5b14e0f42eb892c094727f4aabd7f Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 22 Mar 2019 15:25:03 +0100
Subject: [PATCH] scsi: qla4xxx: avoid freeing unallocated dma memory
@@ -29,12 +29,13 @@ Fixes: 2a991c215978 ("[SCSI] qla4xxx: Boot from SAN support for open-iscsi")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index 16a18d5d856f..daa884fa43f4 100644
+index 5dd3e4e01b10..25c8ce54a976 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -5928,7 +5928,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
+@@ -5935,7 +5935,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
val = rd_nvram_byte(ha, sec_addr);
if (val & BIT_7)
ddb_index[1] = (val & 0x7f);
diff --git a/queue/scsi-ufs-Avoid-configuring-regulator-with-undefined-.patch b/queue/scsi-ufs-Avoid-configuring-regulator-with-undefined-.patch
index cae5a47..976bf5c 100644
--- a/queue/scsi-ufs-Avoid-configuring-regulator-with-undefined-.patch
+++ b/queue/scsi-ufs-Avoid-configuring-regulator-with-undefined-.patch
@@ -1,4 +1,4 @@
-From 3b141e8cfd54ba3e5c610717295b2a02aab26a05 Mon Sep 17 00:00:00 2001
+From e98f06d7796de1fa9e66fb23c36e121319b1f294 Mon Sep 17 00:00:00 2001
From: Stanley Chu <stanley.chu@mediatek.com>
Date: Thu, 28 Mar 2019 17:16:24 +0800
Subject: [PATCH] scsi: ufs: Avoid configuring regulator with undefined voltage
@@ -25,12 +25,13 @@ Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Acked-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
-index e040f9dd9ff3..81d99aebb867 100644
+index 55e374bbfca4..83a229d3a39d 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
-@@ -7039,12 +7039,15 @@ static int ufshcd_config_vreg(struct device *dev,
+@@ -6800,12 +6800,15 @@ static int ufshcd_config_vreg(struct device *dev,
name = vreg->name;
if (regulator_count_voltages(reg) > 0) {
diff --git a/queue/scsi-ufs-Fix-regulator-load-and-icc-level-configurat.patch b/queue/scsi-ufs-Fix-regulator-load-and-icc-level-configurat.patch
index 10a0c35..5787fca 100644
--- a/queue/scsi-ufs-Fix-regulator-load-and-icc-level-configurat.patch
+++ b/queue/scsi-ufs-Fix-regulator-load-and-icc-level-configurat.patch
@@ -1,4 +1,4 @@
-From 0487fff76632ec023d394a05b82e87a971db8c03 Mon Sep 17 00:00:00 2001
+From 72018b160d582118db4766efd6b9e0f64f2f3c90 Mon Sep 17 00:00:00 2001
From: Stanley Chu <stanley.chu@mediatek.com>
Date: Thu, 28 Mar 2019 17:16:25 +0800
Subject: [PATCH] scsi: ufs: Fix regulator load and icc-level configuration
@@ -23,12 +23,13 @@ Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Acked-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
-index 81d99aebb867..5ba49c8cd2a3 100644
+index 200d2797a17e..55e374bbfca4 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
-@@ -6294,19 +6294,19 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba,
+@@ -6108,19 +6108,19 @@ static u32 ufshcd_find_max_sup_active_icc_level(struct ufs_hba *hba,
goto out;
}
@@ -51,7 +52,7 @@ index 81d99aebb867..5ba49c8cd2a3 100644
icc_level = ufshcd_get_max_icc_level(
hba->vreg_info.vccq2->max_uA,
icc_level,
-@@ -7004,6 +7004,15 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,
+@@ -6745,6 +6745,15 @@ static int ufshcd_config_vreg_load(struct device *dev, struct ufs_vreg *vreg,
if (!vreg)
return 0;
diff --git a/queue/selftests-bpf-ksym_search-won-t-check-symbols-exists.patch b/queue/selftests-bpf-ksym_search-won-t-check-symbols-exists.patch
index da61c1b..951ca54 100644
--- a/queue/selftests-bpf-ksym_search-won-t-check-symbols-exists.patch
+++ b/queue/selftests-bpf-ksym_search-won-t-check-symbols-exists.patch
@@ -1,4 +1,4 @@
-From 0979ff7992fb6f4eb837995b12f4071dcafebd2d Mon Sep 17 00:00:00 2001
+From a667871d1cad5197023a8fe0e67e5ed88769bc67 Mon Sep 17 00:00:00 2001
From: "Daniel T. Lee" <danieltimlee@gmail.com>
Date: Thu, 4 Apr 2019 07:17:55 +0900
Subject: [PATCH] selftests/bpf: ksym_search won't check symbols exists
@@ -17,12 +17,13 @@ to the symbol search.
Signed-off-by: Daniel T. Lee <danieltimlee@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c
-index 4cdb63bf0521..9a9fc6c9b70b 100644
+index 3868dcb63420..c98e73e9fbaf 100644
--- a/tools/testing/selftests/bpf/trace_helpers.c
+++ b/tools/testing/selftests/bpf/trace_helpers.c
-@@ -52,6 +52,10 @@ struct ksym *ksym_search(long key)
+@@ -51,6 +51,10 @@ struct ksym *ksym_search(long key)
int start = 0, end = sym_cnt;
int result;
diff --git a/queue/selftests-cgroup-fix-cleanup-path-in-test_memcg_subt.patch b/queue/selftests-cgroup-fix-cleanup-path-in-test_memcg_subt.patch
index e336f00..79aa507 100644
--- a/queue/selftests-cgroup-fix-cleanup-path-in-test_memcg_subt.patch
+++ b/queue/selftests-cgroup-fix-cleanup-path-in-test_memcg_subt.patch
@@ -1,4 +1,4 @@
-From e14d314c7a489f060d6d691866fef5f131281718 Mon Sep 17 00:00:00 2001
+From 0ee94cb5b5fc07dccc7ac9db16794d418c063568 Mon Sep 17 00:00:00 2001
From: Roman Gushchin <guro@fb.com>
Date: Mon, 8 Apr 2019 15:12:30 -0700
Subject: [PATCH] selftests: cgroup: fix cleanup path in
@@ -22,12 +22,13 @@ Cc: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Shuah Khan (Samsung OSG) <shuah@kernel.org>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Shuah Khan <shuah@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
-index 28d321ba311b..6f339882a6ca 100644
+index cf0bddc9d271..ae8f04f84b03 100644
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,7 @@
*/
static int test_memcg_subtree_control(const char *root)
{
@@ -36,7 +37,7 @@ index 28d321ba311b..6f339882a6ca 100644
int ret = KSFT_FAIL;
char buf[PAGE_SIZE];
-@@ -34,50 +34,54 @@ static int test_memcg_subtree_control(const char *root)
+@@ -33,50 +33,54 @@ static int test_memcg_subtree_control(const char *root)
parent = cg_name(root, "memcg_test_0");
child = cg_name(root, "memcg_test_0/memcg_test_1");
if (!parent || !child)
diff --git a/queue/selinux-avoid-uninitialized-variable-warning.patch b/queue/selinux-avoid-uninitialized-variable-warning.patch
index 50cfcc4..9436992 100644
--- a/queue/selinux-avoid-uninitialized-variable-warning.patch
+++ b/queue/selinux-avoid-uninitialized-variable-warning.patch
@@ -1,4 +1,4 @@
-From 98bbbb76f2edcfb8fb2b8f4b3ccc7b6e99d64bd8 Mon Sep 17 00:00:00 2001
+From 6b77f078ab4daaa2d75de359eb93c26b13e0b2a6 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Mar 2019 15:23:11 +0100
Subject: [PATCH] selinux: avoid uninitialized variable warning
@@ -30,6 +30,7 @@ so this cannot happen.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[PM: removed old patchwork link, fixed checkpatch.pl style errors]
Signed-off-by: Paul Moore <paul@paul-moore.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/security/selinux/netlabel.c b/security/selinux/netlabel.c
index 186e727b737b..6fd9954e1c08 100644
diff --git a/queue/sh-sh7786-Add-explicit-I-O-cast-to-sh7786_mm_sel.patch b/queue/sh-sh7786-Add-explicit-I-O-cast-to-sh7786_mm_sel.patch
index 1151e10..2163620 100644
--- a/queue/sh-sh7786-Add-explicit-I-O-cast-to-sh7786_mm_sel.patch
+++ b/queue/sh-sh7786-Add-explicit-I-O-cast-to-sh7786_mm_sel.patch
@@ -1,4 +1,4 @@
-From 8440bb9b944c02222c7a840d406141ed42e945cd Mon Sep 17 00:00:00 2001
+From e972e83100fc9f4eba5f9380f5553b7a2f324fee Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Mon, 11 Feb 2019 13:58:43 +0100
Subject: [PATCH] sh: sh7786: Add explicit I/O cast to sh7786_mm_sel()
@@ -38,12 +38,13 @@ Note that this also gets rid of a sparse warning on SuperH:
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/sh/include/cpu-sh4/cpu/sh7786.h b/arch/sh/include/cpu-sh4/cpu/sh7786.h
-index 8f9bfbf3cdb1..d6cce65b4871 100644
+index 96b8cb1f754a..029bbadaf7ab 100644
--- a/arch/sh/include/cpu-sh4/cpu/sh7786.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7786.h
-@@ -132,7 +132,7 @@ enum {
+@@ -135,7 +135,7 @@ enum {
static inline u32 sh7786_mm_sel(void)
{
diff --git a/queue/spi-Fix-zero-length-xfer-bug.patch b/queue/spi-Fix-zero-length-xfer-bug.patch
index dd7057b..18f02d2 100644
--- a/queue/spi-Fix-zero-length-xfer-bug.patch
+++ b/queue/spi-Fix-zero-length-xfer-bug.patch
@@ -1,4 +1,4 @@
-From 5442dcaa0d90fc376bdfc179a018931a8f43dea4 Mon Sep 17 00:00:00 2001
+From efe1b9b397c1153ebae09430f4e4a61b09cbac56 Mon Sep 17 00:00:00 2001
From: Chris Lesiak <chris.lesiak@licor.com>
Date: Thu, 7 Mar 2019 20:39:00 +0000
Subject: [PATCH] spi: Fix zero length xfer bug
@@ -25,12 +25,13 @@ the xfer length is zero.
Signed-off-by: Chris Lesiak <chris.lesiak@licor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 93986f879b09..2be394d3bc59 100644
+index 9da0bc5a036c..88a8a8edd44b 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
-@@ -1039,6 +1039,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)
+@@ -982,6 +982,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)
if (max_tx || max_rx) {
list_for_each_entry(xfer, &msg->transfers,
transfer_list) {
diff --git a/queue/spi-imx-stop-buffer-overflow-in-RX-FIFO-flush.patch b/queue/spi-imx-stop-buffer-overflow-in-RX-FIFO-flush.patch
index 195fba0..a58a89f 100644
--- a/queue/spi-imx-stop-buffer-overflow-in-RX-FIFO-flush.patch
+++ b/queue/spi-imx-stop-buffer-overflow-in-RX-FIFO-flush.patch
@@ -1,4 +1,4 @@
-From c842749ea1d32513f9e603c074d60d7aa07cb2ef Mon Sep 17 00:00:00 2001
+From cde754941eea94801283fc404bbfbc1ff99bb822 Mon Sep 17 00:00:00 2001
From: Trent Piepho <tpiepho@impinj.com>
Date: Mon, 4 Mar 2019 20:18:49 +0000
Subject: [PATCH] spi: imx: stop buffer overflow in RX FIFO flush
@@ -34,12 +34,13 @@ Cc: Stefan Agner <stefan@agner.ch>
Cc: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Trent Piepho <tpiepho@impinj.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
-index 6ec647bbba77..a81ae29aa68a 100644
+index d3b21faf6b1f..e7f1620d18c0 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
-@@ -1494,7 +1494,7 @@ static int spi_imx_transfer(struct spi_device *spi,
+@@ -1387,7 +1387,7 @@ static int spi_imx_transfer(struct spi_device *spi,
/* flush rxfifo before transfer */
while (spi_imx->devtype_data->rx_available(spi_imx))
diff --git a/queue/spi-rspi-Fix-sequencer-reset-during-initialization.patch b/queue/spi-rspi-Fix-sequencer-reset-during-initialization.patch
index 65706f2..3eee45b 100644
--- a/queue/spi-rspi-Fix-sequencer-reset-during-initialization.patch
+++ b/queue/spi-rspi-Fix-sequencer-reset-during-initialization.patch
@@ -1,4 +1,4 @@
-From 26843bb128590edd7eba1ad7ce22e4b9f1066ce3 Mon Sep 17 00:00:00 2001
+From dfe94db68b9773c38b44e61672b642e464239a8d Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Tue, 12 Mar 2019 19:45:13 +0100
Subject: [PATCH] spi: rspi: Fix sequencer reset during initialization
@@ -15,12 +15,13 @@ Fix this by initializing it explicitly during configuration.
Fixes: 0b2182ddac4b8837 ("spi: add support for Renesas RSPI")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
-index b30fed824e66..3be8fbe80b08 100644
+index b37de1d991d6..d61120822f02 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
-@@ -271,7 +271,8 @@ static int rspi_set_config_register(struct rspi_data *rspi, int access_size)
+@@ -279,7 +279,8 @@ static int rspi_set_config_register(struct rspi_data *rspi, int access_size)
/* Sets parity, interrupt mask */
rspi_write8(rspi, 0x00, RSPI_SPCR2);
@@ -30,7 +31,7 @@ index b30fed824e66..3be8fbe80b08 100644
rspi->spcmd |= SPCMD_SPB_8_TO_16(access_size);
rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
-@@ -315,7 +316,8 @@ static int rspi_rz_set_config_register(struct rspi_data *rspi, int access_size)
+@@ -323,7 +324,8 @@ static int rspi_rz_set_config_register(struct rspi_data *rspi, int access_size)
rspi_write8(rspi, 0x00, RSPI_SSLND);
rspi_write8(rspi, 0x00, RSPI_SPND);
@@ -40,7 +41,7 @@ index b30fed824e66..3be8fbe80b08 100644
rspi->spcmd |= SPCMD_SPB_8_TO_16(access_size);
rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
-@@ -366,7 +368,8 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size)
+@@ -374,7 +376,8 @@ static int qspi_set_config_register(struct rspi_data *rspi, int access_size)
/* Sets buffer to allow normal operation */
rspi_write8(rspi, 0x00, QSPI_SPBFCR);
diff --git a/queue/spi-spi-topcliff-pch-Fix-to-handle-empty-DMA-buffers.patch b/queue/spi-spi-topcliff-pch-Fix-to-handle-empty-DMA-buffers.patch
index 13dc956..55d093c 100644
--- a/queue/spi-spi-topcliff-pch-Fix-to-handle-empty-DMA-buffers.patch
+++ b/queue/spi-spi-topcliff-pch-Fix-to-handle-empty-DMA-buffers.patch
@@ -1,4 +1,4 @@
-From f37d8e67f39e6d3eaf4cc5471e8a3d21209843c6 Mon Sep 17 00:00:00 2001
+From e53ad4ccec7686806c44b925d8162cdd04a20c2d Mon Sep 17 00:00:00 2001
From: Aditya Pakki <pakki001@umn.edu>
Date: Wed, 13 Mar 2019 11:55:41 -0500
Subject: [PATCH] spi : spi-topcliff-pch: Fix to handle empty DMA buffers
@@ -11,12 +11,13 @@ failures and sends the error upstream.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
-index e7e8ea1edcce..fa730a871d25 100644
+index 97d137591b18..4389ab80c23e 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
-@@ -1300,18 +1300,27 @@ static void pch_free_dma_buf(struct pch_spi_board_data *board_dat,
+@@ -1294,18 +1294,27 @@ static void pch_free_dma_buf(struct pch_spi_board_data *board_dat,
dma->rx_buf_virt, dma->rx_buf_dma);
}
@@ -45,7 +46,7 @@ index e7e8ea1edcce..fa730a871d25 100644
}
static int pch_spi_pd_probe(struct platform_device *plat_dev)
-@@ -1388,7 +1397,9 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev)
+@@ -1382,7 +1391,9 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev)
if (use_dma) {
dev_info(&plat_dev->dev, "Use DMA for data transfers\n");
diff --git a/queue/spi-tegra114-reset-controller-on-probe.patch b/queue/spi-tegra114-reset-controller-on-probe.patch
index 5def5f2..2075bea 100644
--- a/queue/spi-tegra114-reset-controller-on-probe.patch
+++ b/queue/spi-tegra114-reset-controller-on-probe.patch
@@ -1,4 +1,4 @@
-From 019194933339b3e9b486639c8cb3692020844d65 Mon Sep 17 00:00:00 2001
+From 353c644858c32b8d1fe437d4a1271c46c367b654 Mon Sep 17 00:00:00 2001
From: Sowjanya Komatineni <skomatineni@nvidia.com>
Date: Tue, 26 Mar 2019 22:56:32 -0700
Subject: [PATCH] spi: tegra114: reset controller on probe
@@ -10,12 +10,13 @@ on probe to make sure it is in valid state before initiating transfer.
Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
-index 05bb2f9bff3c..09cfae3abce2 100644
+index a76acedd7e2f..a1888dc6a938 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
-@@ -1136,27 +1136,19 @@ static int tegra_spi_probe(struct platform_device *pdev)
+@@ -1067,27 +1067,19 @@ static int tegra_spi_probe(struct platform_device *pdev)
spi_irq = platform_get_irq(pdev, 0);
tspi->irq = spi_irq;
@@ -45,7 +46,7 @@ index 05bb2f9bff3c..09cfae3abce2 100644
}
tspi->max_buf_size = SPI_FIFO_DEPTH << 2;
-@@ -1164,7 +1156,7 @@ static int tegra_spi_probe(struct platform_device *pdev)
+@@ -1095,7 +1087,7 @@ static int tegra_spi_probe(struct platform_device *pdev)
ret = tegra_spi_init_dma_param(tspi, true);
if (ret < 0)
@@ -54,7 +55,7 @@ index 05bb2f9bff3c..09cfae3abce2 100644
ret = tegra_spi_init_dma_param(tspi, false);
if (ret < 0)
goto exit_rx_dma_free;
-@@ -1186,18 +1178,32 @@ static int tegra_spi_probe(struct platform_device *pdev)
+@@ -1117,18 +1109,32 @@ static int tegra_spi_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "pm runtime get failed, e = %d\n", ret);
goto exit_pm_disable;
}
@@ -88,7 +89,7 @@ index 05bb2f9bff3c..09cfae3abce2 100644
exit_pm_disable:
pm_runtime_disable(&pdev->dev);
if (!pm_runtime_status_suspended(&pdev->dev))
-@@ -1205,8 +1211,6 @@ exit_pm_disable:
+@@ -1136,8 +1142,6 @@ static int tegra_spi_probe(struct platform_device *pdev)
tegra_spi_deinit_dma_param(tspi, false);
exit_rx_dma_free:
tegra_spi_deinit_dma_param(tspi, true);
diff --git a/queue/staging-vc04_services-handle-kzalloc-failure.patch b/queue/staging-vc04_services-handle-kzalloc-failure.patch
index 48fc506..f382e11 100644
--- a/queue/staging-vc04_services-handle-kzalloc-failure.patch
+++ b/queue/staging-vc04_services-handle-kzalloc-failure.patch
@@ -1,4 +1,4 @@
-From a5112277872a56017b777770e2fd4324d4a6c866 Mon Sep 17 00:00:00 2001
+From d972a3a9ebf1a08d6faf554dbde675ee58896839 Mon Sep 17 00:00:00 2001
From: Nicholas Mc Guire <hofrat@osadl.org>
Date: Fri, 19 Apr 2019 01:31:08 +0200
Subject: [PATCH] staging: vc04_services: handle kzalloc failure
@@ -16,12 +16,13 @@ Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Reported-by: kbuild test robot <lkp@intel.com>
Acked-By: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index 31eb7d5889f1..a9a22917ecdb 100644
+index e76720903064..c7c8ef67b67f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-@@ -179,6 +179,9 @@ vchiq_platform_init_state(struct vchiq_state *state)
+@@ -208,6 +208,9 @@ vchiq_platform_init_state(VCHIQ_STATE_T *state)
struct vchiq_2835_state *platform_state;
state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);
@@ -32,10 +33,10 @@ index 31eb7d5889f1..a9a22917ecdb 100644
platform_state->inited = 1;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-index 6057a90436fc..0c387b6473a5 100644
+index 7642ced31436..63ce567eb6b7 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-@@ -2209,6 +2209,8 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)
+@@ -2537,6 +2537,8 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
local->debug[DEBUG_ENTRIES] = DEBUG_MAX;
status = vchiq_platform_init_state(state);
diff --git a/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch b/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch
index 4be793b..8df0af8 100644
--- a/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch
+++ b/queue/thunderbolt-Fix-to-check-for-kmemdup-failure.patch
@@ -1,4 +1,4 @@
-From 2b0845576ddd299d91117d5766eb48e99f17db22 Mon Sep 17 00:00:00 2001
+From 59060aa3cfe87cae4ca829c1276f7f81f3905d76 Mon Sep 17 00:00:00 2001
From: Aditya Pakki <pakki001@umn.edu>
Date: Wed, 20 Mar 2019 10:57:54 -0500
Subject: [PATCH] thunderbolt: Fix to check for kmemdup failure
@@ -12,6 +12,7 @@ error upstream.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index a63da422638d..551d01f6465c 100644
diff --git a/queue/thunderbolt-Fix-to-check-return-value-of-ida_simple_.patch b/queue/thunderbolt-Fix-to-check-return-value-of-ida_simple_.patch
index 92315f1..4f54634 100644
--- a/queue/thunderbolt-Fix-to-check-return-value-of-ida_simple_.patch
+++ b/queue/thunderbolt-Fix-to-check-return-value-of-ida_simple_.patch
@@ -1,4 +1,4 @@
-From 9aabb68568b473bf2f0b179d053b403961e42e4d Mon Sep 17 00:00:00 2001
+From 8b33f7fb25cf2c8bed6b245004e560fc207ee9f0 Mon Sep 17 00:00:00 2001
From: Aditya Pakki <pakki001@umn.edu>
Date: Wed, 20 Mar 2019 11:34:09 -0500
Subject: [PATCH] thunderbolt: Fix to check return value of ida_simple_get
@@ -11,12 +11,13 @@ failure cases, and releases memory during failure.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
-index e27dd8beb94b..e0642dcb8b9b 100644
+index 8abb4e843085..dd45e04e40e7 100644
--- a/drivers/thunderbolt/xdomain.c
+++ b/drivers/thunderbolt/xdomain.c
-@@ -740,6 +740,7 @@ static void enumerate_services(struct tb_xdomain *xd)
+@@ -742,6 +742,7 @@ static void enumerate_services(struct tb_xdomain *xd)
struct tb_service *svc;
struct tb_property *p;
struct device *dev;
@@ -24,7 +25,7 @@ index e27dd8beb94b..e0642dcb8b9b 100644
/*
* First remove all services that are not available anymore in
-@@ -768,7 +769,12 @@ static void enumerate_services(struct tb_xdomain *xd)
+@@ -770,7 +771,12 @@ static void enumerate_services(struct tb_xdomain *xd)
break;
}
diff --git a/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch b/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch
index b85448b..03d2aae 100644
--- a/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch
+++ b/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch
@@ -1,4 +1,4 @@
-From 70dee19627a5fd2a16cb7d422a5ca0d400f5b13e Mon Sep 17 00:00:00 2001
+From 63440ba77d4f93b0016d7eaa5f5b5192e3d10cb3 Mon Sep 17 00:00:00 2001
From: Aditya Pakki <pakki001@umn.edu>
Date: Mon, 25 Mar 2019 16:25:22 -0500
Subject: [PATCH] thunderbolt: Fix to check the return value of kmemdup
@@ -11,6 +11,7 @@ logs the error and cleans up the allocated memory for switch.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 5bad9fdec5f8..4a393edd3049 100644
diff --git a/queue/thunderbolt-Take-domain-lock-in-switch-sysfs-attribu.patch b/queue/thunderbolt-Take-domain-lock-in-switch-sysfs-attribu.patch
index 78ef069..6f961bc 100644
--- a/queue/thunderbolt-Take-domain-lock-in-switch-sysfs-attribu.patch
+++ b/queue/thunderbolt-Take-domain-lock-in-switch-sysfs-attribu.patch
@@ -1,4 +1,4 @@
-From 523dbbd1f8441c1aea34817bfa6fd343fe09f295 Mon Sep 17 00:00:00 2001
+From fbfbadd6436cea2a0290d4a0ec1746f96916f95e Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 19 Mar 2019 16:48:41 +0200
Subject: [PATCH] thunderbolt: Take domain lock in switch sysfs attribute
@@ -58,6 +58,7 @@ progress before the write is restarted and eventually fail when the
attribute is removed.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 25758671ddf4..a63da422638d 100644
diff --git a/queue/thunderbolt-property-Fix-a-NULL-pointer-dereference.patch b/queue/thunderbolt-property-Fix-a-NULL-pointer-dereference.patch
index acfbd39..26504bb 100644
--- a/queue/thunderbolt-property-Fix-a-NULL-pointer-dereference.patch
+++ b/queue/thunderbolt-property-Fix-a-NULL-pointer-dereference.patch
@@ -1,4 +1,4 @@
-From 106204b56f60abf1bead7dceb88f2be3e34433da Mon Sep 17 00:00:00 2001
+From ab6bf6a2f1c85783a966ad2c7d7392cfe6e78b7d Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Tue, 12 Mar 2019 03:33:28 -0500
Subject: [PATCH] thunderbolt: property: Fix a NULL pointer dereference
@@ -10,12 +10,13 @@ In case kzalloc fails, the fix releases resources and returns
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
-index b2f0d6386cee..ee76449524a3 100644
+index 67fd0b5551de..be3f8b592b05 100644
--- a/drivers/thunderbolt/property.c
+++ b/drivers/thunderbolt/property.c
-@@ -548,6 +548,11 @@ int tb_property_add_data(struct tb_property_dir *parent, const char *key,
+@@ -551,6 +551,11 @@ int tb_property_add_data(struct tb_property_dir *parent, const char *key,
property->length = size / 4;
property->value.data = kzalloc(size, GFP_KERNEL);
diff --git a/queue/thunderbolt-property-Fix-a-missing-check-of-kzalloc.patch b/queue/thunderbolt-property-Fix-a-missing-check-of-kzalloc.patch
index 8c6fd1a..af398e2 100644
--- a/queue/thunderbolt-property-Fix-a-missing-check-of-kzalloc.patch
+++ b/queue/thunderbolt-property-Fix-a-missing-check-of-kzalloc.patch
@@ -1,4 +1,4 @@
-From 6183d5a51866f3acdeeb66b75e87d44025b01a55 Mon Sep 17 00:00:00 2001
+From d346309756247bff321b71fd6bb7749b95f9ee2d Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 25 Mar 2019 15:23:08 -0500
Subject: [PATCH] thunderbolt: property: Fix a missing check of kzalloc
@@ -13,12 +13,13 @@ The patch fixes this issue.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thunderbolt/property.c b/drivers/thunderbolt/property.c
-index 841314deb446..d5b0cdb8f0b1 100644
+index 8fe913a95b4a..67fd0b5551de 100644
--- a/drivers/thunderbolt/property.c
+++ b/drivers/thunderbolt/property.c
-@@ -587,7 +587,12 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,
+@@ -581,7 +581,12 @@ int tb_property_add_text(struct tb_property_dir *parent, const char *key,
return -ENOMEM;
property->length = size / 4;
diff --git a/queue/tinydrm-mipi-dbi-Use-dma-safe-buffers-for-all-SPI-tr.patch b/queue/tinydrm-mipi-dbi-Use-dma-safe-buffers-for-all-SPI-tr.patch
index f16ae29..648eed1 100644
--- a/queue/tinydrm-mipi-dbi-Use-dma-safe-buffers-for-all-SPI-tr.patch
+++ b/queue/tinydrm-mipi-dbi-Use-dma-safe-buffers-for-all-SPI-tr.patch
@@ -1,4 +1,4 @@
-From 1225d33c810f2420d849fbd0e3f6378cd63c55a1 Mon Sep 17 00:00:00 2001
+From 46711e80317ab26aef80cdb7d7f19861cfbf3379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Fri, 22 Feb 2019 13:43:29 +0100
Subject: [PATCH] tinydrm/mipi-dbi: Use dma-safe buffers for all SPI transfers
@@ -45,6 +45,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Tested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190222124329.23046-1-noralf@tronnes.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/tinydrm/ili9225.c b/drivers/gpu/drm/tinydrm/ili9225.c
index 841c69aba059..0b7d5a16f3ae 100644
diff --git a/queue/tty-ipwireless-fix-missing-checks-for-ioremap.patch b/queue/tty-ipwireless-fix-missing-checks-for-ioremap.patch
index 20b7013..8bb3d7c 100644
--- a/queue/tty-ipwireless-fix-missing-checks-for-ioremap.patch
+++ b/queue/tty-ipwireless-fix-missing-checks-for-ioremap.patch
@@ -1,4 +1,4 @@
-From 1bbb1c318cd8a3a39e8c3e2e83d5e90542d6c3e3 Mon Sep 17 00:00:00 2001
+From fd4c2b6ab25963b2559313d686a8ac801339e59f Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Fri, 15 Mar 2019 02:07:12 -0500
Subject: [PATCH] tty: ipwireless: fix missing checks for ioremap
@@ -13,6 +13,7 @@ NULL pointer dereferences.
Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/tty/ipwireless/main.c b/drivers/tty/ipwireless/main.c
index 3475e841ef5c..4c18bbfe1a92 100644
diff --git a/queue/usb-core-Add-PM-runtime-calls-to-usb_hcd_platform_sh.patch b/queue/usb-core-Add-PM-runtime-calls-to-usb_hcd_platform_sh.patch
index f33e26f..63e0571 100644
--- a/queue/usb-core-Add-PM-runtime-calls-to-usb_hcd_platform_sh.patch
+++ b/queue/usb-core-Add-PM-runtime-calls-to-usb_hcd_platform_sh.patch
@@ -1,4 +1,4 @@
-From 8ead7e817224d7832fe51a19783cb8fcadc79467 Mon Sep 17 00:00:00 2001
+From e8bcb9a93b259b651fab905864c19e6d5a5c6a30 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 22 Mar 2019 14:54:05 -0700
Subject: [PATCH] usb: core: Add PM runtime calls to usb_hcd_platform_shutdown
@@ -14,9 +14,10 @@ Let's fix this by adding PM runtime support to usb_hcd_platform_shutdown.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index 3189181bb628..b227a2651e7c 100644
+index 1c21955fe7c0..b82a7d787add 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -3017,6 +3017,9 @@ usb_hcd_platform_shutdown(struct platform_device *dev)
diff --git a/queue/vfio-ccw-Prevent-quiesce-function-going-into-an-infi.patch b/queue/vfio-ccw-Prevent-quiesce-function-going-into-an-infi.patch
index 47b6cf6..6dd085e 100644
--- a/queue/vfio-ccw-Prevent-quiesce-function-going-into-an-infi.patch
+++ b/queue/vfio-ccw-Prevent-quiesce-function-going-into-an-infi.patch
@@ -1,4 +1,4 @@
-From d1ffa760d22aa1d8190478e5ef555c59a771db27 Mon Sep 17 00:00:00 2001
+From 61e0baab9ae2f6c9cec1439e04a340ce0f86e332 Mon Sep 17 00:00:00 2001
From: Farhan Ali <alifm@linux.ibm.com>
Date: Tue, 16 Apr 2019 17:23:14 -0400
Subject: [PATCH] vfio-ccw: Prevent quiesce function going into an infinite
@@ -31,12 +31,13 @@ Message-Id: <4d5a4b98ab1b41ac6131b5c36de18b76c5d66898.1555449329.git.alifm@linux
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c
-index d72aa8c760c5..ee8767f5845a 100644
+index d64540369e96..b64a7508c240 100644
--- a/drivers/s390/cio/vfio_ccw_drv.c
+++ b/drivers/s390/cio/vfio_ccw_drv.c
-@@ -43,26 +43,30 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)
+@@ -39,26 +39,30 @@ int vfio_ccw_sch_quiesce(struct subchannel *sch)
if (ret != -EBUSY)
goto out_unlock;
diff --git a/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch b/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch
index cf96dc2..7e12a0f 100644
--- a/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch
+++ b/queue/vhost-vsock-fix-vhost-vsock-cid-hashing-inconsistent.patch
@@ -1,4 +1,4 @@
-From c455a7d62352d7e0cf2e9f13c84b937bd9bf24ed Mon Sep 17 00:00:00 2001
+From e2ca97c3c66a89a981460d4865fc8f0dd6a73c60 Mon Sep 17 00:00:00 2001
From: Zha Bin <zhabin@linux.alibaba.com>
Date: Tue, 8 Jan 2019 16:07:03 +0800
Subject: [PATCH] vhost/vsock: fix vhost vsock cid hashing inconsistent
@@ -36,6 +36,7 @@ Reviewed-by: Liu Jiang <gerry@linux.alibaba.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 98ed5be132c6..64b96f426768 100644
diff --git a/queue/virtio_console-initialize-vtermno-value-for-ports.patch b/queue/virtio_console-initialize-vtermno-value-for-ports.patch
index 44eee10..a22d7b2 100644
--- a/queue/virtio_console-initialize-vtermno-value-for-ports.patch
+++ b/queue/virtio_console-initialize-vtermno-value-for-ports.patch
@@ -1,4 +1,4 @@
-From 4b0a2c5ff7215206ea6135a405f17c5f6fca7d00 Mon Sep 17 00:00:00 2001
+From 35a72bec97d5db8cc9df07b9835e81ca285c0a7f Mon Sep 17 00:00:00 2001
From: Pankaj Gupta <pagupta@redhat.com>
Date: Tue, 19 Mar 2019 11:34:06 +0530
Subject: [PATCH] virtio_console: initialize vtermno value for ports
@@ -17,9 +17,10 @@ ports to '1' and regular serial ports are initiaized to '0'.
Reported-by: siliu@redhat.com
Signed-off-by: Pankaj Gupta <pagupta@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index fbeb71953526..05dbfdb9f4af 100644
+index 17084cfcf53e..0dac26b009a5 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -75,7 +75,7 @@ struct ports_driver_data {
@@ -31,7 +32,7 @@ index fbeb71953526..05dbfdb9f4af 100644
static DEFINE_SPINLOCK(pdrvdata_lock);
static DECLARE_COMPLETION(early_console_added);
-@@ -1394,6 +1394,7 @@ static int add_port(struct ports_device *portdev, u32 id)
+@@ -1421,6 +1421,7 @@ static int add_port(struct ports_device *portdev, u32 id)
port->async_queue = NULL;
port->cons.ws.ws_row = port->cons.ws.ws_col = 0;
diff --git a/queue/x86-build-Keep-local-relocations-with-ld.lld.patch b/queue/x86-build-Keep-local-relocations-with-ld.lld.patch
index 3d38a9a..547e2ee 100644
--- a/queue/x86-build-Keep-local-relocations-with-ld.lld.patch
+++ b/queue/x86-build-Keep-local-relocations-with-ld.lld.patch
@@ -1,4 +1,4 @@
-From 7c21383f3429dd70da39c0c7f1efa12377a47ab6 Mon Sep 17 00:00:00 2001
+From 44c7fdac23f129de90e670099a90e498f31977f1 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Thu, 4 Apr 2019 14:40:27 -0700
Subject: [PATCH] x86/build: Keep local relocations with ld.lld
@@ -21,9 +21,10 @@ Cc: clang-built-linux@googlegroups.com
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190404214027.GA7324@beast
Link: https://github.com/ClangBuiltLinux/linux/issues/404
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index a587805c6687..56e748a7679f 100644
+index 4dc6498e49aa..b219a7516c6d 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -47,7 +47,7 @@ export REALMODE_CFLAGS
diff --git a/queue/x86-ia32-Fix-ia32_restore_sigcontext-AC-leak.patch b/queue/x86-ia32-Fix-ia32_restore_sigcontext-AC-leak.patch
index 2318015..59e4b87 100644
--- a/queue/x86-ia32-Fix-ia32_restore_sigcontext-AC-leak.patch
+++ b/queue/x86-ia32-Fix-ia32_restore_sigcontext-AC-leak.patch
@@ -1,4 +1,4 @@
-From 67a0514afdbb8b2fc70b771b8c77661a9cb9d3a9 Mon Sep 17 00:00:00 2001
+From 6f7b2bcdcd6eb3eca4a32ef274e2464219b4a938 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Mon, 25 Feb 2019 12:56:35 +0100
Subject: [PATCH] x86/ia32: Fix ia32_restore_sigcontext() AC leak
@@ -15,9 +15,10 @@ Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
-index 321fe5f5d0e9..4d5fcd47ab75 100644
+index 86b1341cba9a..513ba49c204f 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -61,9 +61,8 @@
diff --git a/queue/x86-irq-64-Limit-IST-stack-overflow-check-to-DB-stac.patch b/queue/x86-irq-64-Limit-IST-stack-overflow-check-to-DB-stac.patch
index 827d5ba..1080363 100644
--- a/queue/x86-irq-64-Limit-IST-stack-overflow-check-to-DB-stac.patch
+++ b/queue/x86-irq-64-Limit-IST-stack-overflow-check-to-DB-stac.patch
@@ -1,4 +1,4 @@
-From 7dbcf2b0b770eeb803a416ee8dcbef78e6389d40 Mon Sep 17 00:00:00 2001
+From bfdd55558f7ca01d8a530f83bbc453f63f8cb904 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 14 Apr 2019 17:59:38 +0200
Subject: [PATCH] x86/irq/64: Limit IST stack overflow check to #DB stack
@@ -35,6 +35,7 @@ Cc: Nicolai Stange <nstange@suse.de>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190414160143.682135110@linutronix.de
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index 0469cd078db1..b50ac9c7397b 100644
diff --git a/queue/x86-mce-Fix-machine_check_poll-tests-for-error-types.patch b/queue/x86-mce-Fix-machine_check_poll-tests-for-error-types.patch
index 61e18a5..06f9be3 100644
--- a/queue/x86-mce-Fix-machine_check_poll-tests-for-error-types.patch
+++ b/queue/x86-mce-Fix-machine_check_poll-tests-for-error-types.patch
@@ -1,4 +1,4 @@
-From 1679f99a49bec98c8999235ec2dd955678cbf137 Mon Sep 17 00:00:00 2001
+From b8dc6646ff2d3530b3fc53d397827cdfdcdf6c67 Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Tue, 12 Mar 2019 10:09:38 -0700
Subject: [PATCH] x86/mce: Fix machine_check_poll() tests for error types
diff --git a/queue/x86-mce-Handle-varying-MCA-bank-counts.patch b/queue/x86-mce-Handle-varying-MCA-bank-counts.patch
index 14ca060..e063da7 100644
--- a/queue/x86-mce-Handle-varying-MCA-bank-counts.patch
+++ b/queue/x86-mce-Handle-varying-MCA-bank-counts.patch
@@ -1,4 +1,4 @@
-From 7fd85dda57c112ccb20767374aaa70bd2a726f57 Mon Sep 17 00:00:00 2001
+From d9b0dbf32742cd9079d6595a2100137bd99160ef Mon Sep 17 00:00:00 2001
From: Yazen Ghannam <yazen.ghannam@amd.com>
Date: Fri, 27 Jul 2018 16:40:09 -0500
Subject: [PATCH] x86/mce: Handle varying MCA bank counts
diff --git a/queue/x86-microcode-Fix-the-ancient-deprecated-microcode-l.patch b/queue/x86-microcode-Fix-the-ancient-deprecated-microcode-l.patch
index 4cab937..a9cd3de 100644
--- a/queue/x86-microcode-Fix-the-ancient-deprecated-microcode-l.patch
+++ b/queue/x86-microcode-Fix-the-ancient-deprecated-microcode-l.patch
@@ -1,4 +1,4 @@
-From 24613a04ad1c0588c10f4b5403ca60a73d164051 Mon Sep 17 00:00:00 2001
+From 281284f031f8271a85129fe962941a1c8186e14f Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Thu, 4 Apr 2019 22:14:07 +0200
Subject: [PATCH] x86/microcode: Fix the ancient deprecated microcode loading
@@ -21,9 +21,10 @@ Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jann Horn <jannh@google.com>
Link: https://lkml.kernel.org/r/20190405133010.24249-3-bp@alien8.de
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
-index 5260185cbf7b..8a4a7823451a 100644
+index b9bc8a1a584e..b43ddefd77f4 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -418,8 +418,9 @@ static int do_microcode_update(const void __user *buf, size_t size)
diff --git a/queue/x86-uaccess-Fix-up-the-fixup.patch b/queue/x86-uaccess-Fix-up-the-fixup.patch
index 2c5b0b8..11cea8d 100644
--- a/queue/x86-uaccess-Fix-up-the-fixup.patch
+++ b/queue/x86-uaccess-Fix-up-the-fixup.patch
@@ -1,4 +1,4 @@
-From 849af6157e34ed536560ab3fe8f724986925039b Mon Sep 17 00:00:00 2001
+From 2bc8c78aedf0db8f7d5e0a22687f76d675ef4c21 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 3 Apr 2019 09:39:45 +0200
Subject: [PATCH] x86/uaccess: Fix up the fixup
@@ -22,6 +22,7 @@ Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index 298ef1479240..4c9f7692f6ec 100644
diff --git a/queue/x86-uaccess-ftrace-Fix-ftrace_likely_update-vs.-SMAP.patch b/queue/x86-uaccess-ftrace-Fix-ftrace_likely_update-vs.-SMAP.patch
index 9f4f39b..7826f02 100644
--- a/queue/x86-uaccess-ftrace-Fix-ftrace_likely_update-vs.-SMAP.patch
+++ b/queue/x86-uaccess-ftrace-Fix-ftrace_likely_update-vs.-SMAP.patch
@@ -1,4 +1,4 @@
-From 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9 Mon Sep 17 00:00:00 2001
+From d3697916e458ad5b5b20e73e021a50ff38cfd212 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Thu, 7 Mar 2019 11:09:13 +0100
Subject: [PATCH] x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP
@@ -19,6 +19,7 @@ Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
index 4ad967453b6f..3ea65cdff30d 100644
diff --git a/queue/x86-uaccess-signal-Fix-AC-1-bloat.patch b/queue/x86-uaccess-signal-Fix-AC-1-bloat.patch
index 9f19388..3c4f7b8 100644
--- a/queue/x86-uaccess-signal-Fix-AC-1-bloat.patch
+++ b/queue/x86-uaccess-signal-Fix-AC-1-bloat.patch
@@ -1,4 +1,4 @@
-From 88e4718275c1bddca6f61f300688b4553dc8584b Mon Sep 17 00:00:00 2001
+From f13a9731aa72faa837f579738c576f1d72c0d08d Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Wed, 3 Apr 2019 09:39:48 +0200
Subject: [PATCH] x86/uaccess, signal: Fix AC=1 bloat
@@ -22,9 +22,10 @@ Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
-index 08dfd4c1a4f9..c8aa58a2bab9 100644
+index 92a3b312a53c..44e647a65de8 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -132,16 +132,6 @@ static int restore_sigcontext(struct pt_regs *regs,