summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-16 01:14:41 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-09-16 01:14:41 -0400
commitba18b35271af6ce5135ed0a12637bf96253dc9f7 (patch)
tree2f9524dadbc7f47ce40d82a80d3f0e1df9d43533
parent4e53e93913788a826b2883bc5b2d337940f758ba (diff)
downloadlongterm-queue-4.18-ba18b35271af6ce5135ed0a12637bf96253dc9f7.tar.gz
re-export commits with SOB lines added
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/ACPI-PCI-PM-Add-missing-wakeup.flags.valid-checks.patch11
-rw-r--r--queue/ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch3
-rw-r--r--queue/ALSA-hda-Force-polling-mode-on-CNL-for-fixing-codec-.patch9
-rw-r--r--queue/ALSA-hda-Register-irq-handler-after-the-chip-initial.patch9
-rw-r--r--queue/ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch23
-rw-r--r--queue/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch7
-rw-r--r--queue/ALSA-seq-Cover-unsubscribe_port-in-list_mutex.patch7
-rw-r--r--queue/ALSA-seq-Fix-race-of-get-subscription-call-vs-port-d.patch11
-rw-r--r--queue/ARM-OMAP2-pm33xx-core-Do-not-Turn-OFF-CEFUSE-as-PPA-.patch7
-rw-r--r--queue/ARM-dts-exynos-Always-enable-necessary-APIO_1V8-and-.patch9
-rw-r--r--queue/ARM-dts-imx50-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch7
-rw-r--r--queue/ARM-dts-imx51-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch7
-rw-r--r--queue/ARM-dts-imx53-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch7
-rw-r--r--queue/ARM-dts-imx6qdl-Specify-IMX6QDL_CLK_IPG-as-ipg-clock.patch7
-rw-r--r--queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ahb-clock-t.patch7
-rw-r--r--queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ipg-clock-t.patch7
-rw-r--r--queue/ARM-dts-imx6ul-Specify-IMX6UL_CLK_IPG-as-ipg-clock-t.patch7
-rw-r--r--queue/ARM-dts-imx7d-Specify-IMX7D_CLK_IPG-as-ipg-clock-to-.patch7
-rw-r--r--queue/ARM-exynos-Fix-undefined-instruction-during-Exynos54.patch7
-rw-r--r--queue/ARM-prevent-tracing-IPI_CPU_BACKTRACE.patch9
-rw-r--r--queue/ASoC-cs42xx8-Add-regcache-mask-dirty.patch3
-rw-r--r--queue/ASoC-fsl_asrc-Fix-the-issue-about-unsupported-rate.patch7
-rw-r--r--queue/Abort-file_remove_privs-for-non-reg.-files.patch7
-rw-r--r--queue/Drivers-misc-fix-out-of-bounds-access-in-function-pa.patch9
-rw-r--r--queue/EDAC-mpc85xx-Prevent-building-as-a-module.patch7
-rw-r--r--queue/HID-wacom-Correct-button-numbering-2nd-gen-Intuos-Pr.patch11
-rw-r--r--queue/HID-wacom-Don-t-report-anything-prior-to-the-tool-en.patch7
-rw-r--r--queue/HID-wacom-Don-t-set-tool-type-until-we-re-in-range.patch9
-rw-r--r--queue/HID-wacom-Send-BTN_TOUCH-in-response-to-INTUOSP2_BT-.patch7
-rw-r--r--queue/HID-wacom-Sync-INTUOSP2_BT-touch-state-after-each-fr.patch7
-rw-r--r--queue/KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-kvm_for.patch11
-rw-r--r--queue/KVM-PPC-Book3S-Use-new-mutex-to-synchronize-access-t.patch13
-rw-r--r--queue/KVM-s390-fix-memory-slot-handling-for-KVM_SET_USER_M.patch7
-rw-r--r--queue/PCI-designware-ep-Use-aligned-ATU-window-for-raising.patch3
-rw-r--r--queue/PCI-dwc-Free-MSI-IRQ-page-in-dw_pcie_free_msi.patch3
-rw-r--r--queue/PCI-dwc-Free-MSI-in-dw_pcie_host_init-error-path.patch13
-rw-r--r--queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch3
-rw-r--r--queue/PCI-rcar-Fix-64bit-MSI-message-address-handling.patch3
-rw-r--r--queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch3
-rw-r--r--queue/PCI-rpadlpar-Fix-leaked-device_node-references-in-ad.patch3
-rw-r--r--queue/PCI-xilinx-Check-for-__get_free_pages-failure.patch5
-rw-r--r--queue/RAS-CEC-Convert-the-timer-callback-to-a-workqueue.patch13
-rw-r--r--queue/RAS-CEC-Fix-binary-search-function.patch7
-rw-r--r--queue/Staging-vc04_services-Fix-a-couple-error-codes.patch9
-rw-r--r--queue/USB-Fix-chipmunk-like-voice-when-using-Logitech-C270.patch3
-rw-r--r--queue/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch5
-rw-r--r--queue/USB-serial-option-add-support-for-Simcom-SIM7500-SIM.patch5
-rw-r--r--queue/USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.patch5
-rw-r--r--queue/USB-usb-storage-Add-new-ID-to-ums-realtek.patch3
-rw-r--r--queue/arm64-mm-Inhibit-huge-vmap-with-ptdump.patch7
-rw-r--r--queue/ax25-fix-inconsistent-lock-state-in-ax25_destroy_tim.patch7
-rw-r--r--queue/bcache-fix-stack-corruption-by-PRECEDING_KEY.patch11
-rw-r--r--queue/bcache-only-set-BCACHE_DEV_WB_RUNNING-when-cached-de.patch3
-rw-r--r--queue/be2net-Fix-number-of-Rx-queues-used-for-flow-hashing.patch7
-rw-r--r--queue/blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch3
-rw-r--r--queue/block-bfq-increase-idling-for-weight-raised-queues.patch7
-rw-r--r--queue/bpf-fix-undefined-behavior-in-narrow-load-handling.patch7
-rw-r--r--queue/cgroup-Use-css_tryget-instead-of-css_tryget_online-i.patch9
-rw-r--r--queue/clk-rockchip-Turn-on-aclk_dmac1-for-suspend-on-rk328.patch9
-rw-r--r--queue/clk-ti-clkctrl-Fix-clkdm_clk-handling.patch5
-rw-r--r--queue/configfs-Fix-use-after-free-when-accessing-sd-s_dent.patch5
-rw-r--r--queue/configfs-fix-possible-use-after-free-in-configfs_reg.patch3
-rw-r--r--queue/coredump-fix-race-condition-between-collapse_huge_pa.patch7
-rw-r--r--queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch3
-rw-r--r--queue/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch3
-rw-r--r--queue/drm-amd-display-Use-plane-color_space-for-dpp-if-spe.patch13
-rw-r--r--queue/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch7
-rw-r--r--queue/drm-edid-abstract-override-firmware-EDID-retrieval.patch9
-rw-r--r--queue/drm-etnaviv-lock-MMU-while-dumping-core.patch11
-rw-r--r--queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch3
-rw-r--r--queue/drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch7
-rw-r--r--queue/drm-nouveau-kms-gf119-gp10x-push-HeadSetControlOutpu.patch5
-rw-r--r--queue/drm-nouveau-kms-gv100-fix-spurious-window-immediate-.patch9
-rw-r--r--queue/drm-pl111-Initialize-clock-spinlock-early.patch7
-rw-r--r--queue/drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_set_shade.patch3
-rw-r--r--queue/f2fs-fix-to-avoid-accessing-xattr-across-the-boundar.patch19
-rw-r--r--queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch3
-rw-r--r--queue/f2fs-fix-to-avoid-panic-in-f2fs_inplace_write_data.patch7
-rw-r--r--queue/f2fs-fix-to-avoid-panic-in-f2fs_remove_inode_page.patch3
-rw-r--r--queue/f2fs-fix-to-clear-dirty-inode-in-error-path-of-f2fs_.patch7
-rw-r--r--queue/f2fs-fix-to-do-sanity-check-on-free-nid.patch7
-rw-r--r--queue/f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch9
-rw-r--r--queue/f2fs-fix-to-use-inline-space-only-if-inline_xattr-is.patch7
-rw-r--r--queue/fs-fat-file.c-issue-flush-after-the-writeback-of-FAT.patch7
-rw-r--r--queue/fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock.patch7
-rw-r--r--queue/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch7
-rw-r--r--queue/gpio-fix-gpio-adp5588-build-errors.patch7
-rw-r--r--queue/gpio-gpio-omap-add-check-for-off-wake-capable-gpios.patch11
-rw-r--r--queue/gpio-vf610-Do-not-share-irq_chip.patch17
-rw-r--r--queue/hugetlbfs-on-restore-reserve-error-path-retain-subpo.patch7
-rw-r--r--queue/i2c-acorn-fix-i2c-warning.patch3
-rw-r--r--queue/i2c-dev-fix-potential-memory-leak-in-i2cdev_ioctl_rd.patch5
-rw-r--r--queue/i40e-Queues-are-reserved-despite-Invalid-argument-er.patch9
-rw-r--r--queue/ia64-fix-build-errors-by-exporting-paddr_to_nid.patch7
-rw-r--r--queue/ice-Add-missing-case-in-print_link_msg-for-printing-.patch7
-rw-r--r--queue/initramfs-free-initrd-memory-if-opening-initrd.image.patch3
-rw-r--r--queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch3
-rw-r--r--queue/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch9
-rw-r--r--queue/iommu-vt-d-Set-intel_iommu_gfx_mapped-correctly.patch9
-rw-r--r--queue/ipc-prevent-lockup-on-alloc_msg-and-free_msg.patch9
-rw-r--r--queue/ipv6-flowlabel-fl6_sock_lookup-must-use-atomic_inc_n.patch9
-rw-r--r--queue/ipvs-Fix-use-after-free-in-ip_vs_in.patch9
-rw-r--r--queue/kernel-sys.c-prctl-fix-false-positive-in-validate_pr.patch7
-rw-r--r--queue/lapb-fixed-leak-of-control-blocks.patch7
-rw-r--r--queue/libata-Extend-quirks-for-the-ST1000LM024-drives-with.patch7
-rw-r--r--queue/libnvdimm-Fix-compilation-warnings-with-W-1.patch13
-rw-r--r--queue/mISDN-make-sure-device-name-is-NUL-terminated.patch11
-rw-r--r--queue/mailbox-stm32-ipcc-check-invalid-irq.patch5
-rw-r--r--queue/mem-hotplug-fix-node-spanned-pages-when-we-have-a-no.patch7
-rw-r--r--queue/mfd-intel-lpss-Set-the-device-in-reset-state-when-in.patch3
-rw-r--r--queue/mfd-tps65912-spi-Add-missing-of-table-registration.patch3
-rw-r--r--queue/mfd-twl6040-Fix-device-init-errors-for-ACCCTL-regist.patch5
-rw-r--r--queue/mips-Make-sure-dt-memory-regions-are-valid.patch5
-rw-r--r--queue/misc-pci_endpoint_test-Fix-test_reg_bar-to-be-update.patch3
-rw-r--r--queue/mlxsw-spectrum-Prevent-force-of-56G.patch3
-rw-r--r--queue/mm-cma.c-fix-crash-on-CMA-allocation-if-bitmap-alloc.patch5
-rw-r--r--queue/mm-cma.c-fix-the-bitmap-status-to-show-failed-alloca.patch7
-rw-r--r--queue/mm-cma_debug.c-fix-the-break-condition-in-cma_maxchu.patch7
-rw-r--r--queue/mm-hmm-select-mmu-notifier-when-selecting-HMM.patch7
-rw-r--r--queue/mm-list_lru.c-fix-memory-leak-in-__memcg_init_list_l.patch7
-rw-r--r--queue/mm-page_mkclean-vs-MADV_DONTNEED-race.patch11
-rw-r--r--queue/mm-slab.c-fix-an-infinite-loop-in-leaks_show.patch7
-rw-r--r--queue/mm-vmscan.c-fix-trying-to-reclaim-unevictable-LRU-pa.patch7
-rw-r--r--queue/mmc-mmci-Prevent-polling-for-busy-detection-in-IRQ-c.patch7
-rw-r--r--queue/neigh-fix-use-after-free-read-in-pneigh_get_next.patch11
-rw-r--r--queue/net-aquantia-fix-LRO-with-FCS-error.patch7
-rw-r--r--queue/net-aquantia-tx-clean-budget-logic-error.patch9
-rw-r--r--queue/net-hns3-return-0-and-print-warning-when-hit-duplica.patch3
-rw-r--r--queue/net-mlx5-Avoid-reloading-already-removed-devices.patch7
-rw-r--r--queue/net-mvpp2-prs-Fix-parser-range-for-VID-filtering.patch13
-rw-r--r--queue/net-mvpp2-prs-Use-the-correct-helpers-when-removing-.patch7
-rw-r--r--queue/net-openvswitch-do-not-free-vport-if-register_netdev.patch13
-rw-r--r--queue/net-phy-dp83867-Set-up-RGMII-TX-delay.patch7
-rw-r--r--queue/net-phylink-ensure-consistent-phy-interface-mode.patch9
-rw-r--r--queue/net-sh_eth-fix-mdio-access-in-sh_eth_close-for-R-Car.patch7
-rw-r--r--queue/net-stmmac-update-rx-tail-pointer-register-to-fix-rx.patch7
-rw-r--r--queue/net-thunderbolt-Unregister-ThunderboltIP-protocol-ha.patch9
-rw-r--r--queue/net-tulip-de4x5-Drop-redundant-MODULE_DEVICE_TABLE.patch5
-rw-r--r--queue/netfilter-nf_conntrack_h323-restore-boundary-check-c.patch3
-rw-r--r--queue/netfilter-nf_flow_table-check-ttl-value-in-flow-offl.patch7
-rw-r--r--queue/netfilter-nf_flow_table-fix-missing-error-check-for-.patch7
-rw-r--r--queue/netfilter-nf_flow_table-fix-netdev-refcnt-leak.patch7
-rw-r--r--queue/netfilter-nf_queue-fix-reinject-verdict-handling.patch7
-rw-r--r--queue/nfc-Ensure-presence-of-required-attributes-in-the-de.patch7
-rw-r--r--queue/nfsd-allow-fh_want_write-to-be-called-twice.patch3
-rw-r--r--queue/nfsd-avoid-uninitialized-variable-warning.patch3
-rw-r--r--queue/nouveau-Fix-build-with-CONFIG_NOUVEAU_LEGACY_CTX_SUP.patch3
-rw-r--r--queue/ntp-Allow-TAI-UTC-offset-to-be-set-to-zero.patch7
-rw-r--r--queue/nvme-fix-memory-leak-for-power-latency-tolerance.patch7
-rw-r--r--queue/nvme-fix-srcu-locking-on-error-return-in-nvme_get_ns.patch9
-rw-r--r--queue/nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch9
-rw-r--r--queue/nvme-pci-shutdown-on-timeout-during-deletion.patch9
-rw-r--r--queue/nvme-pci-unquiesce-admin-queue-on-shutdown.patch7
-rw-r--r--queue/nvme-release-namespace-SRCU-protection-before-perfor.patch9
-rw-r--r--queue/nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch7
-rw-r--r--queue/nvmem-core-fix-read-buffer-in-place.patch9
-rw-r--r--queue/nvmem-sunxi_sid-Support-SID-on-A83T-and-H5.patch7
-rw-r--r--queue/objtool-Don-t-use-ignore-flag-for-fake-jumps.patch9
-rw-r--r--queue/ocfs2-fix-error-path-kobject-memory-leak.patch3
-rw-r--r--queue/percpu-do-not-search-past-bitmap-when-allocating-an-.patch7
-rw-r--r--queue/percpu-remove-spurious-lock-dependency-between-percp.patch11
-rw-r--r--queue/perf-data-Fix-strncat-may-truncate-build-failure-wit.patch5
-rw-r--r--queue/perf-namespace-Protect-reading-thread-s-namespace.patch9
-rw-r--r--queue/perf-record-Fix-s390-missing-module-symbol-and-warni.patch3
-rw-r--r--queue/perf-ring-buffer-Always-use-READ-WRITE-_ONCE-for-rb-.patch3
-rw-r--r--queue/perf-ring_buffer-Add-ordering-to-rb-nest-increment.patch7
-rw-r--r--queue/perf-ring_buffer-Fix-exposing-a-temporarily-decrease.patch9
-rw-r--r--queue/perf-x86-intel-ds-Fix-EVENT-vs.-UEVENT-PEBS-constrai.patch19
-rw-r--r--queue/platform-chrome-cros_ec_proto-check-for-NULL-transfe.patch7
-rw-r--r--queue/platform-x86-intel_pmc_ipc-adding-error-handling.patch7
-rw-r--r--queue/power-supply-max14656-fix-potential-use-before-alloc.patch3
-rw-r--r--queue/powerpc-powernv-Return-for-invalid-IMC-domain.patch5
-rw-r--r--queue/ptrace-restore-smp_rmb-in-__ptrace_may_access.patch9
-rw-r--r--queue/pwm-Fix-deadlock-warning-when-removing-PWM-device.patch17
-rw-r--r--queue/pwm-meson-Use-the-spin-lock-only-to-protect-register.patch9
-rw-r--r--queue/pwm-tiehrpwm-Update-shadow-register-for-disabling-PW.patch3
-rw-r--r--queue/rapidio-fix-a-NULL-pointer-dereference-when-create_w.patch7
-rw-r--r--queue/rtc-pcf8523-don-t-return-invalid-date-when-battery-i.patch3
-rw-r--r--queue/s390-kasan-fix-strncpy_from_user-kasan-checks.patch7
-rw-r--r--queue/scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shift-opera.patch7
-rw-r--r--queue/scsi-libcxgbi-add-a-check-for-NULL-pointer-in-cxgbi_.patch7
-rw-r--r--queue/scsi-libsas-delete-sas-port-if-expander-discover-fai.patch7
-rw-r--r--queue/scsi-lpfc-add-check-for-loss-of-ndlp-when-sending-RR.patch7
-rw-r--r--queue/scsi-qedi-remove-memset-memcpy-to-nfunc-and-use-func.patch3
-rw-r--r--queue/scsi-qedi-remove-set-but-not-used-variables-cdev-and.patch9
-rw-r--r--queue/scsi-qla2xxx-Reset-the-FCF_ASYNC_-SENT-ACTIVE-flags.patch3
-rw-r--r--queue/scsi-scsi_dh_alua-Fix-possible-null-ptr-deref.patch7
-rw-r--r--queue/scsi-smartpqi-properly-set-both-the-DMA-mask-and-the.patch7
-rw-r--r--queue/sctp-Free-cookie-before-we-memdup-a-new-one.patch13
-rw-r--r--queue/selftests-fib_rule_tests-fix-local-IPv4-address-typo.patch5
-rw-r--r--queue/selftests-netfilter-missing-error-check-when-setting.patch7
-rw-r--r--queue/selftests-timers-Add-missing-fflush-stdout-calls.patch3
-rw-r--r--queue/signal-ptrace-Don-t-leak-unitialized-kernel-memory-w.patch3
-rw-r--r--queue/soc-mediatek-pwrap-Zero-initialize-rdata-in-pwrap_in.patch7
-rw-r--r--queue/soc-renesas-Identify-R-Car-M3-W-ES1.3.patch7
-rw-r--r--queue/soc-rockchip-Set-the-proper-PWM-for-rk3288.patch3
-rw-r--r--queue/sunhv-Fix-device-naming-inconsistency-between-sunhv_.patch3
-rw-r--r--queue/switchtec-Fix-unintended-mask-of-MRPC-event.patch7
-rw-r--r--queue/sysctl-return-EINVAL-if-val-violates-minmax.patch7
-rw-r--r--queue/thermal-rcar_gen3_thermal-disable-interrupt-in-.remo.patch7
-rw-r--r--queue/timekeeping-Repair-ktime_get_coarse-granularity.patch7
-rw-r--r--queue/tipc-purge-deferredq-list-for-each-grp-member-in-tip.patch7
-rw-r--r--queue/tools-kvm_stat-fix-fields-filter-for-child-events.patch5
-rw-r--r--queue/tracing-Prevent-hist_field_var_ref-from-accessing-NU.patch7
-rw-r--r--queue/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch3
-rw-r--r--queue/usb-dwc2-Fix-DMA-cache-alignment-issues.patch11
-rw-r--r--queue/usb-dwc2-host-Fix-wMaxPacketSize-handling-fix-webcam.patch23
-rw-r--r--queue/usb-typec-fusb302-Check-vconn-is-off-when-we-start-t.patch3
-rw-r--r--queue/usb-xhci-Fix-a-potential-null-pointer-dereference-in.patch3
-rw-r--r--queue/usbnet-ipheth-fix-racing-condition.patch7
-rw-r--r--queue/vfio-Fix-WARNING-do-not-call-blocking-ops-when-TASK_.patch13
-rw-r--r--queue/video-hgafb-fix-potential-NULL-pointer-dereference.patch3
-rw-r--r--queue/video-imsttfb-fix-potential-NULL-pointer-dereference.patch7
-rw-r--r--queue/vsock-virtio-set-SOCK_DONE-on-peer-shutdown.patch3
-rw-r--r--queue/watchdog-fix-compile-time-error-of-pretimeout-govern.patch7
-rw-r--r--queue/watchdog-imx2_wdt-Fix-set_timeout-for-big-timeout-va.patch7
-rw-r--r--queue/x86-CPU-AMD-Don-t-force-the-CPB-cap-when-running-und.patch7
-rw-r--r--queue/x86-PCI-Fix-PCI-IRQ-routing-table-memory-leak.patch3
-rw-r--r--queue/x86-kasan-Fix-boot-with-5-level-paging-and-KASAN.patch7
-rw-r--r--queue/x86-microcode-cpuhotplug-Add-a-microcode-loader-CPU-.patch9
-rw-r--r--queue/x86-mm-KASLR-Compute-the-size-of-the-vmemmap-section.patch11
-rw-r--r--queue/x86-resctrl-Prevent-NULL-pointer-dereference-when-lo.patch3
-rw-r--r--queue/x86-uaccess-kcov-Disable-stack-protector.patch5
-rw-r--r--queue/xen-pvcalls-Remove-set-but-not-used-variable.patch13
-rw-r--r--queue/xenbus-Avoid-deadlock-during-suspend-due-to-open-tra.patch5
225 files changed, 908 insertions, 683 deletions
diff --git a/queue/ACPI-PCI-PM-Add-missing-wakeup.flags.valid-checks.patch b/queue/ACPI-PCI-PM-Add-missing-wakeup.flags.valid-checks.patch
index ec6cced..0220a25 100644
--- a/queue/ACPI-PCI-PM-Add-missing-wakeup.flags.valid-checks.patch
+++ b/queue/ACPI-PCI-PM-Add-missing-wakeup.flags.valid-checks.patch
@@ -1,4 +1,4 @@
-From 9a51c6b1f9e0239a9435db036b212498a2a3b75c Mon Sep 17 00:00:00 2001
+From 028f0336da2615ddc2044398a2a22a97cfc55c57 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Thu, 16 May 2019 12:42:20 +0200
Subject: [PATCH] ACPI/PCI: PM: Add missing wakeup.flags.valid checks
@@ -18,12 +18,13 @@ Add the missing wakeup.flags.valid checks to these functions.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
-index b859d75eaf9f..1f9058b86908 100644
+index a7c2673ffd36..1806260938e8 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
-@@ -952,8 +952,8 @@ static bool acpi_dev_needs_resume(struct device *dev, struct acpi_device *adev)
+@@ -948,8 +948,8 @@ static bool acpi_dev_needs_resume(struct device *dev, struct acpi_device *adev)
u32 sys_target = acpi_target_system_state();
int ret, state;
@@ -35,10 +36,10 @@ index b859d75eaf9f..1f9058b86908 100644
if (sys_target == ACPI_STATE_S0)
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
-index c5e1a097d7e3..1897847ceb0c 100644
+index d2b04ab37308..aac98dca0419 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
-@@ -733,7 +733,8 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
+@@ -642,7 +642,8 @@ static bool acpi_pci_need_resume(struct pci_dev *dev)
if (!adev || !acpi_device_power_manageable(adev))
return false;
diff --git a/queue/ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch b/queue/ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch
index 1a69f4a..c96271a 100644
--- a/queue/ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch
+++ b/queue/ALSA-firewire-motu-fix-destruction-of-data-for-isoch.patch
@@ -1,4 +1,4 @@
-From 0e3fb6995bfabb23c172e8b883bf5ac57102678e Mon Sep 17 00:00:00 2001
+From 42609be2c430b031edb75fd48757c45b0ebc395c Mon Sep 17 00:00:00 2001
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Sat, 1 Jun 2019 12:08:01 +0900
Subject: [PATCH] ALSA: firewire-motu: fix destruction of data for isochronous
@@ -13,6 +13,7 @@ Cc: <stable@vger.kernel.org> # v4.12+
Fixes: 9b2bb4f2f4a2 ("ALSA: firewire-motu: add stream management functionality")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/firewire/motu/motu-stream.c b/sound/firewire/motu/motu-stream.c
index 73e7a5e527fc..483a8771d502 100644
diff --git a/queue/ALSA-hda-Force-polling-mode-on-CNL-for-fixing-codec-.patch b/queue/ALSA-hda-Force-polling-mode-on-CNL-for-fixing-codec-.patch
index 3422083..7bd036e 100644
--- a/queue/ALSA-hda-Force-polling-mode-on-CNL-for-fixing-codec-.patch
+++ b/queue/ALSA-hda-Force-polling-mode-on-CNL-for-fixing-codec-.patch
@@ -1,4 +1,4 @@
-From fa763f1b2858752e6150ffff46886a1b7faffc82 Mon Sep 17 00:00:00 2001
+From 95a760b8eb839e493cfba60e518c3ceafa652479 Mon Sep 17 00:00:00 2001
From: Bard Liao <yung-chuan.liao@linux.intel.com>
Date: Mon, 27 May 2019 00:58:32 +0800
Subject: [PATCH] ALSA: hda - Force polling mode on CNL for fixing codec
@@ -12,12 +12,13 @@ We don't have a better solution. So apply the same workaround to CNL.
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index 0741eae23f10..a4b0414dda3b 100644
+index c993d6ff24ee..aafce0097db4 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -375,6 +375,7 @@ enum {
+@@ -376,6 +376,7 @@ enum {
#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
#define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348)
@@ -25,7 +26,7 @@ index 0741eae23f10..a4b0414dda3b 100644
static char *driver_short_names[] = {
[AZX_DRIVER_ICH] = "HDA Intel",
-@@ -1700,8 +1701,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
+@@ -1753,8 +1754,8 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,
else
chip->bdl_pos_adj = bdl_pos_adj[dev];
diff --git a/queue/ALSA-hda-Register-irq-handler-after-the-chip-initial.patch b/queue/ALSA-hda-Register-irq-handler-after-the-chip-initial.patch
index 32d42c4..a74ab1f 100644
--- a/queue/ALSA-hda-Register-irq-handler-after-the-chip-initial.patch
+++ b/queue/ALSA-hda-Register-irq-handler-after-the-chip-initial.patch
@@ -1,4 +1,4 @@
-From f495222e28275222ab6fd93813bd3d462e16d340 Mon Sep 17 00:00:00 2001
+From aa55d91ab0f426f9b2c3aa811cf25930cc3ead0d Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 30 Apr 2019 12:18:28 +0200
Subject: [PATCH] ALSA: hda - Register irq handler after the chip
@@ -30,12 +30,13 @@ locally in the callee side.
Reported-by: Liwei Song <liwei.song@windriver.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index 2ec91085fa3e..789308f54785 100644
+index 2847a2b2c6b6..c993d6ff24ee 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
-@@ -1788,9 +1788,6 @@ static int azx_first_init(struct azx *chip)
+@@ -1841,9 +1841,6 @@ static int azx_first_init(struct azx *chip)
chip->msi = 0;
}
@@ -45,7 +46,7 @@ index 2ec91085fa3e..789308f54785 100644
pci_set_master(pci);
synchronize_irq(bus->irq);
-@@ -1904,6 +1901,9 @@ static int azx_first_init(struct azx *chip)
+@@ -1958,6 +1955,9 @@ static int azx_first_init(struct azx *chip)
return -ENODEV;
}
diff --git a/queue/ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch b/queue/ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch
index 394eaed..40797d5 100644
--- a/queue/ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch
+++ b/queue/ALSA-hda-realtek-Update-headset-mode-for-ALC256.patch
@@ -1,4 +1,4 @@
-From 717f43d81afc1250300479075952a0e36d74ded3 Mon Sep 17 00:00:00 2001
+From 569f312a7b9d0e3f582bd1f5234512f3aeb072c2 Mon Sep 17 00:00:00 2001
From: Kailang Yang <kailang@realtek.com>
Date: Fri, 31 May 2019 17:16:53 +0800
Subject: [PATCH] ALSA: hda/realtek - Update headset mode for ALC256
@@ -12,12 +12,13 @@ Fixes: e69e7e03ed22 ("ALSA: hda/realtek - ALC256 speaker noise issue")
Signed-off-by: Kailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 18cb48054e54..1afb268f3da0 100644
+index dffb7bcea71f..d714e5e38931 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
-@@ -4133,18 +4133,19 @@ static struct coef_fw alc225_pre_hsmode[] = {
+@@ -4066,18 +4066,19 @@ static struct coef_fw alc225_pre_hsmode[] = {
static void alc_headset_mode_unplugged(struct hda_codec *codec)
{
static struct coef_fw coef0255[] = {
@@ -41,7 +42,7 @@ index 18cb48054e54..1afb268f3da0 100644
{}
};
static struct coef_fw coef0233[] = {
-@@ -4207,13 +4208,11 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
+@@ -4140,13 +4141,11 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec)
switch (codec->core.vendor_id) {
case 0x10ec0255:
@@ -55,7 +56,7 @@ index 18cb48054e54..1afb268f3da0 100644
break;
case 0x10ec0234:
case 0x10ec0274:
-@@ -4266,6 +4265,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
+@@ -4199,6 +4198,12 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
WRITE_COEF(0x06, 0x6100), /* Set MIC2 Vref gate to normal */
{}
};
@@ -68,7 +69,7 @@ index 18cb48054e54..1afb268f3da0 100644
static struct coef_fw coef0233[] = {
UPDATE_COEF(0x35, 0, 1<<14),
WRITE_COEF(0x06, 0x2100),
-@@ -4313,14 +4318,19 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
+@@ -4246,14 +4251,19 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin,
};
switch (codec->core.vendor_id) {
@@ -90,7 +91,7 @@ index 18cb48054e54..1afb268f3da0 100644
case 0x10ec0234:
case 0x10ec0274:
case 0x10ec0294:
-@@ -4402,6 +4412,14 @@ static void alc_headset_mode_default(struct hda_codec *codec)
+@@ -4335,6 +4345,14 @@ static void alc_headset_mode_default(struct hda_codec *codec)
WRITE_COEF(0x49, 0x0049),
{}
};
@@ -105,7 +106,7 @@ index 18cb48054e54..1afb268f3da0 100644
static struct coef_fw coef0233[] = {
WRITE_COEF(0x06, 0x2100),
WRITE_COEF(0x32, 0x4ea3),
-@@ -4452,11 +4470,16 @@ static void alc_headset_mode_default(struct hda_codec *codec)
+@@ -4385,11 +4403,16 @@ static void alc_headset_mode_default(struct hda_codec *codec)
alc_process_coef_fw(codec, alc225_pre_hsmode);
alc_process_coef_fw(codec, coef0225);
break;
@@ -124,7 +125,7 @@ index 18cb48054e54..1afb268f3da0 100644
case 0x10ec0234:
case 0x10ec0274:
case 0x10ec0294:
-@@ -4500,8 +4523,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
+@@ -4433,8 +4456,7 @@ static void alc_headset_mode_ctia(struct hda_codec *codec)
};
static struct coef_fw coef0256[] = {
WRITE_COEF(0x45, 0xd489), /* Set to CTIA type */
@@ -134,7 +135,7 @@ index 18cb48054e54..1afb268f3da0 100644
{}
};
static struct coef_fw coef0233[] = {
-@@ -4619,8 +4641,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
+@@ -4552,8 +4574,7 @@ static void alc_headset_mode_omtp(struct hda_codec *codec)
};
static struct coef_fw coef0256[] = {
WRITE_COEF(0x45, 0xe489), /* Set to OMTP Type */
@@ -144,7 +145,7 @@ index 18cb48054e54..1afb268f3da0 100644
{}
};
static struct coef_fw coef0233[] = {
-@@ -4752,13 +4773,37 @@ static void alc_determine_headset_type(struct hda_codec *codec)
+@@ -4685,13 +4706,37 @@ static void alc_determine_headset_type(struct hda_codec *codec)
};
switch (codec->core.vendor_id) {
diff --git a/queue/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch b/queue/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
index 90ebbd6..0dc79d1 100644
--- a/queue/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
+++ b/queue/ALSA-oxfw-allow-PCM-capture-for-Stanton-SCS.1m.patch
@@ -1,4 +1,4 @@
-From d8fa87c368f5b4096c4746894fdcc195da285df1 Mon Sep 17 00:00:00 2001
+From 91d3f367c319b048eb171d4c6e1388b5e75c6373 Mon Sep 17 00:00:00 2001
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Sun, 9 Jun 2019 19:29:12 +0900
Subject: [PATCH] ALSA: oxfw: allow PCM capture for Stanton SCS.1m
@@ -16,12 +16,13 @@ Fixes: de5126cc3c0b ("ALSA: oxfw: add stream format quirk for SCS.1 models")
Cc: <stable@vger.kernel.org> # v4.5+
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
-index 3d27f3378d5d..b4bef574929d 100644
+index 5f82a375725a..4ecaf69569dc 100644
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
-@@ -148,9 +148,6 @@ static int detect_quirks(struct snd_oxfw *oxfw)
+@@ -170,9 +170,6 @@ static int detect_quirks(struct snd_oxfw *oxfw)
oxfw->midi_input_ports = 0;
oxfw->midi_output_ports = 0;
diff --git a/queue/ALSA-seq-Cover-unsubscribe_port-in-list_mutex.patch b/queue/ALSA-seq-Cover-unsubscribe_port-in-list_mutex.patch
index 01345be..411edb9 100644
--- a/queue/ALSA-seq-Cover-unsubscribe_port-in-list_mutex.patch
+++ b/queue/ALSA-seq-Cover-unsubscribe_port-in-list_mutex.patch
@@ -1,4 +1,4 @@
-From 7c32ae35fbf9cffb7aa3736f44dec10c944ca18e Mon Sep 17 00:00:00 2001
+From ac1e82a72198941f6ae128ac21f3456eb0a15338 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 12 Apr 2019 11:37:19 +0200
Subject: [PATCH] ALSA: seq: Cover unsubscribe_port() in list_mutex
@@ -13,12 +13,13 @@ group list_mutex to plug the hole.
Reported-by: syzbot+e4c8abb920efa77bace9@syzkaller.appspotmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
-index d964d728681e..ac7556ab531c 100644
+index 24d90abfc64d..da31aa8e216e 100644
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
-@@ -547,10 +547,10 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client,
+@@ -550,10 +550,10 @@ static void delete_and_unsubscribe_port(struct snd_seq_client *client,
list_del_init(list);
grp->exclusive = 0;
write_unlock_irq(&grp->list_lock);
diff --git a/queue/ALSA-seq-Fix-race-of-get-subscription-call-vs-port-d.patch b/queue/ALSA-seq-Fix-race-of-get-subscription-call-vs-port-d.patch
index 653450e..17f829a 100644
--- a/queue/ALSA-seq-Fix-race-of-get-subscription-call-vs-port-d.patch
+++ b/queue/ALSA-seq-Fix-race-of-get-subscription-call-vs-port-d.patch
@@ -1,4 +1,4 @@
-From 2eabc5ec8ab4d4748a82050dfcb994119b983750 Mon Sep 17 00:00:00 2001
+From 2b2702ec7d844d8796c6b9718ac8eb1e47393d9a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 9 Apr 2019 18:04:17 +0200
Subject: [PATCH] ALSA: seq: Fix race of get-subscription call vs port-delete
@@ -16,12 +16,13 @@ performs in the rwsem to protect against the deletion.
Reported-by: syzbot+9437020c82413d00222d@syzkaller.appspotmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
-index 976404691261..f256704dc401 100644
+index 5e2c54562e39..14d532d7e06d 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
-@@ -1897,20 +1897,14 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,
+@@ -1907,20 +1907,14 @@ static int snd_seq_ioctl_get_subscription(struct snd_seq_client *client,
int result;
struct snd_seq_client *sender = NULL;
struct snd_seq_client_port *sport = NULL;
@@ -45,10 +46,10 @@ index 976404691261..f256704dc401 100644
if (sport)
snd_seq_port_unlock(sport);
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c
-index 1e2239240f21..d964d728681e 100644
+index da31aa8e216e..16289aefb443 100644
--- a/sound/core/seq/seq_ports.c
+++ b/sound/core/seq/seq_ports.c
-@@ -632,20 +632,23 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector,
+@@ -635,20 +635,23 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector,
/* get matched subscriber */
diff --git a/queue/ARM-OMAP2-pm33xx-core-Do-not-Turn-OFF-CEFUSE-as-PPA-.patch b/queue/ARM-OMAP2-pm33xx-core-Do-not-Turn-OFF-CEFUSE-as-PPA-.patch
index 6837183..aaada26 100644
--- a/queue/ARM-OMAP2-pm33xx-core-Do-not-Turn-OFF-CEFUSE-as-PPA-.patch
+++ b/queue/ARM-OMAP2-pm33xx-core-Do-not-Turn-OFF-CEFUSE-as-PPA-.patch
@@ -1,4 +1,4 @@
-From 72aff4ecf1cb85a3c6e6b42ccbda0bc631b090b3 Mon Sep 17 00:00:00 2001
+From 4d174202f5d3362575ce6c0654144e175ff3c754 Mon Sep 17 00:00:00 2001
From: Kabir Sahane <x0153567@ti.com>
Date: Tue, 9 Apr 2019 08:05:17 -0700
Subject: [PATCH] ARM: OMAP2+: pm33xx-core: Do not Turn OFF CEFUSE as PPA may
@@ -12,12 +12,13 @@ active.
Signed-off-by: Kabir Sahane <x0153567@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/mach-omap2/pm33xx-core.c b/arch/arm/mach-omap2/pm33xx-core.c
-index 724cf5774a6c..c93b6efd565f 100644
+index 9b3755a2e2ec..8130736074b0 100644
--- a/arch/arm/mach-omap2/pm33xx-core.c
+++ b/arch/arm/mach-omap2/pm33xx-core.c
-@@ -51,10 +51,12 @@ static int amx3_common_init(void)
+@@ -50,10 +50,12 @@ static int amx3_common_init(void)
/* CEFUSE domain can be turned off post bootup */
cefuse_pwrdm = pwrdm_lookup("cefuse_pwrdm");
diff --git a/queue/ARM-dts-exynos-Always-enable-necessary-APIO_1V8-and-.patch b/queue/ARM-dts-exynos-Always-enable-necessary-APIO_1V8-and-.patch
index f5d848f..35015d2 100644
--- a/queue/ARM-dts-exynos-Always-enable-necessary-APIO_1V8-and-.patch
+++ b/queue/ARM-dts-exynos-Always-enable-necessary-APIO_1V8-and-.patch
@@ -1,4 +1,4 @@
-From 5ab99cf7d5e96e3b727c30e7a8524c976bd3723d Mon Sep 17 00:00:00 2001
+From 2ec60f0c58f46b410ad3191540a2c9e0713f7299 Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzk@kernel.org>
Date: Thu, 14 Mar 2019 21:02:17 +0100
Subject: [PATCH] ARM: dts: exynos: Always enable necessary APIO_1V8 and
@@ -22,12 +22,13 @@ SoC so they should be always on:
memory and Mali (G3D).
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
-index 74184c6ce3bf..dbf0306896f6 100644
+index cdda614e417e..a370857beac0 100644
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
-@@ -372,6 +372,7 @@
+@@ -106,6 +106,7 @@
regulator-name = "PVDD_APIO_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
@@ -35,7 +36,7 @@ index 74184c6ce3bf..dbf0306896f6 100644
};
ldo3_reg: LDO3 {
-@@ -416,6 +417,7 @@
+@@ -144,6 +145,7 @@
regulator-name = "PVDD_ABB_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
diff --git a/queue/ARM-dts-imx50-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch b/queue/ARM-dts-imx50-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
index 1c8279f..cddf31a 100644
--- a/queue/ARM-dts-imx50-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
+++ b/queue/ARM-dts-imx50-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
@@ -1,4 +1,4 @@
-From b7b4fda2636296471e29b78c2aa9535d7bedb7a0 Mon Sep 17 00:00:00 2001
+From 4957ae3fcbbf8cad19d38945f0738235a1466dad Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:24 -0700
Subject: [PATCH] ARM: dts: imx50: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
@@ -22,12 +22,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
-index 5dd61bff3b76..0bfe7c91d0eb 100644
+index a9b712db9f6c..d7553f825483 100644
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
-@@ -430,7 +430,7 @@
+@@ -438,7 +438,7 @@
reg = <0x63fb0000 0x4000>;
interrupts = <6>;
clocks = <&clks IMX5_CLK_SDMA_GATE>,
diff --git a/queue/ARM-dts-imx51-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch b/queue/ARM-dts-imx51-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
index 798fda2..c0a8d34 100644
--- a/queue/ARM-dts-imx51-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
+++ b/queue/ARM-dts-imx51-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
@@ -1,4 +1,4 @@
-From 918bbde8085ae147a43dcb491953e0dd8f3e9d6a Mon Sep 17 00:00:00 2001
+From ae8f947dac339efdc5390c51f034c4f6bde7f2c3 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:23 -0700
Subject: [PATCH] ARM: dts: imx51: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
@@ -22,12 +22,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
-index a5ee25cedc10..0a4b9a5d9a9c 100644
+index fe01b890c715..2fe42deeb2be 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
-@@ -489,7 +489,7 @@
+@@ -467,7 +467,7 @@
reg = <0x83fb0000 0x4000>;
interrupts = <6>;
clocks = <&clks IMX5_CLK_SDMA_GATE>,
diff --git a/queue/ARM-dts-imx53-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch b/queue/ARM-dts-imx53-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
index d266f60..748d6dc 100644
--- a/queue/ARM-dts-imx53-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
+++ b/queue/ARM-dts-imx53-Specify-IMX5_CLK_IPG-as-ahb-clock-to-S.patch
@@ -1,4 +1,4 @@
-From 28c168018e0902c67eb9c60d0fc4c8aa166c4efe Mon Sep 17 00:00:00 2001
+From 1e651ffa821c62751b9fe885cfff753e04f5f9ef Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:22 -0700
Subject: [PATCH] ARM: dts: imx53: Specify IMX5_CLK_IPG as "ahb" clock to SDMA
@@ -22,12 +22,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
-index b3300300aabe..9b672ed2486d 100644
+index 1a7a7bb3df45..2c67501a6c98 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
-@@ -702,7 +702,7 @@
+@@ -696,7 +696,7 @@
reg = <0x63fb0000 0x4000>;
interrupts = <6>;
clocks = <&clks IMX5_CLK_SDMA_GATE>,
diff --git a/queue/ARM-dts-imx6qdl-Specify-IMX6QDL_CLK_IPG-as-ipg-clock.patch b/queue/ARM-dts-imx6qdl-Specify-IMX6QDL_CLK_IPG-as-ipg-clock.patch
index e740f61..c4b9b56 100644
--- a/queue/ARM-dts-imx6qdl-Specify-IMX6QDL_CLK_IPG-as-ipg-clock.patch
+++ b/queue/ARM-dts-imx6qdl-Specify-IMX6QDL_CLK_IPG-as-ipg-clock.patch
@@ -1,4 +1,4 @@
-From b14c872eebc501b9640b04f4a152df51d6eaf2fc Mon Sep 17 00:00:00 2001
+From 429f15135bcff61d0418ebea788d3a42d2bf6b27 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:16 -0700
Subject: [PATCH] ARM: dts: imx6qdl: Specify IMX6QDL_CLK_IPG as "ipg" clock to
@@ -26,12 +26,13 @@ Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Tested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
-index 38b18a007f48..b3a77bcf00d5 100644
+index 911141e24681..e319fe6c7609 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -928,7 +928,7 @@
+@@ -905,7 +905,7 @@
compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ahb-clock-t.patch b/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ahb-clock-t.patch
index 9c05dda..907c71b 100644
--- a/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ahb-clock-t.patch
+++ b/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ahb-clock-t.patch
@@ -1,4 +1,4 @@
-From cc839d0f8c284fcb7591780b568f13415bbb737c Mon Sep 17 00:00:00 2001
+From 4341efa8668e1f4c313ffa25faaa670024c58fc8 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:21 -0700
Subject: [PATCH] ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ahb" clock to
@@ -23,12 +23,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
-index 0ad5d507abec..9ddbeea64b72 100644
+index 994e48dc1df0..31e0e085ac1c 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
-@@ -748,7 +748,7 @@
+@@ -712,7 +712,7 @@
reg = <0x020ec000 0x4000>;
interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_SDMA>,
diff --git a/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ipg-clock-t.patch b/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ipg-clock-t.patch
index 017f3d9..f02110d 100644
--- a/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ipg-clock-t.patch
+++ b/queue/ARM-dts-imx6sx-Specify-IMX6SX_CLK_IPG-as-ipg-clock-t.patch
@@ -1,4 +1,4 @@
-From 8979117765c19edc3b01cc0ef853537bf93eea4b Mon Sep 17 00:00:00 2001
+From 50b00f329de79a72482ae9b4ce2c9c5d0b37aab3 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:17 -0700
Subject: [PATCH] ARM: dts: imx6sx: Specify IMX6SX_CLK_IPG as "ipg" clock to
@@ -23,12 +23,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
-index df0c59519886..b16a123990a2 100644
+index 71bda604c435..7b5263ebc3dc 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
-@@ -820,7 +820,7 @@
+@@ -796,7 +796,7 @@
compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/queue/ARM-dts-imx6ul-Specify-IMX6UL_CLK_IPG-as-ipg-clock-t.patch b/queue/ARM-dts-imx6ul-Specify-IMX6UL_CLK_IPG-as-ipg-clock-t.patch
index 1b46473..012382d 100644
--- a/queue/ARM-dts-imx6ul-Specify-IMX6UL_CLK_IPG-as-ipg-clock-t.patch
+++ b/queue/ARM-dts-imx6ul-Specify-IMX6UL_CLK_IPG-as-ipg-clock-t.patch
@@ -1,4 +1,4 @@
-From 7b3132ecefdd1fcdf6b86e62021d0e55ea8034db Mon Sep 17 00:00:00 2001
+From bdeeb4f96a2b5443665f373481769e6f0a497452 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:19 -0700
Subject: [PATCH] ARM: dts: imx6ul: Specify IMX6UL_CLK_IPG as "ipg" clock to
@@ -23,12 +23,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
-index a77bbcae4571..bbf010c73336 100644
+index 47a3453a4211..91c96b068590 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
-@@ -708,7 +708,7 @@
+@@ -701,7 +701,7 @@
"fsl,imx35-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/queue/ARM-dts-imx7d-Specify-IMX7D_CLK_IPG-as-ipg-clock-to-.patch b/queue/ARM-dts-imx7d-Specify-IMX7D_CLK_IPG-as-ipg-clock-to-.patch
index 65ea04e..d3f62ab 100644
--- a/queue/ARM-dts-imx7d-Specify-IMX7D_CLK_IPG-as-ipg-clock-to-.patch
+++ b/queue/ARM-dts-imx7d-Specify-IMX7D_CLK_IPG-as-ipg-clock-to-.patch
@@ -1,4 +1,4 @@
-From 412b032a1dc72fc9d1c258800355efa6671b6315 Mon Sep 17 00:00:00 2001
+From d7ddcfb396fdb206b946b125ddba59e55222f799 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Thu, 28 Mar 2019 23:49:18 -0700
Subject: [PATCH] ARM: dts: imx7d: Specify IMX7D_CLK_IPG as "ipg" clock to SDMA
@@ -22,12 +22,13 @@ Cc: Shawn Guo <shawnguo@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
-index 3286838105c6..0b01109ac0a9 100644
+index 9ced589bfa96..605b550ffe11 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
-@@ -1155,8 +1155,8 @@
+@@ -1051,8 +1051,8 @@
compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma";
reg = <0x30bd0000 0x10000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/queue/ARM-exynos-Fix-undefined-instruction-during-Exynos54.patch b/queue/ARM-exynos-Fix-undefined-instruction-during-Exynos54.patch
index 1669e48..2dd3ea9 100644
--- a/queue/ARM-exynos-Fix-undefined-instruction-during-Exynos54.patch
+++ b/queue/ARM-exynos-Fix-undefined-instruction-during-Exynos54.patch
@@ -1,4 +1,4 @@
-From 4d8e3e951a856777720272ce27f2c738a3eeef8c Mon Sep 17 00:00:00 2001
+From f22d6c8d7bd9cfeda31abb7ed216fa60fd81e149 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Mon, 18 Feb 2019 15:34:12 +0100
Subject: [PATCH] ARM: exynos: Fix undefined instruction during Exynos5422
@@ -47,12 +47,13 @@ to LITTLE/KFC cores and change their DSCR.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
-index 42f36843892e..c521af625e40 100644
+index b15cdfdb8e1c..c7f58d08d76f 100644
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
-@@ -450,8 +450,27 @@ early_wakeup:
+@@ -434,8 +434,27 @@ static void exynos3250_pm_resume(void)
static void exynos5420_prepare_pm_resume(void)
{
diff --git a/queue/ARM-prevent-tracing-IPI_CPU_BACKTRACE.patch b/queue/ARM-prevent-tracing-IPI_CPU_BACKTRACE.patch
index b00567f..ccc62ca 100644
--- a/queue/ARM-prevent-tracing-IPI_CPU_BACKTRACE.patch
+++ b/queue/ARM-prevent-tracing-IPI_CPU_BACKTRACE.patch
@@ -1,4 +1,4 @@
-From be167862ae7dd85c56d385209a4890678e1b0488 Mon Sep 17 00:00:00 2001
+From d592f6b18e51f94cd63aa306c0c209ff00513ad8 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 14 May 2019 15:41:48 -0700
Subject: [PATCH] ARM: prevent tracing IPI_CPU_BACKTRACE
@@ -59,6 +59,7 @@ Cc: Borislav Petkov <bp@suse.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h
index cba23eaa6072..7a88f160b1fb 100644
@@ -73,10 +74,10 @@ index cba23eaa6072..7a88f160b1fb 100644
typedef struct {
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index facd4240ca02..c93fe0f256de 100644
+index a3ce7c5365fa..bada66ef4419 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
-@@ -70,6 +70,10 @@ enum ipi_msg_type {
+@@ -76,6 +76,10 @@ enum ipi_msg_type {
IPI_CPU_STOP,
IPI_IRQ_WORK,
IPI_COMPLETION,
@@ -87,7 +88,7 @@ index facd4240ca02..c93fe0f256de 100644
IPI_CPU_BACKTRACE,
/*
* SGI8-15 can be reserved by secure firmware, and thus may
-@@ -797,7 +801,7 @@ core_initcall(register_cpufreq_notifier);
+@@ -803,7 +807,7 @@ core_initcall(register_cpufreq_notifier);
static void raise_nmi(cpumask_t *mask)
{
diff --git a/queue/ASoC-cs42xx8-Add-regcache-mask-dirty.patch b/queue/ASoC-cs42xx8-Add-regcache-mask-dirty.patch
index 4fefd35..135d964 100644
--- a/queue/ASoC-cs42xx8-Add-regcache-mask-dirty.patch
+++ b/queue/ASoC-cs42xx8-Add-regcache-mask-dirty.patch
@@ -1,4 +1,4 @@
-From ad6eecbfc01c987e0253371f274c3872042e4350 Mon Sep 17 00:00:00 2001
+From acffeaca3c94952f4c997c78838719049cb6ab55 Mon Sep 17 00:00:00 2001
From: "S.j. Wang" <shengjiu.wang@nxp.com>
Date: Thu, 16 May 2019 06:04:29 +0000
Subject: [PATCH] ASoC: cs42xx8: Add regcache mask dirty
@@ -14,6 +14,7 @@ support for CS42448/CS42888")
Cc: <stable@vger.kernel.org>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
index ebb9e0cf8364..28a4ac36c4f8 100644
diff --git a/queue/ASoC-fsl_asrc-Fix-the-issue-about-unsupported-rate.patch b/queue/ASoC-fsl_asrc-Fix-the-issue-about-unsupported-rate.patch
index 2982b56..d66c35a 100644
--- a/queue/ASoC-fsl_asrc-Fix-the-issue-about-unsupported-rate.patch
+++ b/queue/ASoC-fsl_asrc-Fix-the-issue-about-unsupported-rate.patch
@@ -1,4 +1,4 @@
-From b06c58c2a1eed571ea2a6640fdb85b7b00196b1e Mon Sep 17 00:00:00 2001
+From 0fe32e5f56769f04a5a97046b6a24d902f093f9a Mon Sep 17 00:00:00 2001
From: "S.j. Wang" <shengjiu.wang@nxp.com>
Date: Wed, 15 May 2019 06:42:18 +0000
Subject: [PATCH] ASoC: fsl_asrc: Fix the issue about unsupported rate
@@ -17,12 +17,13 @@ Cc: <stable@vger.kernel.org>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
-index 0b937924d2e4..ea035c12a325 100644
+index adfb8135d739..0bcfad442e9f 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
-@@ -282,8 +282,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair)
+@@ -286,8 +286,8 @@ static int fsl_asrc_config_pair(struct fsl_asrc_pair *pair)
return -EINVAL;
}
diff --git a/queue/Abort-file_remove_privs-for-non-reg.-files.patch b/queue/Abort-file_remove_privs-for-non-reg.-files.patch
index 6046321..6cc8f8e 100644
--- a/queue/Abort-file_remove_privs-for-non-reg.-files.patch
+++ b/queue/Abort-file_remove_privs-for-non-reg.-files.patch
@@ -1,4 +1,4 @@
-From f69e749a49353d96af1a293f56b5b56de59c668a Mon Sep 17 00:00:00 2001
+From 49993b8a1f614bfe15e60990aa6d5df141597764 Mon Sep 17 00:00:00 2001
From: Alexander Lochmann <alexander.lochmann@tu-dortmund.de>
Date: Fri, 14 Dec 2018 11:55:52 +0100
Subject: [PATCH] Abort file_remove_privs() for non-reg. files
@@ -22,12 +22,13 @@ Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Alexander Lochmann <alexander.lochmann@tu-dortmund.de>
Signed-off-by: Horst Schirmeier <horst.schirmeier@tu-dortmund.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/inode.c b/fs/inode.c
-index e9d97add2b36..9a453f3637f8 100644
+index a06de4454232..81f33dcbd7a6 100644
--- a/fs/inode.c
+++ b/fs/inode.c
-@@ -1817,8 +1817,13 @@ int file_remove_privs(struct file *file)
+@@ -1851,8 +1851,13 @@ int file_remove_privs(struct file *file)
int kill;
int error = 0;
diff --git a/queue/Drivers-misc-fix-out-of-bounds-access-in-function-pa.patch b/queue/Drivers-misc-fix-out-of-bounds-access-in-function-pa.patch
index bc8985a..5d48a84 100644
--- a/queue/Drivers-misc-fix-out-of-bounds-access-in-function-pa.patch
+++ b/queue/Drivers-misc-fix-out-of-bounds-access-in-function-pa.patch
@@ -1,4 +1,4 @@
-From b281218ad4311a0342a40cb02fb17a363df08b48 Mon Sep 17 00:00:00 2001
+From f3a2d28891089e849f0c8668914caa05d8551436 Mon Sep 17 00:00:00 2001
From: Young Xiao <YangX92@hotmail.com>
Date: Fri, 12 Apr 2019 15:45:06 +0800
Subject: [PATCH] Drivers: misc: fix out-of-bounds access in function
@@ -14,12 +14,13 @@ in param_set_kgdboc_var()") for details.
Signed-off-by: Young Xiao <YangX92@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
-index de20bdaa148d..8b01257783dd 100644
+index 6193270e7b3d..eb4d90b7d99e 100644
--- a/drivers/misc/kgdbts.c
+++ b/drivers/misc/kgdbts.c
-@@ -1135,7 +1135,7 @@ static void kgdbts_put_char(u8 chr)
+@@ -1139,7 +1139,7 @@ static void kgdbts_put_char(u8 chr)
static int param_set_kgdbts_var(const char *kmessage,
const struct kernel_param *kp)
{
@@ -28,7 +29,7 @@ index de20bdaa148d..8b01257783dd 100644
if (len >= MAX_CONFIG_LEN) {
printk(KERN_ERR "kgdbts: config string too long\n");
-@@ -1155,7 +1155,7 @@ static int param_set_kgdbts_var(const char *kmessage,
+@@ -1159,7 +1159,7 @@ static int param_set_kgdbts_var(const char *kmessage,
strcpy(config, kmessage);
/* Chop out \n char as a result of echo */
diff --git a/queue/EDAC-mpc85xx-Prevent-building-as-a-module.patch b/queue/EDAC-mpc85xx-Prevent-building-as-a-module.patch
index 6e52f7c..cf555b1 100644
--- a/queue/EDAC-mpc85xx-Prevent-building-as-a-module.patch
+++ b/queue/EDAC-mpc85xx-Prevent-building-as-a-module.patch
@@ -1,4 +1,4 @@
-From 2b8358a951b1e2a534a54924cd8245e58a1c5fb8 Mon Sep 17 00:00:00 2001
+From a7dd1e3f23f200ad6a5d36fb413a590d35800733 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 3 May 2019 00:19:41 +1000
Subject: [PATCH] EDAC/mpc85xx: Prevent building as a module
@@ -32,12 +32,13 @@ Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: linuxppc-dev@ozlabs.org
Cc: morbidrsa@gmail.com
Link: https://lkml.kernel.org/r/20190502141941.12927-1-mpe@ellerman.id.au
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
-index 47eb4d13ed5f..5e2e0348d460 100644
+index 57304b2e989f..b00cc03ad6b6 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
-@@ -263,8 +263,8 @@ config EDAC_PND2
+@@ -250,8 +250,8 @@ config EDAC_PND2
micro-server but may appear on others in the future.
config EDAC_MPC85XX
diff --git a/queue/HID-wacom-Correct-button-numbering-2nd-gen-Intuos-Pr.patch b/queue/HID-wacom-Correct-button-numbering-2nd-gen-Intuos-Pr.patch
index f631f30..d6ed951 100644
--- a/queue/HID-wacom-Correct-button-numbering-2nd-gen-Intuos-Pr.patch
+++ b/queue/HID-wacom-Correct-button-numbering-2nd-gen-Intuos-Pr.patch
@@ -1,4 +1,4 @@
-From 6441fc781c344df61402be1fde582c4491fa35fa Mon Sep 17 00:00:00 2001
+From decfe5a5ffc01d19d8a149f5e7e7189eacc63a2f Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 7 May 2019 11:53:21 -0700
Subject: [PATCH] HID: wacom: Correct button numbering 2nd-gen Intuos Pro over
@@ -25,12 +25,13 @@ Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Aaron Skomra <aaron.skomra@wacom.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
-index af62a630fee9..e848445236d8 100644
+index 7d3db6b78dbc..9c9e59fb1bd5 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
-@@ -1383,7 +1383,7 @@ static void wacom_intuos_pro2_bt_pad(struct wacom_wac *wacom)
+@@ -1381,7 +1381,7 @@ static void wacom_intuos_pro2_bt_pad(struct wacom_wac *wacom)
struct input_dev *pad_input = wacom->pad_input;
unsigned char *data = wacom->data;
@@ -39,7 +40,7 @@ index af62a630fee9..e848445236d8 100644
int ring = data[285] & 0x7F;
bool ringstatus = data[285] & 0x80;
bool prox = buttons || ringstatus;
-@@ -3832,7 +3832,7 @@ static void wacom_24hd_update_leds(struct wacom *wacom, int mask, int group)
+@@ -3850,7 +3850,7 @@ static void wacom_24hd_update_leds(struct wacom *wacom, int mask, int group)
static bool wacom_is_led_toggled(struct wacom *wacom, int button_count,
int mask, int group)
{
@@ -48,7 +49,7 @@ index af62a630fee9..e848445236d8 100644
/*
* 21UX2 has LED group 1 to the left and LED group 0
-@@ -3842,9 +3842,12 @@ static bool wacom_is_led_toggled(struct wacom *wacom, int button_count,
+@@ -3860,9 +3860,12 @@ static bool wacom_is_led_toggled(struct wacom *wacom, int button_count,
if (wacom->wacom_wac.features.type == WACOM_21UX2)
group = 1 - group;
diff --git a/queue/HID-wacom-Don-t-report-anything-prior-to-the-tool-en.patch b/queue/HID-wacom-Don-t-report-anything-prior-to-the-tool-en.patch
index f61ec31..d2f889a 100644
--- a/queue/HID-wacom-Don-t-report-anything-prior-to-the-tool-en.patch
+++ b/queue/HID-wacom-Don-t-report-anything-prior-to-the-tool-en.patch
@@ -1,4 +1,4 @@
-From e92a7be7fe5b2510fa60965eaf25f9e3dc08b8cc Mon Sep 17 00:00:00 2001
+From 87f54072e061288ca2056944630cb56c51b120dd Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 24 Apr 2019 15:12:58 -0700
Subject: [PATCH] HID: wacom: Don't report anything prior to the tool entering
@@ -20,12 +20,13 @@ Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
-index 4c1bc239207e..613342bb9d6b 100644
+index ff5bbc9da82c..f229d3caa5de 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
-@@ -1290,23 +1290,26 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
+@@ -1288,23 +1288,26 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
get_unaligned_le16(&frame[11]));
}
}
diff --git a/queue/HID-wacom-Don-t-set-tool-type-until-we-re-in-range.patch b/queue/HID-wacom-Don-t-set-tool-type-until-we-re-in-range.patch
index 08f1725..d63783e 100644
--- a/queue/HID-wacom-Don-t-set-tool-type-until-we-re-in-range.patch
+++ b/queue/HID-wacom-Don-t-set-tool-type-until-we-re-in-range.patch
@@ -1,4 +1,4 @@
-From 2cc08800a6b9fcda7c7afbcf2da1a6e8808da725 Mon Sep 17 00:00:00 2001
+From 8d306af00d6a50d62ff91f6c0fcb5b23409f4b0c Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 24 Apr 2019 15:12:57 -0700
Subject: [PATCH] HID: wacom: Don't set tool type until we're in range
@@ -19,12 +19,13 @@ Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
-index 747730d32ab6..4c1bc239207e 100644
+index ff9a1d8e90f7..ff5bbc9da82c 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
-@@ -1236,13 +1236,13 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
+@@ -1234,13 +1234,13 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
/* Add back in missing bits of ID for non-USI pens */
wacom->id[0] |= (wacom->serial[0] >> 32) & 0xFFFFF;
}
@@ -39,7 +40,7 @@ index 747730d32ab6..4c1bc239207e 100644
if (!valid)
continue;
-@@ -1251,9 +1251,24 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
+@@ -1249,9 +1249,24 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
wacom->shared->stylus_in_proximity = false;
wacom_exit_report(wacom);
input_sync(pen_input);
diff --git a/queue/HID-wacom-Send-BTN_TOUCH-in-response-to-INTUOSP2_BT-.patch b/queue/HID-wacom-Send-BTN_TOUCH-in-response-to-INTUOSP2_BT-.patch
index aeb5b17..1f37b6d 100644
--- a/queue/HID-wacom-Send-BTN_TOUCH-in-response-to-INTUOSP2_BT-.patch
+++ b/queue/HID-wacom-Send-BTN_TOUCH-in-response-to-INTUOSP2_BT-.patch
@@ -1,4 +1,4 @@
-From fe7f8d73d1af19b678171170e4e5384deb57833d Mon Sep 17 00:00:00 2001
+From 43ba59717ac6aa15ecad8ffef554ccd6a66ab3e7 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 7 May 2019 11:53:20 -0700
Subject: [PATCH] HID: wacom: Send BTN_TOUCH in response to INTUOSP2_BT eraser
@@ -18,12 +18,13 @@ Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Reviewed-by: Aaron Skomra <aaron.skomra@wacom.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
-index 613342bb9d6b..af62a630fee9 100644
+index f229d3caa5de..7d3db6b78dbc 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
-@@ -1301,7 +1301,7 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
+@@ -1299,7 +1299,7 @@ static void wacom_intuos_pro2_bt_pen(struct wacom_wac *wacom)
range ? frame[7] : wacom->features.distance_max);
}
diff --git a/queue/HID-wacom-Sync-INTUOSP2_BT-touch-state-after-each-fr.patch b/queue/HID-wacom-Sync-INTUOSP2_BT-touch-state-after-each-fr.patch
index d238560..f3c4cba 100644
--- a/queue/HID-wacom-Sync-INTUOSP2_BT-touch-state-after-each-fr.patch
+++ b/queue/HID-wacom-Sync-INTUOSP2_BT-touch-state-after-each-fr.patch
@@ -1,4 +1,4 @@
-From 69dbdfffef20c715df9f381b2cee4e9e0a4efd93 Mon Sep 17 00:00:00 2001
+From 80c547d2b771b1c440abcc9d7c555f30a3ada66d Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 7 May 2019 11:53:22 -0700
Subject: [PATCH] HID: wacom: Sync INTUOSP2_BT touch state after each frame if
@@ -20,12 +20,13 @@ Fixes: 4922cd26f03c ("HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic
Cc: <stable@vger.kernel.org> # 4.11+
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
-index e848445236d8..09b8e4aac82f 100644
+index 9c9e59fb1bd5..35b61b093b51 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
-@@ -1371,11 +1371,17 @@ static void wacom_intuos_pro2_bt_touch(struct wacom_wac *wacom)
+@@ -1369,11 +1369,17 @@ static void wacom_intuos_pro2_bt_touch(struct wacom_wac *wacom)
if (wacom->num_contacts_left <= 0) {
wacom->num_contacts_left = 0;
wacom->shared->touch_down = wacom_wac_finger_count_touches(wacom);
diff --git a/queue/KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-kvm_for.patch b/queue/KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-kvm_for.patch
index 75aa40b..b76a63e 100644
--- a/queue/KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-kvm_for.patch
+++ b/queue/KVM-PPC-Book3S-HV-Don-t-take-kvm-lock-around-kvm_for.patch
@@ -1,4 +1,4 @@
-From 5a3f49364c3ffa1107bd88f8292406e98c5d206c Mon Sep 17 00:00:00 2001
+From 10eb1e87de047d6e974e6327082890ce494e183b Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@ozlabs.org>
Date: Thu, 23 May 2019 16:36:32 +1000
Subject: [PATCH] KVM: PPC: Book3S HV: Don't take kvm->lock around
@@ -25,12 +25,13 @@ locklessly.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
-index b1c0a9bc3555..27054d301852 100644
+index 2ebd5132a29f..85f63a0c0fb1 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
-@@ -446,12 +446,7 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu)
+@@ -427,12 +427,7 @@ static void kvmppc_dump_regs(struct kvm_vcpu *vcpu)
static struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)
{
@@ -44,7 +45,7 @@ index b1c0a9bc3555..27054d301852 100644
}
static void init_vpa(struct kvm_vcpu *vcpu, struct lppaca *vpa)
-@@ -1583,7 +1578,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,
+@@ -1310,7 +1305,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,
struct kvmppc_vcore *vc = vcpu->arch.vcore;
u64 mask;
@@ -52,7 +53,7 @@ index b1c0a9bc3555..27054d301852 100644
spin_lock(&vc->lock);
/*
* If ILE (interrupt little-endian) has changed, update the
-@@ -1623,7 +1617,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,
+@@ -1350,7 +1344,6 @@ static void kvmppc_set_lpcr(struct kvm_vcpu *vcpu, u64 new_lpcr,
mask &= 0xFFFFFFFF;
vc->lpcr = (vc->lpcr & ~mask) | (new_lpcr & mask);
spin_unlock(&vc->lock);
diff --git a/queue/KVM-PPC-Book3S-Use-new-mutex-to-synchronize-access-t.patch b/queue/KVM-PPC-Book3S-Use-new-mutex-to-synchronize-access-t.patch
index 74400f8..4260786 100644
--- a/queue/KVM-PPC-Book3S-Use-new-mutex-to-synchronize-access-t.patch
+++ b/queue/KVM-PPC-Book3S-Use-new-mutex-to-synchronize-access-t.patch
@@ -1,4 +1,4 @@
-From 1659e27d2bc1ef47b6d031abe01b467f18cb72d9 Mon Sep 17 00:00:00 2001
+From 30e6a53b6380057b765f700ffe3ce74e503415bb Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@ozlabs.org>
Date: Wed, 29 May 2019 11:54:00 +1000
Subject: [PATCH] KVM: PPC: Book3S: Use new mutex to synchronize access to rtas
@@ -23,12 +23,13 @@ destroyed, and at that point nothing can be looking up a token in
the list.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
-index 26b3ce487ddc..d10df677c452 100644
+index 68f69854095b..5a5c207f7ad2 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
-@@ -309,6 +309,7 @@ struct kvm_arch {
+@@ -292,6 +292,7 @@ struct kvm_arch {
#ifdef CONFIG_PPC_BOOK3S_64
struct list_head spapr_tce_tables;
struct list_head rtas_tokens;
@@ -37,10 +38,10 @@ index 26b3ce487ddc..d10df677c452 100644
#endif
#ifdef CONFIG_KVM_MPIC
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
-index 61a212d0daf0..ac5664845aca 100644
+index edaf4720d156..5b95ef13abd6 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
-@@ -902,6 +902,7 @@ int kvmppc_core_init_vm(struct kvm *kvm)
+@@ -841,6 +841,7 @@ int kvmppc_core_init_vm(struct kvm *kvm)
#ifdef CONFIG_PPC64
INIT_LIST_HEAD_RCU(&kvm->arch.spapr_tce_tables);
INIT_LIST_HEAD(&kvm->arch.rtas_tokens);
@@ -49,7 +50,7 @@ index 61a212d0daf0..ac5664845aca 100644
return kvm->arch.kvm_ops->init_vm(kvm);
diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c
-index 4e178c4c1ea5..b7ae3dfbf00e 100644
+index 2d3b2b1cc272..8f2355138f80 100644
--- a/arch/powerpc/kvm/book3s_rtas.c
+++ b/arch/powerpc/kvm/book3s_rtas.c
@@ -146,7 +146,7 @@ static int rtas_token_undefine(struct kvm *kvm, char *name)
diff --git a/queue/KVM-s390-fix-memory-slot-handling-for-KVM_SET_USER_M.patch b/queue/KVM-s390-fix-memory-slot-handling-for-KVM_SET_USER_M.patch
index d784222..ffb74eb 100644
--- a/queue/KVM-s390-fix-memory-slot-handling-for-KVM_SET_USER_M.patch
+++ b/queue/KVM-s390-fix-memory-slot-handling-for-KVM_SET_USER_M.patch
@@ -1,4 +1,4 @@
-From 19ec166c3f39fe1d3789888a74cc95544ac266d4 Mon Sep 17 00:00:00 2001
+From 7e333018fcf2fd2bdda5591c372668939b44bd56 Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Fri, 24 May 2019 16:06:23 +0200
Subject: [PATCH] KVM: s390: fix memory slot handling for
@@ -13,12 +13,13 @@ implement those.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
-index ac6163c334d6..e5e8eb29e68e 100644
+index 3b7a5151b6a5..4379107a5866 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
-@@ -4524,21 +4524,28 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
+@@ -4041,21 +4041,28 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
const struct kvm_memory_slot *new,
enum kvm_mr_change change)
{
diff --git a/queue/PCI-designware-ep-Use-aligned-ATU-window-for-raising.patch b/queue/PCI-designware-ep-Use-aligned-ATU-window-for-raising.patch
index 3735ca3..48531fd 100644
--- a/queue/PCI-designware-ep-Use-aligned-ATU-window-for-raising.patch
+++ b/queue/PCI-designware-ep-Use-aligned-ATU-window-for-raising.patch
@@ -1,4 +1,4 @@
-From 7b70a1883108c602278faa934d1b7ecac5210ce2 Mon Sep 17 00:00:00 2001
+From e7bf7e695ef9a0714124f3e2fa61cea6672a5308 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Mon, 25 Mar 2019 15:09:45 +0530
Subject: [PATCH] PCI: designware-ep: Use aligned ATU window for raising MSI
@@ -15,6 +15,7 @@ writes were always to the beginning of the ATU window.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/controller/dwc/pcie-designware-ep.c b/drivers/pci/controller/dwc/pcie-designware-ep.c
index 8650416f6f9e..2ec3b75f1500 100644
diff --git a/queue/PCI-dwc-Free-MSI-IRQ-page-in-dw_pcie_free_msi.patch b/queue/PCI-dwc-Free-MSI-IRQ-page-in-dw_pcie_free_msi.patch
index 9144cc9..84a2fe1 100644
--- a/queue/PCI-dwc-Free-MSI-IRQ-page-in-dw_pcie_free_msi.patch
+++ b/queue/PCI-dwc-Free-MSI-IRQ-page-in-dw_pcie_free_msi.patch
@@ -1,4 +1,4 @@
-From 01ba763ee65e09e986ae1f1ffd7cc30bd7e773df Mon Sep 17 00:00:00 2001
+From 34a968c232292c7eb01e330c3665d5263566d0e5 Mon Sep 17 00:00:00 2001
From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Date: Fri, 29 Mar 2019 11:57:17 +0000
Subject: [PATCH] PCI: dwc: Free MSI IRQ page in dw_pcie_free_msi()
@@ -12,6 +12,7 @@ Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 4eedb2c54ab3..acd50920c2ff 100644
diff --git a/queue/PCI-dwc-Free-MSI-in-dw_pcie_host_init-error-path.patch b/queue/PCI-dwc-Free-MSI-in-dw_pcie_host_init-error-path.patch
index 64bfc9e..cb0ab49 100644
--- a/queue/PCI-dwc-Free-MSI-in-dw_pcie_host_init-error-path.patch
+++ b/queue/PCI-dwc-Free-MSI-in-dw_pcie_host_init-error-path.patch
@@ -1,4 +1,4 @@
-From 9e2b5de5604a6ff2626c51e77014d92c9299722c Mon Sep 17 00:00:00 2001
+From 0b9afa2436779313598f98c580a0bb2cfb87c581 Mon Sep 17 00:00:00 2001
From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Date: Fri, 29 Mar 2019 11:57:54 +0000
Subject: [PATCH] PCI: dwc: Free MSI in dw_pcie_host_init() error path
@@ -15,12 +15,13 @@ Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
-index a71b874ae3c0..acc9be5cf34a 100644
+index b56e22262a77..4eedb2c54ab3 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
-@@ -445,7 +445,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
+@@ -439,7 +439,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
if (ret)
pci->num_viewport = 2;
@@ -29,7 +30,7 @@ index a71b874ae3c0..acc9be5cf34a 100644
/*
* If a specific SoC driver needs to change the
* default number of vectors, it needs to implement
-@@ -483,7 +483,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
+@@ -477,7 +477,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
if (pp->ops->host_init) {
ret = pp->ops->host_init(pp);
if (ret)
@@ -38,7 +39,7 @@ index a71b874ae3c0..acc9be5cf34a 100644
}
pp->root_bus_nr = pp->busn->start;
-@@ -497,7 +497,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
+@@ -491,7 +491,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
ret = pci_scan_root_bus_bridge(bridge);
if (ret)
@@ -47,7 +48,7 @@ index a71b874ae3c0..acc9be5cf34a 100644
bus = bridge->bus;
-@@ -513,6 +513,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
+@@ -507,6 +507,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
pci_bus_add_devices(bus);
return 0;
diff --git a/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch b/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch
index 2379639..40169e7 100644
--- a/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch
+++ b/queue/PCI-keystone-Prevent-ARM32-specific-code-to-be-compi.patch
@@ -1,4 +1,4 @@
-From 0f8d1d2dc72291dedd79e7864b7afbd69b106d26 Mon Sep 17 00:00:00 2001
+From afbf89669a5de140962f8344ebaeaf7a36014ff0 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Mon, 25 Mar 2019 15:09:33 +0530
Subject: [PATCH] PCI: keystone: Prevent ARM32 specific code to be compiled for
@@ -17,6 +17,7 @@ with CONFIG_ARM.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
[lorenzo.pieralisi@arm.com: commit log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 3722a5f31e5e..f2901baf8cfc 100644
diff --git a/queue/PCI-rcar-Fix-64bit-MSI-message-address-handling.patch b/queue/PCI-rcar-Fix-64bit-MSI-message-address-handling.patch
index b10efa0..99a16f6 100644
--- a/queue/PCI-rcar-Fix-64bit-MSI-message-address-handling.patch
+++ b/queue/PCI-rcar-Fix-64bit-MSI-message-address-handling.patch
@@ -1,4 +1,4 @@
-From 5ff51c932b0982d9100b51ca77a5e905ed11dae3 Mon Sep 17 00:00:00 2001
+From a5335c97919b99f115e28cc68dd92e939211b6af Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Mon, 25 Mar 2019 12:41:01 +0100
Subject: [PATCH] PCI: rcar: Fix 64bit MSI message address handling
@@ -42,6 +42,7 @@ Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Simon Horman <horms+renesas@verge.net.au>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-renesas-soc@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index 765c39911c0c..9b9c677ad3a0 100644
diff --git a/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch b/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch
index 233b25c..354a94a 100644
--- a/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch
+++ b/queue/PCI-rcar-Fix-a-potential-NULL-pointer-dereference.patch
@@ -1,4 +1,4 @@
-From e60c1bd90e8c42feb619196d4018c3db8527a5c0 Mon Sep 17 00:00:00 2001
+From 222b8e852916cdc83b84d94fdb35a3dce778dcf1 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Fri, 15 Mar 2019 02:29:43 -0500
Subject: [PATCH] PCI: rcar: Fix a potential NULL pointer dereference
@@ -14,6 +14,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Reviewed-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/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
index 6a4e435bd35f..765c39911c0c 100644
diff --git a/queue/PCI-rpadlpar-Fix-leaked-device_node-references-in-ad.patch b/queue/PCI-rpadlpar-Fix-leaked-device_node-references-in-ad.patch
index 64faf96..68aa1cb 100644
--- a/queue/PCI-rpadlpar-Fix-leaked-device_node-references-in-ad.patch
+++ b/queue/PCI-rpadlpar-Fix-leaked-device_node-references-in-ad.patch
@@ -1,4 +1,4 @@
-From fb26228bfc4ce3951544848555c0278e2832e618 Mon Sep 17 00:00:00 2001
+From 70e39b06a85ab464232d1a1d936c428fd7569380 Mon Sep 17 00:00:00 2001
From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Date: Fri, 22 Mar 2019 13:27:21 -0500
Subject: [PATCH] PCI: rpadlpar: Fix leaked device_node references in
@@ -18,6 +18,7 @@ iterate over its children.
Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index e2356a9c7088..182f9e3443ee 100644
diff --git a/queue/PCI-xilinx-Check-for-__get_free_pages-failure.patch b/queue/PCI-xilinx-Check-for-__get_free_pages-failure.patch
index c0e87e2..48da570 100644
--- a/queue/PCI-xilinx-Check-for-__get_free_pages-failure.patch
+++ b/queue/PCI-xilinx-Check-for-__get_free_pages-failure.patch
@@ -1,4 +1,4 @@
-From 699ca30162686bf305cdf94861be02eb0cf9bda2 Mon Sep 17 00:00:00 2001
+From eedfe02d8fdea59d282d348648f5c36efe946048 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 25 Mar 2019 17:19:09 -0500
Subject: [PATCH] PCI: xilinx: Check for __get_free_pages() failure
@@ -12,9 +12,10 @@ Signed-off-by: Kangjie Lu <kjlu@umn.edu>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
-index 9bd1a35cd5d8..5bf3af3b28e6 100644
+index 7b1389d8e2a5..ea48cba5480b 100644
--- a/drivers/pci/controller/pcie-xilinx.c
+++ b/drivers/pci/controller/pcie-xilinx.c
@@ -336,14 +336,19 @@ static const struct irq_domain_ops msi_domain_ops = {
diff --git a/queue/RAS-CEC-Convert-the-timer-callback-to-a-workqueue.patch b/queue/RAS-CEC-Convert-the-timer-callback-to-a-workqueue.patch
index decde1b..b184ed6 100644
--- a/queue/RAS-CEC-Convert-the-timer-callback-to-a-workqueue.patch
+++ b/queue/RAS-CEC-Convert-the-timer-callback-to-a-workqueue.patch
@@ -1,4 +1,4 @@
-From 0ade0b6240c4853cf9725924c46c10f4251639d7 Mon Sep 17 00:00:00 2001
+From 887aa5e337cd265b9194ed5c954be7aadb717c29 Mon Sep 17 00:00:00 2001
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Tue, 16 Apr 2019 14:33:51 -0700
Subject: [PATCH] RAS/CEC: Convert the timer callback to a workqueue
@@ -22,9 +22,10 @@ Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20190416213351.28999-2-xiyou.wangcong@gmail.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
-index dbfe3e61d2c2..673f8a128397 100644
+index 2d9ec378a8bc..fb0e41e05b72 100644
--- a/drivers/ras/cec.c
+++ b/drivers/ras/cec.c
@@ -2,6 +2,7 @@
@@ -86,7 +87,7 @@ index dbfe3e61d2c2..673f8a128397 100644
}
/*
-@@ -380,15 +378,15 @@ static int decay_interval_set(void *data, u64 val)
+@@ -374,15 +372,15 @@ static int decay_interval_set(void *data, u64 val)
{
*(u64 *)data = val;
@@ -106,7 +107,7 @@ index dbfe3e61d2c2..673f8a128397 100644
return 0;
}
DEFINE_DEBUGFS_ATTRIBUTE(decay_interval_ops, u64_get, decay_interval_set, "%lld\n");
-@@ -432,7 +430,7 @@ static int array_dump(struct seq_file *m, void *v)
+@@ -426,7 +424,7 @@ static int array_dump(struct seq_file *m, void *v)
seq_printf(m, "Flags: 0x%x\n", ca->flags);
@@ -115,7 +116,7 @@ index dbfe3e61d2c2..673f8a128397 100644
seq_printf(m, "Decays: %lld\n", ca->decays_done);
seq_printf(m, "Action threshold: %d\n", count_threshold);
-@@ -478,7 +476,7 @@ static int __init create_debugfs_nodes(void)
+@@ -472,7 +470,7 @@ static int __init create_debugfs_nodes(void)
}
decay = debugfs_create_file("decay_interval", S_IRUSR | S_IWUSR, d,
@@ -124,7 +125,7 @@ index dbfe3e61d2c2..673f8a128397 100644
if (!decay) {
pr_warn("Error creating decay_interval debugfs node!\n");
goto err;
-@@ -514,8 +512,8 @@ void __init cec_init(void)
+@@ -508,8 +506,8 @@ void __init cec_init(void)
if (create_debugfs_nodes())
return;
diff --git a/queue/RAS-CEC-Fix-binary-search-function.patch b/queue/RAS-CEC-Fix-binary-search-function.patch
index fabd7e1..e9dc74c 100644
--- a/queue/RAS-CEC-Fix-binary-search-function.patch
+++ b/queue/RAS-CEC-Fix-binary-search-function.patch
@@ -1,4 +1,4 @@
-From f3c74b38a55aefe1004200d15a83f109b510068c Mon Sep 17 00:00:00 2001
+From a4037a5698ab8be4c19163656a4df85dc015a56f Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Sat, 20 Apr 2019 13:27:51 +0200
Subject: [PATCH] RAS/CEC: Fix binary search function
@@ -26,12 +26,13 @@ Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: <stable@vger.kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/ras/cec.c b/drivers/ras/cec.c
-index 88e4f3ff0cb8..dbfe3e61d2c2 100644
+index fb0e41e05b72..f85d6b7a1984 100644
--- a/drivers/ras/cec.c
+++ b/drivers/ras/cec.c
-@@ -183,32 +183,38 @@ static void cec_timer_fn(struct timer_list *unused)
+@@ -181,32 +181,38 @@ static void cec_work_fn(struct work_struct *work)
*/
static int __find_elem(struct ce_array *ca, u64 pfn, unsigned int *to)
{
diff --git a/queue/Staging-vc04_services-Fix-a-couple-error-codes.patch b/queue/Staging-vc04_services-Fix-a-couple-error-codes.patch
index 8f73251..24af875 100644
--- a/queue/Staging-vc04_services-Fix-a-couple-error-codes.patch
+++ b/queue/Staging-vc04_services-Fix-a-couple-error-codes.patch
@@ -1,4 +1,4 @@
-From ca4e4efbefbbdde0a7bb3023ea08d491f4daf9b9 Mon Sep 17 00:00:00 2001
+From 95c45239c26ae643dd331e62b62abef25a16fb81 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 13 May 2019 14:07:18 +0300
Subject: [PATCH] Staging: vc04_services: Fix a couple error codes
@@ -12,12 +12,13 @@ Fixes: 7b3ad5abf027 ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index 9841c30450ce..dade79738a29 100644
+index cff7b1e07153..b688ebc01740 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -572,7 +572,7 @@ exit:
+@@ -576,7 +576,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev,
dev->colourfx.enable ? "true" : "false",
dev->colourfx.u, dev->colourfx.v,
ret, (ret == 0 ? 0 : -EINVAL));
@@ -26,7 +27,7 @@ index 9841c30450ce..dade79738a29 100644
}
static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
-@@ -596,7 +596,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
+@@ -600,7 +600,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
"%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
__func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
(ret == 0 ? 0 : -EINVAL));
diff --git a/queue/USB-Fix-chipmunk-like-voice-when-using-Logitech-C270.patch b/queue/USB-Fix-chipmunk-like-voice-when-using-Logitech-C270.patch
index 5a56039..f0a086b 100644
--- a/queue/USB-Fix-chipmunk-like-voice-when-using-Logitech-C270.patch
+++ b/queue/USB-Fix-chipmunk-like-voice-when-using-Logitech-C270.patch
@@ -1,4 +1,4 @@
-From bd21f0222adab64974b7d1b4b8c7ce6b23e9ea4d Mon Sep 17 00:00:00 2001
+From 26fa2d26dd81e8f9fa1841467d66e40c23cdd572 Mon Sep 17 00:00:00 2001
From: Marco Zatta <marco@zatta.me>
Date: Sat, 1 Jun 2019 09:52:57 +0200
Subject: [PATCH] USB: Fix chipmunk-like voice when using Logitech C270 for
@@ -18,6 +18,7 @@ Signed-off-by: Marco Zatta <marco@zatta.me>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 6082b008969b..6b6413073584 100644
diff --git a/queue/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch b/queue/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch
index 13f0bb8..dbf813b 100644
--- a/queue/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch
+++ b/queue/USB-serial-option-add-Telit-0x1260-and-0x1261-compos.patch
@@ -1,4 +1,4 @@
-From f3dfd4072c3ee6e287f501a18b5718b185d6a940 Mon Sep 17 00:00:00 2001
+From 834d7f36fcac3106e1a19b10c6cb58252bce758a Mon Sep 17 00:00:00 2001
From: Daniele Palmas <dnlplm@gmail.com>
Date: Wed, 15 May 2019 17:27:49 +0200
Subject: [PATCH] USB: serial: option: add Telit 0x1260 and 0x1261 compositions
@@ -10,9 +10,10 @@ Added support for Telit LE910Cx 0x1260 and 0x1261 compositions.
Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 100a5c0ec3e7..a0aaf0635359 100644
+index 3f01c0b4e79f..ea891195bbdf 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1171,6 +1171,10 @@ static const struct usb_device_id option_ids[] = {
diff --git a/queue/USB-serial-option-add-support-for-Simcom-SIM7500-SIM.patch b/queue/USB-serial-option-add-support-for-Simcom-SIM7500-SIM.patch
index 2d0ab44..f25c468 100644
--- a/queue/USB-serial-option-add-support-for-Simcom-SIM7500-SIM.patch
+++ b/queue/USB-serial-option-add-support-for-Simcom-SIM7500-SIM.patch
@@ -1,4 +1,4 @@
-From 5417a7e482962952e622eabd60cd3600dd65dedf Mon Sep 17 00:00:00 2001
+From ebc9099e73f3835140f86e40830f314c60ed0574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rgen=20Storvist?= <jorgen.storvist@gmail.com>
Date: Mon, 13 May 2019 18:37:52 +0200
Subject: [PATCH] USB: serial: option: add support for Simcom SIM7500/SIM7600
@@ -31,9 +31,10 @@ I: If#=0x7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
Signed-off-by: Jörgen Storvist <jorgen.storvist@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
-index 83869065b802..100a5c0ec3e7 100644
+index d8c474b386a8..3f01c0b4e79f 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1772,6 +1772,8 @@ static const struct usb_device_id option_ids[] = {
diff --git a/queue/USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.patch b/queue/USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.patch
index 1a1801c..ec2b83c 100644
--- a/queue/USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.patch
+++ b/queue/USB-serial-pl2303-add-Allied-Telesis-VT-Kit3.patch
@@ -1,4 +1,4 @@
-From c5f81656a18b271976a86724dadd8344e54de74e Mon Sep 17 00:00:00 2001
+From fa9b33838c1ab537382027045e7c01d3a39938fd Mon Sep 17 00:00:00 2001
From: Chris Packham <chris.packham@alliedtelesis.co.nz>
Date: Tue, 14 May 2019 17:35:42 +1200
Subject: [PATCH] USB: serial: pl2303: add Allied Telesis VT-Kit3
@@ -11,9 +11,10 @@ pl2303-based device.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
-index 55122ac84518..d7abde14b3cf 100644
+index 5a6df6e9ad57..5d7b21ea6238 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -106,6 +106,7 @@ static const struct usb_device_id id_table[] = {
diff --git a/queue/USB-usb-storage-Add-new-ID-to-ums-realtek.patch b/queue/USB-usb-storage-Add-new-ID-to-ums-realtek.patch
index 99027e9..2d87a99 100644
--- a/queue/USB-usb-storage-Add-new-ID-to-ums-realtek.patch
+++ b/queue/USB-usb-storage-Add-new-ID-to-ums-realtek.patch
@@ -1,4 +1,4 @@
-From 1a6dd3fea131276a4fc44ae77b0f471b0b473577 Mon Sep 17 00:00:00 2001
+From 69a783a9e2986668fec59fbe89b7d23e2bb82e50 Mon Sep 17 00:00:00 2001
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Tue, 4 Jun 2019 00:20:49 +0800
Subject: [PATCH] USB: usb-storage: Add new ID to ums-realtek
@@ -13,6 +13,7 @@ Add the device ID to support it.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/storage/unusual_realtek.h b/drivers/usb/storage/unusual_realtek.h
index 6b2140f966ef..7e14c2d7cf73 100644
diff --git a/queue/arm64-mm-Inhibit-huge-vmap-with-ptdump.patch b/queue/arm64-mm-Inhibit-huge-vmap-with-ptdump.patch
index 491907b..9a28f31 100644
--- a/queue/arm64-mm-Inhibit-huge-vmap-with-ptdump.patch
+++ b/queue/arm64-mm-Inhibit-huge-vmap-with-ptdump.patch
@@ -1,4 +1,4 @@
-From 7ba36eccb3f83983a651efd570b4f933ecad1b5c Mon Sep 17 00:00:00 2001
+From 3fefed2d5bd87b48888ad4a968775affcf21f4ea Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Tue, 14 May 2019 14:30:06 +0530
Subject: [PATCH] arm64/mm: Inhibit huge-vmap with ptdump
@@ -40,12 +40,13 @@ Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
-index ef82312860ac..37a902cad918 100644
+index 8ae5d7ae4af3..a9df74d01400 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
-@@ -955,13 +955,18 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys)
+@@ -920,13 +920,18 @@ void *__init fixmap_remap_fdt(phys_addr_t dt_phys)
int __init arch_ioremap_pud_supported(void)
{
diff --git a/queue/ax25-fix-inconsistent-lock-state-in-ax25_destroy_tim.patch b/queue/ax25-fix-inconsistent-lock-state-in-ax25_destroy_tim.patch
index 54f4fe3..1351bbe 100644
--- a/queue/ax25-fix-inconsistent-lock-state-in-ax25_destroy_tim.patch
+++ b/queue/ax25-fix-inconsistent-lock-state-in-ax25_destroy_tim.patch
@@ -1,4 +1,4 @@
-From d4d5d8e83c9616aeef28a2869cea49cc3fb35526 Mon Sep 17 00:00:00 2001
+From dc6b8beab4da259bbad3d21acab49ed416791ccf Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sat, 15 Jun 2019 16:40:52 -0700
Subject: [PATCH] ax25: fix inconsistent lock state in ax25_destroy_timer
@@ -94,12 +94,13 @@ R13: 00000000f5e616f3 R14: 0000000000000000 R15: 00007ffcaf0cf798
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
-index 09fdd0aac4b9..b40e0bce67ea 100644
+index 66f74c85cf6b..66d54fc11831 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
-@@ -426,9 +426,11 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25_address *addr)
+@@ -429,9 +429,11 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25_address *addr)
}
if (ax25->sk != NULL) {
diff --git a/queue/bcache-fix-stack-corruption-by-PRECEDING_KEY.patch b/queue/bcache-fix-stack-corruption-by-PRECEDING_KEY.patch
index e2e7588..14fbb22 100644
--- a/queue/bcache-fix-stack-corruption-by-PRECEDING_KEY.patch
+++ b/queue/bcache-fix-stack-corruption-by-PRECEDING_KEY.patch
@@ -1,4 +1,4 @@
-From 31b90956b124240aa8c63250243ae1a53585c5e2 Mon Sep 17 00:00:00 2001
+From af909eb6a40e817aeeeab6d0cb8ded8b8338780a Mon Sep 17 00:00:00 2001
From: Coly Li <colyli@suse.de>
Date: Mon, 10 Jun 2019 06:13:34 +0800
Subject: [PATCH] bcache: fix stack corruption by PRECEDING_KEY()
@@ -45,12 +45,13 @@ Cc: Kent Overstreet <kent.overstreet@gmail.com>
Cc: Nix <nix@esperi.org.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
-index 8f07fa6e1739..268f1b685084 100644
+index f3403b45bc28..4478ff1e5036 100644
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
-@@ -887,12 +887,22 @@ unsigned int bch_btree_insert_key(struct btree_keys *b, struct bkey *k,
+@@ -825,12 +825,22 @@ unsigned bch_btree_insert_key(struct btree_keys *b, struct bkey *k,
struct bset *i = bset_tree_last(b)->data;
struct bkey *m, *prev = NULL;
struct btree_iter iter;
@@ -77,10 +78,10 @@ index 8f07fa6e1739..268f1b685084 100644
if (b->ops->insert_fixup(b, k, &iter, replace_key))
return status;
diff --git a/drivers/md/bcache/bset.h b/drivers/md/bcache/bset.h
-index bac76aabca6d..c71365e7c1fa 100644
+index b867f2200495..7e21a2087477 100644
--- a/drivers/md/bcache/bset.h
+++ b/drivers/md/bcache/bset.h
-@@ -434,20 +434,26 @@ static inline bool bch_cut_back(const struct bkey *where, struct bkey *k)
+@@ -418,20 +418,26 @@ static inline bool bch_cut_back(const struct bkey *where, struct bkey *k)
return __bch_cut_back(where, k);
}
diff --git a/queue/bcache-only-set-BCACHE_DEV_WB_RUNNING-when-cached-de.patch b/queue/bcache-only-set-BCACHE_DEV_WB_RUNNING-when-cached-de.patch
index 5adbe6e..363096c 100644
--- a/queue/bcache-only-set-BCACHE_DEV_WB_RUNNING-when-cached-de.patch
+++ b/queue/bcache-only-set-BCACHE_DEV_WB_RUNNING-when-cached-de.patch
@@ -1,4 +1,4 @@
-From e4644e33827c4a3692f4ce2973a3e62e5f93b62e Mon Sep 17 00:00:00 2001
+From f98f036feabbec86cfda9c68f4c31dd39b5b4b65 Mon Sep 17 00:00:00 2001
From: Coly Li <colyli@suse.de>
Date: Mon, 10 Jun 2019 06:13:35 +0800
Subject: [PATCH] bcache: only set BCACHE_DEV_WB_RUNNING when cached device
@@ -35,6 +35,7 @@ Signed-off-by: Coly Li <colyli@suse.de>
Reviewed-by: Bjørn Forsman <bjorn.forsman@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/md/bcache/sysfs.c b/drivers/md/bcache/sysfs.c
index c591347150d6..22cfc976c12a 100644
diff --git a/queue/be2net-Fix-number-of-Rx-queues-used-for-flow-hashing.patch b/queue/be2net-Fix-number-of-Rx-queues-used-for-flow-hashing.patch
index 332122f..f106830 100644
--- a/queue/be2net-Fix-number-of-Rx-queues-used-for-flow-hashing.patch
+++ b/queue/be2net-Fix-number-of-Rx-queues-used-for-flow-hashing.patch
@@ -1,4 +1,4 @@
-From 718f4a2537089ea41903bf357071306163bc7c04 Mon Sep 17 00:00:00 2001
+From c4f3dd2115dd871661206529f2de0e3d6367251c Mon Sep 17 00:00:00 2001
From: Ivan Vecera <ivecera@redhat.com>
Date: Fri, 14 Jun 2019 17:48:36 +0200
Subject: [PATCH] be2net: Fix number of Rx queues used for flow hashing
@@ -54,12 +54,13 @@ Fixes: 594ad54a2c3b ("be2net: Add support for setting and getting rx flow hash o
Reported-by: Tianhao <tizhao@redhat.com>
Signed-off-by: Ivan Vecera <ivecera@redhat.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/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
-index 4c218341c51b..6e635debc7fd 100644
+index 7f7e206f95f8..81df0a850cf8 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
-@@ -1105,7 +1105,7 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
+@@ -1104,7 +1104,7 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
cmd->data = be_get_rss_hash_opts(adapter, cmd->flow_type);
break;
case ETHTOOL_GRXRINGS:
diff --git a/queue/blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch b/queue/blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch
index 3912d54..0297262 100644
--- a/queue/blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch
+++ b/queue/blk-mq-move-cancel-of-requeue_work-into-blk_mq_relea.patch
@@ -1,4 +1,4 @@
-From bbfb7da5337677ad594e2876b14d715ff2d53de3 Mon Sep 17 00:00:00 2001
+From aec7c12e99f767f0583d489d3862b25536afedb4 Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@redhat.com>
Date: Tue, 30 Apr 2019 09:52:24 +0800
Subject: [PATCH] blk-mq: move cancel of requeue_work into blk_mq_release
@@ -28,6 +28,7 @@ Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/block/blk-core.c b/block/blk-core.c
index 7d4bf916546c..fc41adedf2eb 100644
diff --git a/queue/block-bfq-increase-idling-for-weight-raised-queues.patch b/queue/block-bfq-increase-idling-for-weight-raised-queues.patch
index 5655f9a..3b9672e 100644
--- a/queue/block-bfq-increase-idling-for-weight-raised-queues.patch
+++ b/queue/block-bfq-increase-idling-for-weight-raised-queues.patch
@@ -1,4 +1,4 @@
-From 778c02a236a8728bb992de10ed1f12c0be5b7b0e Mon Sep 17 00:00:00 2001
+From c12997a896c4eacc618666e9a028df6379f6fd8e Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@linaro.org>
Date: Tue, 12 Mar 2019 09:59:27 +0100
Subject: [PATCH] block, bfq: increase idling for weight-raised queues
@@ -43,12 +43,13 @@ Tested-by: Holger Hoffstätte <holger@applied-asynchrony.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
-index fac188dd78fa..f30d1cb887d4 100644
+index 63d3765f22f0..1570a705992b 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
-@@ -2545,6 +2545,8 @@ static void bfq_arm_slice_timer(struct bfq_data *bfqd)
+@@ -2454,6 +2454,8 @@ static void bfq_arm_slice_timer(struct bfq_data *bfqd)
if (BFQQ_SEEKY(bfqq) && bfqq->wr_coeff == 1 &&
bfq_symmetric_scenario(bfqd))
sl = min_t(u64, sl, BFQ_MIN_TT);
diff --git a/queue/bpf-fix-undefined-behavior-in-narrow-load-handling.patch b/queue/bpf-fix-undefined-behavior-in-narrow-load-handling.patch
index 4b934f9..1a258a0 100644
--- a/queue/bpf-fix-undefined-behavior-in-narrow-load-handling.patch
+++ b/queue/bpf-fix-undefined-behavior-in-narrow-load-handling.patch
@@ -1,4 +1,4 @@
-From e2f7fc0ac6957cabff4cecf6c721979b571af208 Mon Sep 17 00:00:00 2001
+From c4b19cc84dce146bd780991b0ab6fb8d2d0f2c51 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Wed, 8 May 2019 18:08:58 +0200
Subject: [PATCH] bpf: fix undefined behavior in narrow load handling
@@ -33,12 +33,13 @@ Reviewed-by: Iago López Galeiras <iago@kinvolk.io>
Signed-off-by: Krzesimir Nowak <krzesimir@kinvolk.io>
Cc: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index 7b05e8938d5c..95f9354495ad 100644
+index 5680b82e6ea0..4d633ff5f546 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
-@@ -7599,7 +7599,7 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)
+@@ -5542,7 +5542,7 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)
insn->dst_reg,
shift);
insn_buf[cnt++] = BPF_ALU64_IMM(BPF_AND, insn->dst_reg,
diff --git a/queue/cgroup-Use-css_tryget-instead-of-css_tryget_online-i.patch b/queue/cgroup-Use-css_tryget-instead-of-css_tryget_online-i.patch
index 130f4b7..f2fb6b8 100644
--- a/queue/cgroup-Use-css_tryget-instead-of-css_tryget_online-i.patch
+++ b/queue/cgroup-Use-css_tryget-instead-of-css_tryget_online-i.patch
@@ -1,4 +1,4 @@
-From 18fa84a2db0e15b02baa5d94bdb5bd509175d2f6 Mon Sep 17 00:00:00 2001
+From 40b97c0c4c522650e62ff39fa0dce532ced858b5 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 29 May 2019 13:46:25 -0700
Subject: [PATCH] cgroup: Use css_tryget() instead of css_tryget_online() in
@@ -53,12 +53,13 @@ affected by this change.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org # v4.2+
Fixes: ec438699a9ae ("cgroup, block: implement task_get_css() and use it in bio_associate_current()")
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
-index c0077adeea83..a7e4611e20c8 100644
+index 2fa307575dec..f127d6d6b78d 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
-@@ -487,7 +487,7 @@ static inline struct cgroup_subsys_state *task_css(struct task_struct *task,
+@@ -485,7 +485,7 @@ static inline struct cgroup_subsys_state *task_css(struct task_struct *task,
*
* Find the css for the (@task, @subsys_id) combination, increment a
* reference on and return it. This function is guaranteed to return a
@@ -67,7 +68,7 @@ index c0077adeea83..a7e4611e20c8 100644
*/
static inline struct cgroup_subsys_state *
task_get_css(struct task_struct *task, int subsys_id)
-@@ -497,7 +497,13 @@ task_get_css(struct task_struct *task, int subsys_id)
+@@ -495,7 +495,13 @@ task_get_css(struct task_struct *task, int subsys_id)
rcu_read_lock();
while (true) {
css = task_css(task, subsys_id);
diff --git a/queue/clk-rockchip-Turn-on-aclk_dmac1-for-suspend-on-rk328.patch b/queue/clk-rockchip-Turn-on-aclk_dmac1-for-suspend-on-rk328.patch
index 86037ac..827d191 100644
--- a/queue/clk-rockchip-Turn-on-aclk_dmac1-for-suspend-on-rk328.patch
+++ b/queue/clk-rockchip-Turn-on-aclk_dmac1-for-suspend-on-rk328.patch
@@ -1,4 +1,4 @@
-From 57a20248ef3e429dc822f0774bc4e00136c46c83 Mon Sep 17 00:00:00 2001
+From 9946040706f00319582d45e2f45869d44da0d08b Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Thu, 11 Apr 2019 16:21:53 -0700
Subject: [PATCH] clk: rockchip: Turn on "aclk_dmac1" for suspend on rk3288
@@ -50,12 +50,13 @@ but any of the other options would presumably also work fine.
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 961d4ee86b75..e8b5a6bfcc8a 100644
+index 64191694ff6e..9cfdbea493bb 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
-@@ -861,6 +861,9 @@ static const int rk3288_saved_cru_reg_ids[] = {
+@@ -835,6 +835,9 @@ static const int rk3288_saved_cru_reg_ids[] = {
RK3288_CLKSEL_CON(10),
RK3288_CLKSEL_CON(33),
RK3288_CLKSEL_CON(37),
@@ -65,7 +66,7 @@ index 961d4ee86b75..e8b5a6bfcc8a 100644
};
static u32 rk3288_saved_cru_regs[ARRAY_SIZE(rk3288_saved_cru_reg_ids)];
-@@ -877,6 +880,14 @@ static int rk3288_clk_suspend(void)
+@@ -851,6 +854,14 @@ static int rk3288_clk_suspend(void)
}
/*
diff --git a/queue/clk-ti-clkctrl-Fix-clkdm_clk-handling.patch b/queue/clk-ti-clkctrl-Fix-clkdm_clk-handling.patch
index d2681f9..d182578 100644
--- a/queue/clk-ti-clkctrl-Fix-clkdm_clk-handling.patch
+++ b/queue/clk-ti-clkctrl-Fix-clkdm_clk-handling.patch
@@ -1,4 +1,4 @@
-From 1cc54078d104f5b4d7e9f8d55362efa5a8daffdb Mon Sep 17 00:00:00 2001
+From 9f8bfdcde8d9116210d97454c56513dd8400bcc5 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 6 May 2019 14:08:54 -0700
Subject: [PATCH] clk: ti: clkctrl: Fix clkdm_clk handling
@@ -13,9 +13,10 @@ probed with the legacy "ti,hwmods" devicetree property.
Fixes: 88a172526c32 ("clk: ti: add support for clkctrl clocks")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
-index 96d65a1cf7be..8e834317c97d 100644
+index 421b05392220..ca3218337fd7 100644
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -137,9 +137,6 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
diff --git a/queue/configfs-Fix-use-after-free-when-accessing-sd-s_dent.patch b/queue/configfs-Fix-use-after-free-when-accessing-sd-s_dent.patch
index d642313..0215262 100644
--- a/queue/configfs-Fix-use-after-free-when-accessing-sd-s_dent.patch
+++ b/queue/configfs-Fix-use-after-free-when-accessing-sd-s_dent.patch
@@ -1,4 +1,4 @@
-From f6122ed2a4f9c9c1c073ddf6308d1b2ac10e0781 Mon Sep 17 00:00:00 2001
+From 604f743c90b4d6a04568160ba683b520d78c60da Mon Sep 17 00:00:00 2001
From: Sahitya Tummala <stummala@codeaurora.org>
Date: Thu, 3 Jan 2019 16:48:15 +0530
Subject: [PATCH] configfs: Fix use-after-free when accessing sd->s_dentry
@@ -22,9 +22,10 @@ sh fs_racer_file_list.sh /config
Fixes: 76ae281f6307 ('configfs: fix race between dentry put and lookup')
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
-index 5e7932d668ab..22203a3423a3 100644
+index 920d350df37b..809c1edffbaf 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -58,15 +58,13 @@ static void configfs_d_iput(struct dentry * dentry,
diff --git a/queue/configfs-fix-possible-use-after-free-in-configfs_reg.patch b/queue/configfs-fix-possible-use-after-free-in-configfs_reg.patch
index 6e086c3..14b3fa9 100644
--- a/queue/configfs-fix-possible-use-after-free-in-configfs_reg.patch
+++ b/queue/configfs-fix-possible-use-after-free-in-configfs_reg.patch
@@ -1,4 +1,4 @@
-From 35399f87e271f7cf3048eab00a421a6519ac8441 Mon Sep 17 00:00:00 2001
+From 24aeda6fdcbc9245df6d3c14ca111c42bbc7fb3c Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Sun, 5 May 2019 11:03:12 +0800
Subject: [PATCH] configfs: fix possible use-after-free in
@@ -97,6 +97,7 @@ Fixes: 5cf6a51e6062 ("configfs: allow dynamic group creation")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 39843fa7e11b..920d350df37b 100644
diff --git a/queue/coredump-fix-race-condition-between-collapse_huge_pa.patch b/queue/coredump-fix-race-condition-between-collapse_huge_pa.patch
index be3dad2..1892dbc 100644
--- a/queue/coredump-fix-race-condition-between-collapse_huge_pa.patch
+++ b/queue/coredump-fix-race-condition-between-collapse_huge_pa.patch
@@ -1,4 +1,4 @@
-From 59ea6d06cfa9247b586a695c21f94afa7183af74 Mon Sep 17 00:00:00 2001
+From ab6b57d15b1d378d63878ab758ae5a5e3cab5923 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Thu, 13 Jun 2019 15:56:11 -0700
Subject: [PATCH] coredump: fix race condition between collapse_huge_page() and
@@ -62,9 +62,10 @@ Cc: Jason Gunthorpe <jgg@mellanox.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
-index a3fda9f024c3..4a7944078cc3 100644
+index 32c40b2d09d9..1a83cc6ea4af 100644
--- a/include/linux/sched/mm.h
+++ b/include/linux/sched/mm.h
@@ -54,6 +54,10 @@ static inline void mmdrop(struct mm_struct *mm)
@@ -79,7 +80,7 @@ index a3fda9f024c3..4a7944078cc3 100644
* that can modify the "mm" (notably the vm_start/end) under mmap_sem
* for reading and outside the context of the process, so it is also
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
-index a335f7c1fac4..0f7419938008 100644
+index ca9d0f06da8c..0d9dd279ac0e 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1004,6 +1004,9 @@ static void collapse_huge_page(struct mm_struct *mm,
diff --git a/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch b/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch
index 9e38c7a..d97a867 100644
--- a/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch
+++ b/queue/dmaengine-idma64-Use-actual-device-for-DMA-transfers.patch
@@ -1,4 +1,4 @@
-From d411cf2cae99be16579c61cfca69029192a86aac Mon Sep 17 00:00:00 2001
+From c3306b21803ce0c9c282df80a8831f9e8657284f Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 18 Mar 2019 18:39:30 +0300
Subject: [PATCH] dmaengine: idma64: Use actual device for DMA transfers
@@ -24,6 +24,7 @@ Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [for tty parts]
Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
index e5c911200bdb..231e77535766 100644
diff --git a/queue/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch b/queue/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch
index f60dd17..af60660 100644
--- a/queue/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch
+++ b/queue/drivers-thermal-tsens-Don-t-print-error-message-on-E.patch
@@ -1,4 +1,4 @@
-From 37148c5d2d13274a0f3ce3bac9b2fc4603123852 Mon Sep 17 00:00:00 2001
+From 928de09220f6c9ef30c942825c994e85db3ee9ef Mon Sep 17 00:00:00 2001
From: Amit Kucheria <amit.kucheria@linaro.org>
Date: Wed, 20 Mar 2019 18:47:52 +0530
Subject: [PATCH] drivers: thermal: tsens: Don't print error message on
@@ -18,6 +18,7 @@ nvmem/qfprom device is available. Don't print this message on a
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 3440166c2ae9..d8c1286bd4cc 100644
diff --git a/queue/drm-amd-display-Use-plane-color_space-for-dpp-if-spe.patch b/queue/drm-amd-display-Use-plane-color_space-for-dpp-if-spe.patch
index b390b63..0684e64 100644
--- a/queue/drm-amd-display-Use-plane-color_space-for-dpp-if-spe.patch
+++ b/queue/drm-amd-display-Use-plane-color_space-for-dpp-if-spe.patch
@@ -1,4 +1,4 @@
-From a1e07ba89d49581471d64c48152dbe03b42bd025 Mon Sep 17 00:00:00 2001
+From 6b178a1cc499263a31118dbf3002bf016de97340 Mon Sep 17 00:00:00 2001
From: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Date: Thu, 14 Mar 2019 13:46:44 -0400
Subject: [PATCH] drm/amd/display: Use plane->color_space for dpp if specified
@@ -23,12 +23,13 @@ Reviewed-by: Sun peng Li <Sunpeng.Li@amd.com>
Acked-by: Aric Cyr <Aric.Cyr@amd.com>
Acked-by: Leo Li <sunpeng.li@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.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
-index f91e4b49d211..6f4b24756323 100644
+index c69fa4bfab0a..41bc4f3b070f 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
-@@ -385,6 +385,10 @@ void dpp1_cnv_setup (
+@@ -388,6 +388,10 @@ void dpp1_cnv_setup (
default:
break;
}
@@ -39,7 +40,7 @@ index f91e4b49d211..6f4b24756323 100644
REG_SET(CNVC_SURFACE_PIXEL_FORMAT, 0,
CNVC_SURFACE_PIXEL_FORMAT, pixel_format);
REG_UPDATE(FORMAT_CONTROL, FORMAT_CONTROL__ALPHA_EN, alpha_en);
-@@ -396,7 +400,7 @@ void dpp1_cnv_setup (
+@@ -399,7 +403,7 @@ void dpp1_cnv_setup (
for (i = 0; i < 12; i++)
tbl_entry.regval[i] = input_csc_color_matrix.matrix[i];
@@ -49,10 +50,10 @@ index f91e4b49d211..6f4b24756323 100644
if (color_space >= COLOR_SPACE_YCBCR601)
select = INPUT_CSC_SELECT_ICSC;
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
-index 4969fa5e6f1d..976812ae4ede 100644
+index a3a91f428da9..4734c286725f 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
-@@ -1949,7 +1949,7 @@ static void update_dpp(struct dpp *dpp, struct dc_plane_state *plane_state)
+@@ -1847,7 +1847,7 @@ static void update_dpp(struct dpp *dpp, struct dc_plane_state *plane_state)
plane_state->format,
EXPANSION_MODE_ZERO,
plane_state->input_csc_color_matrix,
diff --git a/queue/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch b/queue/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch
index 4c70922..a184b87 100644
--- a/queue/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch
+++ b/queue/drm-bridge-adv7511-Fix-low-refresh-rate-selection.patch
@@ -1,4 +1,4 @@
-From 67793bd3b3948dc8c8384b6430e036a30a0ecb43 Mon Sep 17 00:00:00 2001
+From 468f4f374b441eb362f7e68179fc59f236ab0222 Mon Sep 17 00:00:00 2001
From: Matt Redfearn <matt.redfearn@thinci.com>
Date: Wed, 24 Apr 2019 13:22:27 +0000
Subject: [PATCH] drm/bridge: adv7511: Fix low refresh rate selection
@@ -20,12 +20,13 @@ Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Matt Redfearn <matt.redfearn@thinci.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190424132210.26338-1-matt.redfearn@thinci.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
-index ec2ca71e1323..c532e9c9e491 100644
+index dd3ff2f2cdce..c3a0754d35b7 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
-@@ -748,11 +748,11 @@ static void adv7511_mode_set(struct adv7511 *adv7511,
+@@ -747,11 +747,11 @@ static void adv7511_mode_set(struct adv7511 *adv7511,
vsync_polarity = 1;
}
diff --git a/queue/drm-edid-abstract-override-firmware-EDID-retrieval.patch b/queue/drm-edid-abstract-override-firmware-EDID-retrieval.patch
index d1443a7..211209a 100644
--- a/queue/drm-edid-abstract-override-firmware-EDID-retrieval.patch
+++ b/queue/drm-edid-abstract-override-firmware-EDID-retrieval.patch
@@ -1,4 +1,4 @@
-From 56a2b7f2a39a8d4b16a628e113decde3d7400879 Mon Sep 17 00:00:00 2001
+From 2885ed4abfb866f9490781b457153b158467a948 Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@intel.com>
Date: Fri, 7 Jun 2019 14:05:12 +0300
Subject: [PATCH] drm/edid: abstract override/firmware EDID retrieval
@@ -14,12 +14,13 @@ Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Tested-by: Tested-by: Paul Wise <pabs3@bonedaddy.net>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190607110513.12072-1-jani.nikula@intel.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
-index 649cfd8b4200..c1952b6e5747 100644
+index 52a37b774ac0..af9f21df28ba 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
-@@ -1570,6 +1570,20 @@ static void connector_bad_edid(struct drm_connector *connector,
+@@ -1580,6 +1580,20 @@ static void connector_bad_edid(struct drm_connector *connector,
}
}
@@ -40,7 +41,7 @@ index 649cfd8b4200..c1952b6e5747 100644
/**
* drm_do_get_edid - get EDID data using a custom EDID block read function
* @connector: connector we're probing
-@@ -1597,15 +1611,10 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
+@@ -1607,15 +1621,10 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
{
int i, j = 0, valid_extensions = 0;
u8 *edid, *new;
diff --git a/queue/drm-etnaviv-lock-MMU-while-dumping-core.patch b/queue/drm-etnaviv-lock-MMU-while-dumping-core.patch
index cf3d9db..30e3c54 100644
--- a/queue/drm-etnaviv-lock-MMU-while-dumping-core.patch
+++ b/queue/drm-etnaviv-lock-MMU-while-dumping-core.patch
@@ -1,4 +1,4 @@
-From 1396500d673bd027683a0609ff84dca7eb6ea2e7 Mon Sep 17 00:00:00 2001
+From b693b13dd6b154d1e2857b9a34892e2522e75c81 Mon Sep 17 00:00:00 2001
From: Lucas Stach <l.stach@pengutronix.de>
Date: Tue, 21 May 2019 14:53:40 +0200
Subject: [PATCH] drm/etnaviv: lock MMU while dumping core
@@ -15,12 +15,13 @@ Reported-by: David Jander <david@protonic.nl>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: David Jander <david@protonic.nl>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_dump.c b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
-index 33854c94cb85..515515ef24f9 100644
+index 9146e30e24a6..468dff2f7904 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_dump.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_dump.c
-@@ -125,6 +125,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
+@@ -124,6 +124,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
return;
etnaviv_dump_core = false;
@@ -29,7 +30,7 @@ index 33854c94cb85..515515ef24f9 100644
mmu_size = etnaviv_iommu_dump_size(gpu->mmu);
/* We always dump registers, mmu, ring and end marker */
-@@ -167,6 +169,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
+@@ -166,6 +168,7 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
iter.start = __vmalloc(file_size, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,
PAGE_KERNEL);
if (!iter.start) {
@@ -37,7 +38,7 @@ index 33854c94cb85..515515ef24f9 100644
dev_warn(gpu->dev, "failed to allocate devcoredump file\n");
return;
}
-@@ -234,6 +237,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
+@@ -233,6 +236,8 @@ void etnaviv_core_dump(struct etnaviv_gpu *gpu)
obj->base.size);
}
diff --git a/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch b/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch
index e98f6fe..9397571 100644
--- a/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch
+++ b/queue/drm-i915-sdvo-Implement-proper-HDMI-audio-support-fo.patch
@@ -1,4 +1,4 @@
-From 7fdf6ceb176cbab9e48383128f69e01f8b26a117 Mon Sep 17 00:00:00 2001
+From 30d0d8d235e643876f46a408c5195a480b76d458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
Date: Tue, 9 Apr 2019 17:40:49 +0300
Subject: [PATCH] drm/i915/sdvo: Implement proper HDMI audio support for SDVO
@@ -48,6 +48,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20190409144054.24561-3-ville
Reviewed-by: Imre Deak <imre.deak@intel.com>
(cherry picked from commit dc49a56bd43bb04982e64b44436831da801d0237)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 26975df4e593..addc0df08380 100644
diff --git a/queue/drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch b/queue/drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch
index f3e6729..10eae6c 100644
--- a/queue/drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch
+++ b/queue/drm-nouveau-disp-dp-respect-sink-limits-when-selecti.patch
@@ -1,4 +1,4 @@
-From 13d03e9daf70dab032c03dc172e75bb98ad899c4 Mon Sep 17 00:00:00 2001
+From d03e27694a68b6cad9d199ae7392384f31dbd31d Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 10 May 2019 11:57:04 +1000
Subject: [PATCH] drm/nouveau/disp/dp: respect sink limits when selecting
@@ -14,12 +14,13 @@ This prevents "link rate unsupported by sink" messages when link training
fails.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
-index 5f301e632599..818d21bd28d3 100644
+index 6160a6158cf2..5e51a5c1eb01 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c
-@@ -365,8 +365,15 @@ nvkm_dp_train(struct nvkm_dp *dp, u32 dataKBps)
+@@ -364,8 +364,15 @@ nvkm_dp_train(struct nvkm_dp *dp, u32 dataKBps)
* and it's better to have a failed modeset than that.
*/
for (cfg = nvkm_dp_rates; cfg->rate; cfg++) {
diff --git a/queue/drm-nouveau-kms-gf119-gp10x-push-HeadSetControlOutpu.patch b/queue/drm-nouveau-kms-gf119-gp10x-push-HeadSetControlOutpu.patch
index 65e30e5..61f97d1 100644
--- a/queue/drm-nouveau-kms-gf119-gp10x-push-HeadSetControlOutpu.patch
+++ b/queue/drm-nouveau-kms-gf119-gp10x-push-HeadSetControlOutpu.patch
@@ -1,4 +1,4 @@
-From a0b694d0af21c9993d1a39a75fd814bd48bf7eb4 Mon Sep 17 00:00:00 2001
+From df66654da4f647632dfeedd343e0fdf92cf881b4 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 8 May 2019 14:54:34 +1000
Subject: [PATCH] drm/nouveau/kms/gf119-gp10x: push
@@ -17,9 +17,10 @@ hanging the core update.
Reported-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c
-index 2e7a0c347ddb..8efb778a3b20 100644
+index 4f57e5379796..d81a99bb2ac3 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/head.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head.c
@@ -306,7 +306,7 @@ nv50_head_atomic_check(struct drm_crtc *crtc, struct drm_crtc_state *state)
diff --git a/queue/drm-nouveau-kms-gv100-fix-spurious-window-immediate-.patch b/queue/drm-nouveau-kms-gv100-fix-spurious-window-immediate-.patch
index 2df911c..24c01a5 100644
--- a/queue/drm-nouveau-kms-gv100-fix-spurious-window-immediate-.patch
+++ b/queue/drm-nouveau-kms-gv100-fix-spurious-window-immediate-.patch
@@ -1,4 +1,4 @@
-From d2434e4d942c32cadcbdbcd32c58f35098f3b604 Mon Sep 17 00:00:00 2001
+From bf66f03d2c198e1c88bdf2fce74cb68b9d5ef5b8 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 3 May 2019 12:23:55 +1000
Subject: [PATCH] drm/nouveau/kms/gv100-: fix spurious window immediate
@@ -14,9 +14,10 @@ Fixes suspend/resume on (at least) Quadro RTX4000 (TU104).
Reported-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h
-index 2216c58620c2..7c41b0599d1a 100644
+index e48c5eb35b49..66c125a6b0b3 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h
@@ -41,6 +41,7 @@ struct nv50_disp_interlock {
@@ -40,10 +41,10 @@ index 9103b8494279..f7dbd965e4e7 100644
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
-index b95181027b31..471a39a077e5 100644
+index c5a9bc1af5af..47ad1649eed1 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
-@@ -149,7 +149,7 @@ nv50_wndw_flush_set(struct nv50_wndw *wndw, u32 *interlock,
+@@ -151,7 +151,7 @@ nv50_wndw_flush_set(struct nv50_wndw *wndw, u32 *interlock,
if (asyw->set.point) {
if (asyw->set.point = false, asyw->set.mask)
interlock[wndw->interlock.type] |= wndw->interlock.data;
diff --git a/queue/drm-pl111-Initialize-clock-spinlock-early.patch b/queue/drm-pl111-Initialize-clock-spinlock-early.patch
index 3ef91a2..8db9fca 100644
--- a/queue/drm-pl111-Initialize-clock-spinlock-early.patch
+++ b/queue/drm-pl111-Initialize-clock-spinlock-early.patch
@@ -1,4 +1,4 @@
-From 3e01ae2612bdd7975c74ec7123d7f8f5e6eed795 Mon Sep 17 00:00:00 2001
+From ee8460ee028cab30f7430289811c6e62810527e2 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Mon, 13 May 2019 07:46:21 -0700
Subject: [PATCH] drm/pl111: Initialize clock spinlock early
@@ -33,12 +33,13 @@ Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/1557758781-23586-1-git-send-email-linux@roeck-us.net
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/pl111/pl111_display.c b/drivers/gpu/drm/pl111/pl111_display.c
-index 0c5d391f0a8f..4501597f30ab 100644
+index 19b0d006a54a..52db5ba6a5ca 100644
--- a/drivers/gpu/drm/pl111/pl111_display.c
+++ b/drivers/gpu/drm/pl111/pl111_display.c
-@@ -531,14 +531,15 @@ pl111_init_clock_divider(struct drm_device *drm)
+@@ -495,14 +495,15 @@ pl111_init_clock_divider(struct drm_device *drm)
dev_err(drm->dev, "CLCD: unable to get clcdclk.\n");
return PTR_ERR(parent);
}
diff --git a/queue/drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_set_shade.patch b/queue/drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_set_shade.patch
index adcb9f0..6e50d6d 100644
--- a/queue/drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_set_shade.patch
+++ b/queue/drm-vmwgfx-integer-underflow-in-vmw_cmd_dx_set_shade.patch
@@ -1,4 +1,4 @@
-From 895dde5fe0ccb577ac75b7bb680a7bd78e79b324 Mon Sep 17 00:00:00 2001
+From 8d455b2c076721edc24f5893e28b2794947308ad Mon Sep 17 00:00:00 2001
From: Murray McAllister <murray.mcallister@gmail.com>
Date: Mon, 20 May 2019 21:57:34 +1200
Subject: [PATCH] drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader()
@@ -17,6 +17,7 @@ Fixes: d80efd5cb3de ("drm/vmwgfx: Initial DX support")
Signed-off-by: Murray McAllister <murray.mcallister@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index e1bc966c9244..8f62f90c8a7a 100644
diff --git a/queue/f2fs-fix-to-avoid-accessing-xattr-across-the-boundar.patch b/queue/f2fs-fix-to-avoid-accessing-xattr-across-the-boundar.patch
index 29a3836..a080817 100644
--- a/queue/f2fs-fix-to-avoid-accessing-xattr-across-the-boundar.patch
+++ b/queue/f2fs-fix-to-avoid-accessing-xattr-across-the-boundar.patch
@@ -1,4 +1,4 @@
-From 2777e654371dd4207a3a7f4fb5fa39550053a080 Mon Sep 17 00:00:00 2001
+From 73458cbb9a625952538f52f24fb71e2ee5d9bb55 Mon Sep 17 00:00:00 2001
From: Randall Huang <huangrandall@google.com>
Date: Thu, 11 Apr 2019 16:26:46 +0800
Subject: [PATCH] f2fs: fix to avoid accessing xattr across the boundary
@@ -40,12 +40,13 @@ Signed-off-by: Randall Huang <huangrandall@google.com>
[Jaegeuk Kim: Fix wrong ending boundary]
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
-index 848a785abe25..e791741d193b 100644
+index ffef7eed503d..7544b0afbd20 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
-@@ -202,12 +202,17 @@ static inline const struct xattr_handler *f2fs_xattr_handler(int index)
+@@ -201,12 +201,17 @@ static inline const struct xattr_handler *f2fs_xattr_handler(int index)
return handler;
}
@@ -65,7 +66,7 @@ index 848a785abe25..e791741d193b 100644
if (entry->e_name_index != index)
continue;
if (entry->e_name_len != len)
-@@ -297,20 +302,22 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage,
+@@ -296,20 +301,22 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage,
const char *name, struct f2fs_xattr_entry **xe,
void **base_addr, int *base_size)
{
@@ -92,7 +93,7 @@ index 848a785abe25..e791741d193b 100644
/* read from inline xattr */
if (inline_size) {
err = read_inline_xattr(inode, ipage, txattr_addr);
-@@ -337,7 +344,11 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage,
+@@ -336,7 +343,11 @@ static int lookup_all_xattrs(struct inode *inode, struct page *ipage,
else
cur_addr = txattr_addr;
@@ -105,7 +106,7 @@ index 848a785abe25..e791741d193b 100644
check:
if (IS_XATTR_LAST_ENTRY(*xe)) {
err = -ENODATA;
-@@ -581,7 +592,8 @@ static int __f2fs_setxattr(struct inode *inode, int index,
+@@ -580,7 +591,8 @@ static int __f2fs_setxattr(struct inode *inode, int index,
struct page *ipage, int flags)
{
struct f2fs_xattr_entry *here, *last;
@@ -115,7 +116,7 @@ index 848a785abe25..e791741d193b 100644
int found, newsize;
size_t len;
__u32 new_hsize;
-@@ -605,8 +617,14 @@ static int __f2fs_setxattr(struct inode *inode, int index,
+@@ -604,8 +616,14 @@ static int __f2fs_setxattr(struct inode *inode, int index,
if (error)
return error;
@@ -132,10 +133,10 @@ index 848a785abe25..e791741d193b 100644
found = IS_XATTR_LAST_ENTRY(here) ? 0 : 1;
diff --git a/fs/f2fs/xattr.h b/fs/f2fs/xattr.h
-index 9172ee082ca8..a90920e2f949 100644
+index dbcd1d16e669..2a4ecaf338ea 100644
--- a/fs/f2fs/xattr.h
+++ b/fs/f2fs/xattr.h
-@@ -71,6 +71,8 @@ struct f2fs_xattr_entry {
+@@ -74,6 +74,8 @@ struct f2fs_xattr_entry {
entry = XATTR_NEXT_ENTRY(entry))
#define VALID_XATTR_BLOCK_SIZE (PAGE_SIZE - sizeof(struct node_footer))
#define XATTR_PADDING_SIZE (sizeof(__u32))
diff --git a/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch b/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch
index 3e76b41..f377e20 100644
--- a/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch
+++ b/queue/f2fs-fix-to-avoid-panic-in-do_recover_data.patch
@@ -1,4 +1,4 @@
-From a815c20f7831577ecc11e48537136985fca11c87 Mon Sep 17 00:00:00 2001
+From 64b7c3856933bc1e2c4b7e485cd87075c152fb81 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:28:37 +0800
Subject: [PATCH] f2fs: fix to avoid panic in do_recover_data()
@@ -47,6 +47,7 @@ instead of making kernel panic.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 35140029f67f..9ea8b337759e 100644
diff --git a/queue/f2fs-fix-to-avoid-panic-in-f2fs_inplace_write_data.patch b/queue/f2fs-fix-to-avoid-panic-in-f2fs_inplace_write_data.patch
index 44775b5..c0f7c6e 100644
--- a/queue/f2fs-fix-to-avoid-panic-in-f2fs_inplace_write_data.patch
+++ b/queue/f2fs-fix-to-avoid-panic-in-f2fs_inplace_write_data.patch
@@ -1,4 +1,4 @@
-From 05573d6ccf702df549a7bdeabef31e4753df1a90 Mon Sep 17 00:00:00 2001
+From 8f47af9b89b509e4cf1d4bd3683cd3479475b6d1 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:30:52 +0800
Subject: [PATCH] f2fs: fix to avoid panic in f2fs_inplace_write_data()
@@ -52,12 +52,13 @@ give a hint to fsck for latter repairing.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
-index a3380d1de600..d3bf7a2abbc9 100644
+index 011339e59c7f..767c21225994 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
-@@ -3184,13 +3184,18 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)
+@@ -2885,13 +2885,18 @@ int f2fs_inplace_write_data(struct f2fs_io_info *fio)
{
int err;
struct f2fs_sb_info *sbi = fio->sbi;
diff --git a/queue/f2fs-fix-to-avoid-panic-in-f2fs_remove_inode_page.patch b/queue/f2fs-fix-to-avoid-panic-in-f2fs_remove_inode_page.patch
index 5b71eb0..c7b43b2 100644
--- a/queue/f2fs-fix-to-avoid-panic-in-f2fs_remove_inode_page.patch
+++ b/queue/f2fs-fix-to-avoid-panic-in-f2fs_remove_inode_page.patch
@@ -1,4 +1,4 @@
-From 05d8e232539ef516498c1a6d7fe8507568d3a872 Mon Sep 17 00:00:00 2001
+From 14fa4f6a6d08e429f16375cebc07c01e7da33e01 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:28:34 +0800
Subject: [PATCH] f2fs: fix to avoid panic in f2fs_remove_inode_page()
@@ -47,6 +47,7 @@ give a hint to fsck for latter repairing of potential image corruption.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
[Jaegeuk Kim: fix build warning and add unlikely]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index ec22e7c5b37e..1417782bab00 100644
diff --git a/queue/f2fs-fix-to-clear-dirty-inode-in-error-path-of-f2fs_.patch b/queue/f2fs-fix-to-clear-dirty-inode-in-error-path-of-f2fs_.patch
index 3bb44ff..f949b6f 100644
--- a/queue/f2fs-fix-to-clear-dirty-inode-in-error-path-of-f2fs_.patch
+++ b/queue/f2fs-fix-to-clear-dirty-inode-in-error-path-of-f2fs_.patch
@@ -1,4 +1,4 @@
-From 546d22f070d64a7b96f57c93333772085d3a5e6d Mon Sep 17 00:00:00 2001
+From 28621405eff6fad5876bce3cac0b957734320d3e Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:28:33 +0800
Subject: [PATCH] f2fs: fix to clear dirty inode in error path of f2fs_iget()
@@ -47,12 +47,13 @@ Let's clear dirty inode in error path of f2fs_iget() to avoid panic.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
-index e7f2e8759315..4edd6f2bb491 100644
+index 4a2e75bce36a..b420db25b72f 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
-@@ -488,6 +488,7 @@ make_now:
+@@ -388,6 +388,7 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
return inode;
bad_inode:
diff --git a/queue/f2fs-fix-to-do-sanity-check-on-free-nid.patch b/queue/f2fs-fix-to-do-sanity-check-on-free-nid.patch
index ec7afcb..8172190 100644
--- a/queue/f2fs-fix-to-do-sanity-check-on-free-nid.patch
+++ b/queue/f2fs-fix-to-do-sanity-check-on-free-nid.patch
@@ -1,4 +1,4 @@
-From 626bcf2b7ce87211dba565f2bfa7842ba5be5c1b Mon Sep 17 00:00:00 2001
+From 7c5501e6ea54d6f35e49cc56d145876290554584 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:28:36 +0800
Subject: [PATCH] f2fs: fix to do sanity check on free nid
@@ -53,12 +53,13 @@ To fix this issue, let's do nid boundary check during free nid loading.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
-index 5452a6e340da..e29d5f6735ae 100644
+index 1417782bab00..4611fd62174a 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
-@@ -2083,6 +2083,9 @@ static bool add_free_nid(struct f2fs_sb_info *sbi,
+@@ -1900,6 +1900,9 @@ static bool add_free_nid(struct f2fs_sb_info *sbi,
if (unlikely(nid == 0))
return false;
diff --git a/queue/f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch b/queue/f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch
index 13082e2..84278ec 100644
--- a/queue/f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch
+++ b/queue/f2fs-fix-to-do-sanity-check-on-valid-block-count-of-.patch
@@ -1,4 +1,4 @@
-From e95bcdb2fefa129f37bd9035af1d234ca92ee4ef Mon Sep 17 00:00:00 2001
+From 8237b6cb2277a86e99239c3fc265d409f7f78f00 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Mon, 15 Apr 2019 15:30:51 +0800
Subject: [PATCH] f2fs: fix to do sanity check on valid block count of segment
@@ -62,12 +62,13 @@ CONFIG_F2FS_CHECK_FS is enabled.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
-index 5c7ed0442d6e..6f48e0763279 100644
+index 38c549d77a80..5ad90a3af68a 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
-@@ -672,7 +672,6 @@ static inline void verify_block_addr(struct f2fs_io_info *fio, block_t blk_addr)
+@@ -663,7 +663,6 @@ static inline void verify_block_addr(struct f2fs_io_info *fio, block_t blk_addr)
static inline int check_block_count(struct f2fs_sb_info *sbi,
int segno, struct f2fs_sit_entry *raw_sit)
{
@@ -75,7 +76,7 @@ index 5c7ed0442d6e..6f48e0763279 100644
bool is_valid = test_bit_le(0, raw_sit->valid_map) ? true : false;
int valid_blocks = 0;
int cur_pos = 0, next_pos;
-@@ -699,7 +698,7 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,
+@@ -690,7 +689,7 @@ static inline int check_block_count(struct f2fs_sb_info *sbi,
set_sbi_flag(sbi, SBI_NEED_FSCK);
return -EINVAL;
}
diff --git a/queue/f2fs-fix-to-use-inline-space-only-if-inline_xattr-is.patch b/queue/f2fs-fix-to-use-inline-space-only-if-inline_xattr-is.patch
index 1cb94cb..ee991f7 100644
--- a/queue/f2fs-fix-to-use-inline-space-only-if-inline_xattr-is.patch
+++ b/queue/f2fs-fix-to-use-inline-space-only-if-inline_xattr-is.patch
@@ -1,4 +1,4 @@
-From 622927f3b8809206f6da54a6a7ed4df1a7770fce Mon Sep 17 00:00:00 2001
+From aa4fc33e2013f544225e3b9d01a2b1254ca89ff1 Mon Sep 17 00:00:00 2001
From: Chao Yu <yuchao0@huawei.com>
Date: Thu, 11 Apr 2019 11:48:10 +0800
Subject: [PATCH] f2fs: fix to use inline space only if inline_xattr is enable
@@ -31,12 +31,13 @@ to fix this iusse.
Fixes: 6afc662e68b5 ("f2fs: support flexible inline xattr size")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
-index 30acde08822e..d5478f94cd25 100644
+index 6020fab2f0c9..e341994a2916 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
-@@ -2570,7 +2570,9 @@ static inline void *inline_xattr_addr(struct inode *inode, struct page *page)
+@@ -2456,7 +2456,9 @@ static inline void *inline_xattr_addr(struct inode *inode, struct page *page)
static inline int inline_xattr_size(struct inode *inode)
{
diff --git a/queue/fs-fat-file.c-issue-flush-after-the-writeback-of-FAT.patch b/queue/fs-fat-file.c-issue-flush-after-the-writeback-of-FAT.patch
index 6d6ba2b..73ef919 100644
--- a/queue/fs-fat-file.c-issue-flush-after-the-writeback-of-FAT.patch
+++ b/queue/fs-fat-file.c-issue-flush-after-the-writeback-of-FAT.patch
@@ -1,4 +1,4 @@
-From bd8309de0d60838eef6fb575b0c4c7e95841cf73 Mon Sep 17 00:00:00 2001
+From 9794692e33102e5e52430c9621d5ed9c0305b054 Mon Sep 17 00:00:00 2001
From: Hou Tao <houtao1@huawei.com>
Date: Tue, 14 May 2019 15:44:32 -0700
Subject: [PATCH] fs/fat/file.c: issue flush after the writeback of FAT
@@ -19,12 +19,13 @@ Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/fat/file.c b/fs/fat/file.c
-index b3bed32946b1..0e3ed79fcc3f 100644
+index 4724cc9ad650..62581de09bf1 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
-@@ -193,12 +193,17 @@ static int fat_file_release(struct inode *inode, struct file *filp)
+@@ -160,12 +160,17 @@ static int fat_file_release(struct inode *inode, struct file *filp)
int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
{
struct inode *inode = filp->f_mapping->host;
diff --git a/queue/fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock.patch b/queue/fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock.patch
index e14ef60..87e7caa 100644
--- a/queue/fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock.patch
+++ b/queue/fs-ocfs2-fix-race-in-ocfs2_dentry_attach_lock.patch
@@ -1,4 +1,4 @@
-From be99ca2716972a712cde46092c54dee5e6192bf8 Mon Sep 17 00:00:00 2001
+From 5b870b72cc0d3573b8b852c7358f70c325070190 Mon Sep 17 00:00:00 2001
From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Thu, 13 Jun 2019 15:56:01 -0700
Subject: [PATCH] fs/ocfs2: fix race in ocfs2_dentry_attach_lock()
@@ -66,12 +66,13 @@ Cc: Jun Piao <piaojun@huawei.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/ocfs2/dcache.c b/fs/ocfs2/dcache.c
-index 2d016937fdda..42a61eecdacd 100644
+index 290373024d9d..e8ace3b54e9c 100644
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
-@@ -296,6 +296,18 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry,
+@@ -310,6 +310,18 @@ int ocfs2_dentry_attach_lock(struct dentry *dentry,
out_attach:
spin_lock(&dentry_attach_lock);
diff --git a/queue/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch b/queue/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch
index 09cf8da..f2a39f5 100644
--- a/queue/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch
+++ b/queue/fuse-retrieve-cap-requested-size-to-negotiated-max_w.patch
@@ -1,4 +1,4 @@
-From 7640682e67b33cab8628729afec8ca92b851394f Mon Sep 17 00:00:00 2001
+From ba13ccf72629ca5103ae0df841465ed47e70d090 Mon Sep 17 00:00:00 2001
From: Kirill Smelkov <kirr@nexedi.com>
Date: Wed, 27 Mar 2019 10:15:19 +0000
Subject: [PATCH] fuse: retrieve: cap requested size to negotiated max_write
@@ -43,12 +43,13 @@ Signed-off-by: Kirill Smelkov <kirr@nexedi.com>
Cc: Han-Wen Nienhuys <hanwen@google.com>
Cc: Jakob Unterwurzacher <jakobunt@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 2d65a00740ad..ea8237513dfa 100644
+index 86dfc9e5e45f..0af74f8f58e0 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
-@@ -1749,7 +1749,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
+@@ -1677,7 +1677,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode,
offset = outarg->offset & ~PAGE_MASK;
file_size = i_size_read(inode);
diff --git a/queue/gpio-fix-gpio-adp5588-build-errors.patch b/queue/gpio-fix-gpio-adp5588-build-errors.patch
index 212a67d..0bdd162 100644
--- a/queue/gpio-fix-gpio-adp5588-build-errors.patch
+++ b/queue/gpio-fix-gpio-adp5588-build-errors.patch
@@ -1,4 +1,4 @@
-From e9646f0f5bb62b7d43f0968f39d536cfe7123b53 Mon Sep 17 00:00:00 2001
+From a40ee04fc5397662842eddc720b978a315f1dfe4 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@infradead.org>
Date: Thu, 23 May 2019 15:00:41 -0700
Subject: [PATCH] gpio: fix gpio-adp5588 build errors
@@ -32,12 +32,13 @@ Cc: linux-gpio@vger.kernel.org
Reviewed-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index 8023d03ec362..fb9c42461331 100644
+index 71c0ab46f216..1d090585ebdc 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -822,6 +822,7 @@ config GPIO_ADP5588
+@@ -774,6 +774,7 @@ config GPIO_ADP5588
config GPIO_ADP5588_IRQ
bool "Interrupt controller support for ADP5588"
depends on GPIO_ADP5588=y
diff --git a/queue/gpio-gpio-omap-add-check-for-off-wake-capable-gpios.patch b/queue/gpio-gpio-omap-add-check-for-off-wake-capable-gpios.patch
index bf7f522..79f33a8 100644
--- a/queue/gpio-gpio-omap-add-check-for-off-wake-capable-gpios.patch
+++ b/queue/gpio-gpio-omap-add-check-for-off-wake-capable-gpios.patch
@@ -1,4 +1,4 @@
-From da38ef3ed10a09248e13ae16530c2c6d448dc47d Mon Sep 17 00:00:00 2001
+From 913fb3fcb531e5d70cc519340d03ea966b04978c Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Mon, 25 Mar 2019 15:43:18 -0700
Subject: [PATCH] gpio: gpio-omap: add check for off wake capable gpios
@@ -22,12 +22,13 @@ Cc: Tero Kristo <t-kristo@ti.com>
Reported-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
-index a28196453029..4d1bf884fcbc 100644
+index 9fcdb9fe5e87..1e959acb1661 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
-@@ -352,6 +352,22 @@ static void omap_clear_gpio_debounce(struct gpio_bank *bank, unsigned offset)
+@@ -296,6 +296,22 @@ static void omap_clear_gpio_debounce(struct gpio_bank *bank, unsigned offset)
}
}
@@ -50,7 +51,7 @@ index a28196453029..4d1bf884fcbc 100644
static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio,
unsigned trigger)
{
-@@ -383,13 +399,7 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio,
+@@ -327,13 +343,7 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio,
}
/* This part needs to be executed always for OMAP{34xx, 44xx} */
@@ -65,7 +66,7 @@ index a28196453029..4d1bf884fcbc 100644
/*
* Log the edge gpio and manually trigger the IRQ
* after resume if the input level changes
-@@ -402,7 +412,6 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio,
+@@ -346,7 +356,6 @@ static inline void omap_set_gpio_trigger(struct gpio_bank *bank, int gpio,
bank->enabled_non_wakeup_gpios &= ~gpio_bit;
}
diff --git a/queue/gpio-vf610-Do-not-share-irq_chip.patch b/queue/gpio-vf610-Do-not-share-irq_chip.patch
index 28b7ede..5359329 100644
--- a/queue/gpio-vf610-Do-not-share-irq_chip.patch
+++ b/queue/gpio-vf610-Do-not-share-irq_chip.patch
@@ -1,4 +1,4 @@
-From 338aa10750ba24d04beeaf5dc5efc032e5cf343f Mon Sep 17 00:00:00 2001
+From c1ab4892d9f6d3564442eb32252c1f8cad0fba4c Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 10 Mar 2019 23:27:31 -0700
Subject: [PATCH] gpio: vf610: Do not share irq_chip
@@ -19,12 +19,13 @@ Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-imx@nxp.com
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c
-index 541fa6ac399d..7e9451f47efe 100644
+index 7e09ce75ffb2..a9cb5571de54 100644
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
-@@ -29,6 +29,7 @@ struct fsl_gpio_soc_data {
+@@ -37,6 +37,7 @@ struct fsl_gpio_soc_data {
struct vf610_gpio_port {
struct gpio_chip gc;
@@ -32,7 +33,7 @@ index 541fa6ac399d..7e9451f47efe 100644
void __iomem *base;
void __iomem *gpio_base;
const struct fsl_gpio_soc_data *sdata;
-@@ -60,8 +61,6 @@ struct vf610_gpio_port {
+@@ -66,8 +67,6 @@ struct vf610_gpio_port {
#define PORT_INT_EITHER_EDGE 0xb
#define PORT_INT_LOGIC_ONE 0xc
@@ -41,7 +42,7 @@ index 541fa6ac399d..7e9451f47efe 100644
static const struct fsl_gpio_soc_data imx_data = {
.have_paddr = true,
};
-@@ -237,15 +236,6 @@ static int vf610_gpio_irq_set_wake(struct irq_data *d, u32 enable)
+@@ -243,15 +242,6 @@ static int vf610_gpio_irq_set_wake(struct irq_data *d, u32 enable)
return 0;
}
@@ -57,7 +58,7 @@ index 541fa6ac399d..7e9451f47efe 100644
static int vf610_gpio_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
-@@ -253,6 +243,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
+@@ -259,6 +249,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
struct vf610_gpio_port *port;
struct resource *iores;
struct gpio_chip *gc;
@@ -65,7 +66,7 @@ index 541fa6ac399d..7e9451f47efe 100644
int i;
int ret;
-@@ -316,6 +307,14 @@ static int vf610_gpio_probe(struct platform_device *pdev)
+@@ -295,6 +286,14 @@ static int vf610_gpio_probe(struct platform_device *pdev)
gc->direction_output = vf610_gpio_direction_output;
gc->set = vf610_gpio_set;
@@ -80,7 +81,7 @@ index 541fa6ac399d..7e9451f47efe 100644
ret = gpiochip_add_data(gc, port);
if (ret < 0)
return ret;
-@@ -327,14 +326,13 @@ static int vf610_gpio_probe(struct platform_device *pdev)
+@@ -306,14 +305,13 @@ static int vf610_gpio_probe(struct platform_device *pdev)
/* Clear the interrupt status register for all GPIO's */
vf610_gpio_writel(~0, port->base + PORT_ISFR);
diff --git a/queue/hugetlbfs-on-restore-reserve-error-path-retain-subpo.patch b/queue/hugetlbfs-on-restore-reserve-error-path-retain-subpo.patch
index 9bfd29c..805cbd6 100644
--- a/queue/hugetlbfs-on-restore-reserve-error-path-retain-subpo.patch
+++ b/queue/hugetlbfs-on-restore-reserve-error-path-retain-subpo.patch
@@ -1,4 +1,4 @@
-From 0919e1b69ab459e06df45d3ba6658d281962db80 Mon Sep 17 00:00:00 2001
+From cce90439b47d4f4c7fcce395bcf38d3cdcbbf121 Mon Sep 17 00:00:00 2001
From: Mike Kravetz <mike.kravetz@oracle.com>
Date: Mon, 13 May 2019 17:19:38 -0700
Subject: [PATCH] hugetlbfs: on restore reserve error path retain subpool
@@ -38,12 +38,13 @@ Cc: Michal Hocko <mhocko@kernel.org>
Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 2b0abc30685d..c33c5cbb67ff 100644
+index 226f650e9a69..ce84bcde469e 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
-@@ -1268,12 +1268,23 @@ void free_huge_page(struct page *page)
+@@ -1256,12 +1256,23 @@ void free_huge_page(struct page *page)
ClearPagePrivate(page);
/*
diff --git a/queue/i2c-acorn-fix-i2c-warning.patch b/queue/i2c-acorn-fix-i2c-warning.patch
index 69cf4a6..2bbc199 100644
--- a/queue/i2c-acorn-fix-i2c-warning.patch
+++ b/queue/i2c-acorn-fix-i2c-warning.patch
@@ -1,4 +1,4 @@
-From ca21f851cc9643af049226d57fabc3c883ea648e Mon Sep 17 00:00:00 2001
+From dae940daaa876fa976d1963458173f0a37044cac Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 11 Jun 2019 17:48:18 +0100
Subject: [PATCH] i2c: acorn: fix i2c warning
@@ -13,6 +13,7 @@ Fixes: 2236baa75f70 ("i2c: Sanity checks on adapter registration")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/i2c/busses/i2c-acorn.c b/drivers/i2c/busses/i2c-acorn.c
index f4a5ae69bf6a..fa3763e4b3ee 100644
diff --git a/queue/i2c-dev-fix-potential-memory-leak-in-i2cdev_ioctl_rd.patch b/queue/i2c-dev-fix-potential-memory-leak-in-i2cdev_ioctl_rd.patch
index 4e89fe2..fd16e32 100644
--- a/queue/i2c-dev-fix-potential-memory-leak-in-i2cdev_ioctl_rd.patch
+++ b/queue/i2c-dev-fix-potential-memory-leak-in-i2cdev_ioctl_rd.patch
@@ -1,4 +1,4 @@
-From a0692f0eef91354b62c2b4c94954536536be5425 Mon Sep 17 00:00:00 2001
+From 6ddcf8fa0f7c0aff308b83118e5348512c677d6a Mon Sep 17 00:00:00 2001
From: Yingjoe Chen <yingjoe.chen@mediatek.com>
Date: Tue, 7 May 2019 22:20:32 +0800
Subject: [PATCH] i2c: dev: fix potential memory leak in i2cdev_ioctl_rdwr
@@ -11,9 +11,10 @@ will not be freed. Pump index up so it will be freed.
Fixes: 838bfa6049fb ("i2c-dev: Add support for I2C_M_RECV_LEN")
Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
-index 3f7b9af11137..776f36690448 100644
+index ccd76c71af09..cb07651f4b46 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -283,6 +283,7 @@ static noinline int i2cdev_ioctl_rdwr(struct i2c_client *client,
diff --git a/queue/i40e-Queues-are-reserved-despite-Invalid-argument-er.patch b/queue/i40e-Queues-are-reserved-despite-Invalid-argument-er.patch
index f93afcd..6dc2457 100644
--- a/queue/i40e-Queues-are-reserved-despite-Invalid-argument-er.patch
+++ b/queue/i40e-Queues-are-reserved-despite-Invalid-argument-er.patch
@@ -1,4 +1,4 @@
-From 3e957b377bf4262aec2dd424f28ece94e36814d4 Mon Sep 17 00:00:00 2001
+From 18963adda298816c29562fcf58564f0f94a81aa4 Mon Sep 17 00:00:00 2001
From: Adam Ludkiewicz <adam.ludkiewicz@intel.com>
Date: Wed, 6 Feb 2019 15:08:15 -0800
Subject: [PATCH] i40e: Queues are reserved despite "Invalid argument" error
@@ -15,12 +15,13 @@ Also, fixed data packing in the i40e_setup_tc function.
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_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
-index b1c265012c8a..1993b3708815 100644
+index 8da9d58b9a25..a443b6682579 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
-@@ -6846,10 +6846,12 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)
+@@ -6755,10 +6755,12 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)
struct i40e_pf *pf = vsi->back;
u8 enabled_tc = 0, num_tc, hw;
bool need_reset = false;
@@ -33,7 +34,7 @@ index b1c265012c8a..1993b3708815 100644
num_tc = mqprio_qopt->qopt.num_tc;
hw = mqprio_qopt->qopt.hw;
mode = mqprio_qopt->mode;
-@@ -6950,6 +6952,7 @@ config_tc:
+@@ -6859,6 +6861,7 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data)
}
ret = i40e_configure_queue_channels(vsi);
if (ret) {
diff --git a/queue/ia64-fix-build-errors-by-exporting-paddr_to_nid.patch b/queue/ia64-fix-build-errors-by-exporting-paddr_to_nid.patch
index 1fad481..e01b7a8 100644
--- a/queue/ia64-fix-build-errors-by-exporting-paddr_to_nid.patch
+++ b/queue/ia64-fix-build-errors-by-exporting-paddr_to_nid.patch
@@ -1,4 +1,4 @@
-From 9a626c4a6326da4433a0d4d4a8a7d1571caf1ed3 Mon Sep 17 00:00:00 2001
+From b16f696eaa16a40d5149b7d3da956ba046f5ab54 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@infradead.org>
Date: Tue, 28 May 2019 09:14:30 -0700
Subject: [PATCH] ia64: fix build errors by exporting paddr_to_nid()
@@ -36,12 +36,13 @@ Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
-index a03803506b0c..5e1015eb6d0d 100644
+index aa19b7ac8222..476c7b4be378 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
-@@ -55,6 +55,7 @@ paddr_to_nid(unsigned long paddr)
+@@ -49,6 +49,7 @@ paddr_to_nid(unsigned long paddr)
return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
}
diff --git a/queue/ice-Add-missing-case-in-print_link_msg-for-printing-.patch b/queue/ice-Add-missing-case-in-print_link_msg-for-printing-.patch
index 17e4a4a..88881fc 100644
--- a/queue/ice-Add-missing-case-in-print_link_msg-for-printing-.patch
+++ b/queue/ice-Add-missing-case-in-print_link_msg-for-printing-.patch
@@ -1,4 +1,4 @@
-From 203a068ac9e2722e4d118116acaa3a5586f9468a Mon Sep 17 00:00:00 2001
+From 5d14209a3f49614c26b3f27f8593910ba0630e18 Mon Sep 17 00:00:00 2001
From: Brett Creeley <brett.creeley@intel.com>
Date: Tue, 19 Feb 2019 15:04:06 -0800
Subject: [PATCH] ice: Add missing case in print_link_msg for printing flow
@@ -15,12 +15,13 @@ Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@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/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 514aa31db8a6..f7073e046979 100644
+index 4176f4f1b690..83e22b633e3e 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -595,6 +595,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)
+@@ -652,6 +652,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)
case ICE_FC_RX_PAUSE:
fc = "RX";
break;
diff --git a/queue/initramfs-free-initrd-memory-if-opening-initrd.image.patch b/queue/initramfs-free-initrd-memory-if-opening-initrd.image.patch
index 548ce8a..2801830 100644
--- a/queue/initramfs-free-initrd-memory-if-opening-initrd.image.patch
+++ b/queue/initramfs-free-initrd-memory-if-opening-initrd.image.patch
@@ -1,4 +1,4 @@
-From 21814478b062208e5a30945cb9c7294a47bc4d1a Mon Sep 17 00:00:00 2001
+From c8e8ae0b9fa375a1d1c92b0bd3c731131669c646 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 13 May 2019 17:18:17 -0700
Subject: [PATCH] initramfs: free initrd memory if opening /initrd.image fails
@@ -35,6 +35,7 @@ Cc: Will Deacon <will.deacon@arm.com>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/init/initramfs.c b/init/initramfs.c
index 42ba58db6ae9..d638443e12ac 100644
diff --git a/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch b/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch
index 103255e..f9ed1ca 100644
--- a/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch
+++ b/queue/iommu-arm-smmu-Avoid-constant-zero-in-TLBI-writes.patch
@@ -1,4 +1,4 @@
-From 33727e79612af3c99594a132be6c62dbd7fe57b9 Mon Sep 17 00:00:00 2001
+From 5151522ef467632a6a8fd60e95a0e36dac288796 Mon Sep 17 00:00:00 2001
From: Robin Murphy <robin.murphy@arm.com>
Date: Mon, 3 Jun 2019 14:15:37 +0200
Subject: [PATCH] iommu/arm-smmu: Avoid constant zero in TLBI writes
@@ -29,6 +29,7 @@ Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 57f410b66a9b..96ced0826dbd 100644
diff --git a/queue/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch b/queue/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
index e804876..5130700 100644
--- a/queue/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
+++ b/queue/iommu-arm-smmu-v3-Don-t-disable-SMMU-in-kdump-kernel.patch
@@ -1,4 +1,4 @@
-From 3f54c447df34ff9efac7809a4a80fd3208efc619 Mon Sep 17 00:00:00 2001
+From 4b786731fb86965466131c3324cf007d4f2f76b7 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Tue, 23 Apr 2019 11:59:36 +0100
Subject: [PATCH] iommu/arm-smmu-v3: Don't disable SMMU in kdump kernel
@@ -20,12 +20,13 @@ Reported-by: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com>
Tested-by: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com>
Tested-by: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
-index 99b83fda11e4..4d5a694f02c2 100644
+index 91a5e324faf9..4c0e21e56fe0 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
-@@ -2649,13 +2649,9 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass)
+@@ -2415,13 +2415,9 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass)
/* Clear CR0 and sync (disables SMMU and queue processing) */
reg = readl_relaxed(smmu->base + ARM_SMMU_CR0);
if (reg & CR0_SMMUEN) {
@@ -41,7 +42,7 @@ index 99b83fda11e4..4d5a694f02c2 100644
}
ret = arm_smmu_device_disable(smmu);
-@@ -2758,6 +2754,8 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass)
+@@ -2514,6 +2510,8 @@ static int arm_smmu_device_reset(struct arm_smmu_device *smmu, bool bypass)
return ret;
}
diff --git a/queue/iommu-vt-d-Set-intel_iommu_gfx_mapped-correctly.patch b/queue/iommu-vt-d-Set-intel_iommu_gfx_mapped-correctly.patch
index e118e10..a9f9652 100644
--- a/queue/iommu-vt-d-Set-intel_iommu_gfx_mapped-correctly.patch
+++ b/queue/iommu-vt-d-Set-intel_iommu_gfx_mapped-correctly.patch
@@ -1,4 +1,4 @@
-From cf1ec4539a50bdfe688caad4615ca47646884316 Mon Sep 17 00:00:00 2001
+From b3305ebd65a50cfac728fb72d55872f564bb3893 Mon Sep 17 00:00:00 2001
From: Lu Baolu <baolu.lu@linux.intel.com>
Date: Thu, 2 May 2019 09:34:25 +0800
Subject: [PATCH] iommu/vt-d: Set intel_iommu_gfx_mapped correctly
@@ -19,12 +19,13 @@ Fixes: c0771df8d5297 ("intel-iommu: Export a flag indicating that the IOMMU is u
Suggested-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index de47bdb57e48..a814c95f73ce 100644
+index 216b9d0986e5..2a6ffcb590c8 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
-@@ -4053,9 +4053,7 @@ static void __init init_no_remapping_devices(void)
+@@ -4043,9 +4043,7 @@ static void __init init_no_remapping_devices(void)
/* This IOMMU has *only* gfx devices. Either bypass it or
set the gfx_mapped flag, as appropriate */
@@ -35,7 +36,7 @@ index de47bdb57e48..a814c95f73ce 100644
drhd->ignored = 1;
for_each_active_dev_scope(drhd->devices,
drhd->devices_cnt, i, dev)
-@@ -4894,6 +4892,9 @@ int __init intel_iommu_init(void)
+@@ -4841,6 +4839,9 @@ int __init intel_iommu_init(void)
goto out_free_reserved_range;
}
diff --git a/queue/ipc-prevent-lockup-on-alloc_msg-and-free_msg.patch b/queue/ipc-prevent-lockup-on-alloc_msg-and-free_msg.patch
index 74c366e..7a6be82 100644
--- a/queue/ipc-prevent-lockup-on-alloc_msg-and-free_msg.patch
+++ b/queue/ipc-prevent-lockup-on-alloc_msg-and-free_msg.patch
@@ -1,4 +1,4 @@
-From d6a2946a88f524a47cc9b79279667137899db807 Mon Sep 17 00:00:00 2001
+From 09ca1353e191cd13749636c539dab331dbf9b010 Mon Sep 17 00:00:00 2001
From: Li Rongqing <lirongqing@baidu.com>
Date: Tue, 14 May 2019 15:46:20 -0700
Subject: [PATCH] ipc: prevent lockup on alloc_msg and free_msg
@@ -86,12 +86,13 @@ Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
-index ba44164ea1f9..6f93bda7e408 100644
+index c0d58f390c3b..bce7af1546d9 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
-@@ -430,7 +430,8 @@ static void mqueue_evict_inode(struct inode *inode)
+@@ -391,7 +391,8 @@ static void mqueue_evict_inode(struct inode *inode)
struct user_struct *user;
unsigned long mq_bytes, mq_treesize;
struct ipc_namespace *ipc_ns;
@@ -101,7 +102,7 @@ index ba44164ea1f9..6f93bda7e408 100644
clear_inode(inode);
-@@ -441,10 +442,15 @@ static void mqueue_evict_inode(struct inode *inode)
+@@ -402,10 +403,15 @@ static void mqueue_evict_inode(struct inode *inode)
info = MQUEUE_I(inode);
spin_lock(&info->lock);
while ((msg = msg_get(info)) != NULL)
diff --git a/queue/ipv6-flowlabel-fl6_sock_lookup-must-use-atomic_inc_n.patch b/queue/ipv6-flowlabel-fl6_sock_lookup-must-use-atomic_inc_n.patch
index 51edc11..ec133d0 100644
--- a/queue/ipv6-flowlabel-fl6_sock_lookup-must-use-atomic_inc_n.patch
+++ b/queue/ipv6-flowlabel-fl6_sock_lookup-must-use-atomic_inc_n.patch
@@ -1,4 +1,4 @@
-From 65a3c497c0e965a552008db8bc2653f62bc925a1 Mon Sep 17 00:00:00 2001
+From 0be7a583c8322aa697a2537a4e77e01224d3d371 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Thu, 6 Jun 2019 14:32:34 -0700
Subject: [PATCH] ipv6: flowlabel: fl6_sock_lookup() must use
@@ -15,12 +15,13 @@ Fixes: 18367681a10b ("ipv6 flowlabel: Convert np->ipv6_fl_list to RCU.")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
-index 2f3eb7dc45da..545e339b8c4f 100644
+index a119a71ab5b7..22ca0befcc64 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
-@@ -250,9 +250,9 @@ struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label)
+@@ -254,9 +254,9 @@ struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label)
rcu_read_lock_bh();
for_each_sk_fl_rcu(np, sfl) {
struct ip6_flowlabel *fl = sfl->fl;
@@ -32,7 +33,7 @@ index 2f3eb7dc45da..545e339b8c4f 100644
rcu_read_unlock_bh();
return fl;
}
-@@ -618,7 +618,8 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
+@@ -623,7 +623,8 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
goto done;
}
fl1 = sfl->fl;
diff --git a/queue/ipvs-Fix-use-after-free-in-ip_vs_in.patch b/queue/ipvs-Fix-use-after-free-in-ip_vs_in.patch
index 44809ef..c063ac3 100644
--- a/queue/ipvs-Fix-use-after-free-in-ip_vs_in.patch
+++ b/queue/ipvs-Fix-use-after-free-in-ip_vs_in.patch
@@ -1,4 +1,4 @@
-From 719c7d563c17b150877cee03a4b812a424989dfa Mon Sep 17 00:00:00 2001
+From 284627b3985c1f380b5e6b30bcad866f9bb690e5 Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Fri, 17 May 2019 22:31:49 +0800
Subject: [PATCH] ipvs: Fix use-after-free in ip_vs_in
@@ -103,12 +103,13 @@ Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
-index 14457551bcb4..8ebf21149ec3 100644
+index a42c1bc7c698..62c0e80dcd71 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
-@@ -2312,7 +2312,6 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
+@@ -2280,7 +2280,6 @@ static void __net_exit __ip_vs_cleanup(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);
@@ -116,7 +117,7 @@ index 14457551bcb4..8ebf21149ec3 100644
ip_vs_service_net_cleanup(ipvs); /* ip_vs_flush() with locks */
ip_vs_conn_net_cleanup(ipvs);
ip_vs_app_net_cleanup(ipvs);
-@@ -2327,6 +2326,7 @@ static void __net_exit __ip_vs_dev_cleanup(struct net *net)
+@@ -2295,6 +2294,7 @@ static void __net_exit __ip_vs_dev_cleanup(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);
EnterFunction(2);
diff --git a/queue/kernel-sys.c-prctl-fix-false-positive-in-validate_pr.patch b/queue/kernel-sys.c-prctl-fix-false-positive-in-validate_pr.patch
index e4b9172..84bad55 100644
--- a/queue/kernel-sys.c-prctl-fix-false-positive-in-validate_pr.patch
+++ b/queue/kernel-sys.c-prctl-fix-false-positive-in-validate_pr.patch
@@ -1,4 +1,4 @@
-From a9e73998f9d705c94a8dca9687633adc0f24a19a Mon Sep 17 00:00:00 2001
+From 807c835d41528f8035d24364fe92eeceb6ecf8a3 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Mon, 13 May 2019 17:15:40 -0700
Subject: [PATCH] kernel/sys.c: prctl: fix false positive in
@@ -32,12 +32,13 @@ Cc: Dmitry Safonov <0x7f454c46@gmail.com>
Cc: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/sys.c b/kernel/sys.c
-index 12df0e5434b8..bdbfe8d37418 100644
+index 69b9a37ecf0d..4e3082fe7dcb 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
-@@ -1924,7 +1924,7 @@ static int validate_prctl_map(struct prctl_mm_map *prctl_map)
+@@ -1922,7 +1922,7 @@ static int validate_prctl_map(struct prctl_mm_map *prctl_map)
((unsigned long)prctl_map->__m1 __op \
(unsigned long)prctl_map->__m2) ? 0 : -EINVAL
error = __prctl_check_order(start_code, <, end_code);
diff --git a/queue/lapb-fixed-leak-of-control-blocks.patch b/queue/lapb-fixed-leak-of-control-blocks.patch
index 994d725..2093162 100644
--- a/queue/lapb-fixed-leak-of-control-blocks.patch
+++ b/queue/lapb-fixed-leak-of-control-blocks.patch
@@ -1,4 +1,4 @@
-From 6be8e297f9bcea666ea85ac7a6cd9d52d6deaf92 Mon Sep 17 00:00:00 2001
+From 77b2599e88e5ec2ed28604d6560a8bb887eecb42 Mon Sep 17 00:00:00 2001
From: Jeremy Sowden <jeremy@azazel.net>
Date: Sun, 16 Jun 2019 16:54:37 +0100
Subject: [PATCH] lapb: fixed leak of control-blocks.
@@ -23,12 +23,13 @@ Call lapb_put after __lapb_devtostruct to fix leak.
Reported-by: syzbot+afb980676c836b4a0afa@syzkaller.appspotmail.com
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
-index 03f0cd872dce..5d2d1f746b91 100644
+index db6e0afe3a20..1740f852002e 100644
--- a/net/lapb/lapb_iface.c
+++ b/net/lapb/lapb_iface.c
-@@ -177,6 +177,7 @@ int lapb_unregister(struct net_device *dev)
+@@ -182,6 +182,7 @@ int lapb_unregister(struct net_device *dev)
lapb = __lapb_devtostruct(dev);
if (!lapb)
goto out;
diff --git a/queue/libata-Extend-quirks-for-the-ST1000LM024-drives-with.patch b/queue/libata-Extend-quirks-for-the-ST1000LM024-drives-with.patch
index 4bf63e8..aa0ce4b 100644
--- a/queue/libata-Extend-quirks-for-the-ST1000LM024-drives-with.patch
+++ b/queue/libata-Extend-quirks-for-the-ST1000LM024-drives-with.patch
@@ -1,4 +1,4 @@
-From 31f6264e225fb92cf6f4b63031424f20797c297d Mon Sep 17 00:00:00 2001
+From 9c06b4585472d10843f857f4559e90d948b6ec1c Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 11 Jun 2019 16:32:59 +0200
Subject: [PATCH] libata: Extend quirks for the ST1000LM024 drives with NOLPM
@@ -15,12 +15,13 @@ Cc: stable@vger.kernel.org
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index aaa57e0c809d..4a2dff303865 100644
+index 1f6ca4abb2f6..17cb1c4dfe9f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -4460,9 +4460,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
+@@ -4475,9 +4475,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
{ "ST3320[68]13AS", "SD1[5-9]", ATA_HORKAGE_NONCQ |
ATA_HORKAGE_FIRMWARE_WARN },
diff --git a/queue/libnvdimm-Fix-compilation-warnings-with-W-1.patch b/queue/libnvdimm-Fix-compilation-warnings-with-W-1.patch
index 5eccf9f..4799388 100644
--- a/queue/libnvdimm-Fix-compilation-warnings-with-W-1.patch
+++ b/queue/libnvdimm-Fix-compilation-warnings-with-W-1.patch
@@ -1,4 +1,4 @@
-From c01dafad77fea8d64c4fdca0a6031c980842ad65 Mon Sep 17 00:00:00 2001
+From 5afaf458601df4d03a8dd8fdcb85355d6a4e3ede Mon Sep 17 00:00:00 2001
From: Qian Cai <cai@lca.pw>
Date: Thu, 16 May 2019 12:04:53 -0400
Subject: [PATCH] libnvdimm: Fix compilation warnings with W=1
@@ -26,12 +26,13 @@ instances and it can't be expressed in the kernel-doc.
Reviewed-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Qian Cai <cai@lca.pw>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
-index 7ff684159f29..2eb6a6cfe9e4 100644
+index 9148015ed803..a3132a9eb91c 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
-@@ -642,7 +642,7 @@ static struct attribute *nd_device_attributes[] = {
+@@ -612,7 +612,7 @@ static struct attribute *nd_device_attributes[] = {
NULL,
};
@@ -40,7 +41,7 @@ index 7ff684159f29..2eb6a6cfe9e4 100644
* nd_device_attribute_group - generic attributes for all devices on an nd bus
*/
struct attribute_group nd_device_attribute_group = {
-@@ -671,7 +671,7 @@ static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a,
+@@ -641,7 +641,7 @@ static umode_t nd_numa_attr_visible(struct kobject *kobj, struct attribute *a,
return a->mode;
}
@@ -50,7 +51,7 @@ index 7ff684159f29..2eb6a6cfe9e4 100644
*/
struct attribute_group nd_numa_attribute_group = {
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
-index 2030805aa216..edf278067e72 100644
+index 452ad379ed70..9f1b7e3153f9 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -25,6 +25,8 @@ static guid_t nvdimm_btt2_guid;
@@ -63,7 +64,7 @@ index 2030805aa216..edf278067e72 100644
{
a &= NSINDEX_SEQ_MASK;
diff --git a/drivers/nvdimm/label.h b/drivers/nvdimm/label.h
-index e9a2ad3c2150..4bb7add39580 100644
+index 18bbe183b3a9..52f9fcada00a 100644
--- a/drivers/nvdimm/label.h
+++ b/drivers/nvdimm/label.h
@@ -38,8 +38,6 @@ enum {
diff --git a/queue/mISDN-make-sure-device-name-is-NUL-terminated.patch b/queue/mISDN-make-sure-device-name-is-NUL-terminated.patch
index 48ed492..c65d8a8 100644
--- a/queue/mISDN-make-sure-device-name-is-NUL-terminated.patch
+++ b/queue/mISDN-make-sure-device-name-is-NUL-terminated.patch
@@ -1,4 +1,4 @@
-From ccfb62f27beb295103e9392462b20a6ed807d0ea Mon Sep 17 00:00:00 2001
+From 7113e274059b248ce02477847d6ae3ff0368ed59 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 22 May 2019 11:45:13 +0300
Subject: [PATCH] mISDN: make sure device name is NUL terminated
@@ -16,12 +16,13 @@ it's nice to do this as a kernel hardening measure.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
-index a14e35d40538..84e1d4c2db66 100644
+index b2abc44fa5cb..a73337b74f41 100644
--- a/drivers/isdn/mISDN/socket.c
+++ b/drivers/isdn/mISDN/socket.c
-@@ -393,7 +393,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+@@ -394,7 +394,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
memcpy(di.channelmap, dev->channelmap,
sizeof(di.channelmap));
di.nrbchan = dev->nrbchan;
@@ -30,7 +31,7 @@ index a14e35d40538..84e1d4c2db66 100644
if (copy_to_user((void __user *)arg, &di, sizeof(di)))
err = -EFAULT;
} else
-@@ -676,7 +676,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+@@ -677,7 +677,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
memcpy(di.channelmap, dev->channelmap,
sizeof(di.channelmap));
di.nrbchan = dev->nrbchan;
@@ -39,7 +40,7 @@ index a14e35d40538..84e1d4c2db66 100644
if (copy_to_user((void __user *)arg, &di, sizeof(di)))
err = -EFAULT;
} else
-@@ -690,6 +690,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+@@ -691,6 +691,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
err = -EFAULT;
break;
}
diff --git a/queue/mailbox-stm32-ipcc-check-invalid-irq.patch b/queue/mailbox-stm32-ipcc-check-invalid-irq.patch
index 417ab61..0de07b5 100644
--- a/queue/mailbox-stm32-ipcc-check-invalid-irq.patch
+++ b/queue/mailbox-stm32-ipcc-check-invalid-irq.patch
@@ -1,4 +1,4 @@
-From 68a1c8485cf83734d4da9d81cd3b5d2ae7c0339b Mon Sep 17 00:00:00 2001
+From 3b0c9e2031dbc6c3ee9e7228fa05b0ad15e0ef6e Mon Sep 17 00:00:00 2001
From: Fabien Dessenne <fabien.dessenne@st.com>
Date: Wed, 24 Apr 2019 17:51:05 +0200
Subject: [PATCH] mailbox: stm32-ipcc: check invalid irq
@@ -13,9 +13,10 @@ Also, do not output an error log in case of defer probe error.
Signed-off-by: Fabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mailbox/stm32-ipcc.c b/drivers/mailbox/stm32-ipcc.c
-index 210fe504f5ae..f91dfb1327c7 100644
+index 533b0da5235d..ca1f993c0de3 100644
--- a/drivers/mailbox/stm32-ipcc.c
+++ b/drivers/mailbox/stm32-ipcc.c
@@ -8,9 +8,9 @@
diff --git a/queue/mem-hotplug-fix-node-spanned-pages-when-we-have-a-no.patch b/queue/mem-hotplug-fix-node-spanned-pages-when-we-have-a-no.patch
index 4ac5cd2..b8ec137 100644
--- a/queue/mem-hotplug-fix-node-spanned-pages-when-we-have-a-no.patch
+++ b/queue/mem-hotplug-fix-node-spanned-pages-when-we-have-a-no.patch
@@ -1,4 +1,4 @@
-From 299c83dce9ea3a79bb4b5511d2cb996b6b8e5111 Mon Sep 17 00:00:00 2001
+From a1ebff2ae9ba20a87b11b329f8a144546ee4e134 Mon Sep 17 00:00:00 2001
From: Linxu Fang <fanglinxu@huawei.com>
Date: Mon, 13 May 2019 17:19:17 -0700
Subject: [PATCH] mem-hotplug: fix node spanned pages when we have a node with
@@ -80,12 +80,13 @@ Cc: Pavel Tatashin <pavel.tatashin@microsoft.com>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 4ea71bc70413..909adce33398 100644
+index 8a8d226c3c15..31ba80502df9 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -6255,13 +6255,15 @@ static unsigned long __init zone_spanned_pages_in_node(int nid,
+@@ -5953,13 +5953,15 @@ static unsigned long __meminit zone_spanned_pages_in_node(int nid,
unsigned long *zone_end_pfn,
unsigned long *ignored)
{
diff --git a/queue/mfd-intel-lpss-Set-the-device-in-reset-state-when-in.patch b/queue/mfd-intel-lpss-Set-the-device-in-reset-state-when-in.patch
index ae2685b..e4b5ff3 100644
--- a/queue/mfd-intel-lpss-Set-the-device-in-reset-state-when-in.patch
+++ b/queue/mfd-intel-lpss-Set-the-device-in-reset-state-when-in.patch
@@ -1,4 +1,4 @@
-From dad06532292d77f37fbe831a02948a593500f682 Mon Sep 17 00:00:00 2001
+From f4de855afb6d28288521a652e61cea62ba7207cd Mon Sep 17 00:00:00 2001
From: Binbin Wu <binbin.wu@intel.com>
Date: Mon, 8 Apr 2019 16:09:10 +0800
Subject: [PATCH] mfd: intel-lpss: Set the device in reset state when init
@@ -46,6 +46,7 @@ Signed-off-by: Binbin Wu <binbin.wu@intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mfd/intel-lpss.c b/drivers/mfd/intel-lpss.c
index 50bffc3382d7..ff3fba16e735 100644
diff --git a/queue/mfd-tps65912-spi-Add-missing-of-table-registration.patch b/queue/mfd-tps65912-spi-Add-missing-of-table-registration.patch
index 5939b3e..0b49271 100644
--- a/queue/mfd-tps65912-spi-Add-missing-of-table-registration.patch
+++ b/queue/mfd-tps65912-spi-Add-missing-of-table-registration.patch
@@ -1,4 +1,4 @@
-From 9e364e87ad7f2c636276c773d718cda29d62b741 Mon Sep 17 00:00:00 2001
+From 05bd353673ba13252ca56edebdf9c94df1ed56cd Mon Sep 17 00:00:00 2001
From: Daniel Gomez <dagmcr@gmail.com>
Date: Mon, 22 Apr 2019 21:09:50 +0200
Subject: [PATCH] mfd: tps65912-spi: Add missing of table registration
@@ -21,6 +21,7 @@ alias: spi:tps65912
Reported-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Daniel Gomez <dagmcr@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mfd/tps65912-spi.c b/drivers/mfd/tps65912-spi.c
index 3bd75061f777..f78be039e463 100644
diff --git a/queue/mfd-twl6040-Fix-device-init-errors-for-ACCCTL-regist.patch b/queue/mfd-twl6040-Fix-device-init-errors-for-ACCCTL-regist.patch
index a7ea8dd..5468d4a 100644
--- a/queue/mfd-twl6040-Fix-device-init-errors-for-ACCCTL-regist.patch
+++ b/queue/mfd-twl6040-Fix-device-init-errors-for-ACCCTL-regist.patch
@@ -1,4 +1,4 @@
-From 48171d0ea7caccf21c9ee3ae75eb370f2a756062 Mon Sep 17 00:00:00 2001
+From dae6ce5eb34e7228b3581ee677df589208e680c2 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 14 Feb 2019 08:03:45 -0800
Subject: [PATCH] mfd: twl6040: Fix device init errors for ACCCTL register
@@ -27,9 +27,10 @@ configuration and regcache_sync() will write the new value to ACCCTL.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
-index 7c3c5fd5fcd0..86052c5c6069 100644
+index dd19f17a1b63..2b8c479dbfa6 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -322,8 +322,19 @@ int twl6040_power(struct twl6040 *twl6040, int on)
diff --git a/queue/mips-Make-sure-dt-memory-regions-are-valid.patch b/queue/mips-Make-sure-dt-memory-regions-are-valid.patch
index 370a7dd..113bb6f 100644
--- a/queue/mips-Make-sure-dt-memory-regions-are-valid.patch
+++ b/queue/mips-Make-sure-dt-memory-regions-are-valid.patch
@@ -1,4 +1,4 @@
-From 93fa5b280761a4dbb14c5330f260380385ab2b49 Mon Sep 17 00:00:00 2001
+From 264927fedb3f51dcade9d0c80766446958ddf7d2 Mon Sep 17 00:00:00 2001
From: Serge Semin <fancer.lancer@gmail.com>
Date: Fri, 3 May 2019 20:50:40 +0300
Subject: [PATCH] mips: Make sure dt memory regions are valid
@@ -34,9 +34,10 @@ Cc: Juergen Gross <jgross@suse.com>
Cc: Serge Semin <Sergey.Semin@t-platforms.ru>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
-index 437a174e3ef9..28bf01961bb2 100644
+index 89950b7bf536..bdaf3536241a 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -41,7 +41,19 @@ char *mips_get_machine_name(void)
diff --git a/queue/misc-pci_endpoint_test-Fix-test_reg_bar-to-be-update.patch b/queue/misc-pci_endpoint_test-Fix-test_reg_bar-to-be-update.patch
index c250f0a..f589948 100644
--- a/queue/misc-pci_endpoint_test-Fix-test_reg_bar-to-be-update.patch
+++ b/queue/misc-pci_endpoint_test-Fix-test_reg_bar-to-be-update.patch
@@ -1,4 +1,4 @@
-From de50237342a4b6e8a5f893a507fc05de6b81743e Mon Sep 17 00:00:00 2001
+From 778c25cc7eeb9f94a15ef8aa54673751acd2e614 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Mon, 25 Mar 2019 15:09:47 +0530
Subject: [PATCH] misc: pci_endpoint_test: Fix test_reg_bar to be updated in
@@ -17,6 +17,7 @@ Fix it.
Fixes: 834b90519925 ("misc: pci_endpoint_test: Add support for PCI_ENDPOINT_TEST regs to be mapped to any BAR")
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
index 7b370466a227..f38e8e6bb5c6 100644
diff --git a/queue/mlxsw-spectrum-Prevent-force-of-56G.patch b/queue/mlxsw-spectrum-Prevent-force-of-56G.patch
index fdb4451..afab058 100644
--- a/queue/mlxsw-spectrum-Prevent-force-of-56G.patch
+++ b/queue/mlxsw-spectrum-Prevent-force-of-56G.patch
@@ -1,4 +1,4 @@
-From 3aa45fe014251e0f62694e5da2d0c6af06bfdde2 Mon Sep 17 00:00:00 2001
+From 06cfa29fcdfc51e05abd0b0492bb1ec5cbf209d6 Mon Sep 17 00:00:00 2001
From: Amit Cohen <amitc@mellanox.com>
Date: Wed, 29 May 2019 10:59:45 +0300
Subject: [PATCH] mlxsw: spectrum: Prevent force of 56G
@@ -16,6 +16,7 @@ Signed-off-by: Amit Cohen <amitc@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.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/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index e7a487635bc2..3e02dd3b0758 100644
diff --git a/queue/mm-cma.c-fix-crash-on-CMA-allocation-if-bitmap-alloc.patch b/queue/mm-cma.c-fix-crash-on-CMA-allocation-if-bitmap-alloc.patch
index 44d2fb1..826fd65 100644
--- a/queue/mm-cma.c-fix-crash-on-CMA-allocation-if-bitmap-alloc.patch
+++ b/queue/mm-cma.c-fix-crash-on-CMA-allocation-if-bitmap-alloc.patch
@@ -1,4 +1,4 @@
-From 1df3a339074e31db95c4790ea9236874b13ccd87 Mon Sep 17 00:00:00 2001
+From a49c6fb6eb0b19cc2a2b37e460b9891b68585961 Mon Sep 17 00:00:00 2001
From: Yue Hu <huyue2@yulong.com>
Date: Mon, 13 May 2019 17:18:14 -0700
Subject: [PATCH] mm/cma.c: fix crash on CMA allocation if bitmap allocation
@@ -19,9 +19,10 @@ Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/cma.c b/mm/cma.c
-index d72a02fb7759..5e36d7418031 100644
+index 630dc2ecba10..223336795e05 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -106,8 +106,10 @@ static int __init cma_activate_area(struct cma *cma)
diff --git a/queue/mm-cma.c-fix-the-bitmap-status-to-show-failed-alloca.patch b/queue/mm-cma.c-fix-the-bitmap-status-to-show-failed-alloca.patch
index 873f6b5..34bbe29 100644
--- a/queue/mm-cma.c-fix-the-bitmap-status-to-show-failed-alloca.patch
+++ b/queue/mm-cma.c-fix-the-bitmap-status-to-show-failed-alloca.patch
@@ -1,4 +1,4 @@
-From 2b59e01a3aa665f751d1410b99fae9336bd424e1 Mon Sep 17 00:00:00 2001
+From b1c84706a4d9fb55301e56fc765d9d09d9c4eaf7 Mon Sep 17 00:00:00 2001
From: Yue Hu <huyue2@yulong.com>
Date: Mon, 13 May 2019 17:17:41 -0700
Subject: [PATCH] mm/cma.c: fix the bitmap status to show failed allocation
@@ -37,12 +37,13 @@ Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Laura Abbott <labbott@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/cma.c b/mm/cma.c
-index bb2d333ffcb3..d72a02fb7759 100644
+index 223336795e05..b0a5f9ebfff3 100644
--- a/mm/cma.c
+++ b/mm/cma.c
-@@ -367,23 +367,26 @@ err:
+@@ -371,23 +371,26 @@ int __init cma_declare_contiguous(phys_addr_t base,
#ifdef CONFIG_CMA_DEBUG
static void cma_debug_show_areas(struct cma *cma)
{
diff --git a/queue/mm-cma_debug.c-fix-the-break-condition-in-cma_maxchu.patch b/queue/mm-cma_debug.c-fix-the-break-condition-in-cma_maxchu.patch
index 07a426a..ecda0ad 100644
--- a/queue/mm-cma_debug.c-fix-the-break-condition-in-cma_maxchu.patch
+++ b/queue/mm-cma_debug.c-fix-the-break-condition-in-cma_maxchu.patch
@@ -1,4 +1,4 @@
-From f0fd50504a54f5548eb666dc16ddf8394e44e4b7 Mon Sep 17 00:00:00 2001
+From 606c5674128036a3abaa44b5f79e9a951bc1ef66 Mon Sep 17 00:00:00 2001
From: Yue Hu <huyue2@yulong.com>
Date: Mon, 13 May 2019 17:16:37 -0700
Subject: [PATCH] mm/cma_debug.c: fix the break condition in cma_maxchunk_get()
@@ -21,12 +21,13 @@ Cc: Dmitry Safonov <d.safonov@partner.samsung.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/cma_debug.c b/mm/cma_debug.c
-index 8d7b2fd52225..a7dd9e8e10d5 100644
+index f23467291cfb..3b69248a0298 100644
--- a/mm/cma_debug.c
+++ b/mm/cma_debug.c
-@@ -56,7 +56,7 @@ static int cma_maxchunk_get(void *data, u64 *val)
+@@ -58,7 +58,7 @@ static int cma_maxchunk_get(void *data, u64 *val)
mutex_lock(&cma->lock);
for (;;) {
start = find_next_zero_bit(cma->bitmap, bitmap_maxno, end);
diff --git a/queue/mm-hmm-select-mmu-notifier-when-selecting-HMM.patch b/queue/mm-hmm-select-mmu-notifier-when-selecting-HMM.patch
index 199ed6d..26d1072 100644
--- a/queue/mm-hmm-select-mmu-notifier-when-selecting-HMM.patch
+++ b/queue/mm-hmm-select-mmu-notifier-when-selecting-HMM.patch
@@ -1,4 +1,4 @@
-From 734fb89968900b5c5f8edd5038bd4cdeab8c61d2 Mon Sep 17 00:00:00 2001
+From 1105f0bc59b13c542cf0e61389654ec07c871657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse@redhat.com>
Date: Mon, 13 May 2019 17:19:45 -0700
Subject: [PATCH] mm/hmm: select mmu notifier when selecting HMM
@@ -25,12 +25,13 @@ Cc: Matthew Wilcox <willy@infradead.org>
Cc: Souptick Joarder <jrdr.linux@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/Kconfig b/mm/Kconfig
-index 137eadc18732..0eada3f818fa 100644
+index 22e949e263f0..f3bc3aed6510 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
-@@ -697,12 +697,12 @@ config DEV_PAGEMAP_OPS
+@@ -700,12 +700,12 @@ config DEV_PAGEMAP_OPS
config HMM
bool
diff --git a/queue/mm-list_lru.c-fix-memory-leak-in-__memcg_init_list_l.patch b/queue/mm-list_lru.c-fix-memory-leak-in-__memcg_init_list_l.patch
index a00676b..2e5baa8 100644
--- a/queue/mm-list_lru.c-fix-memory-leak-in-__memcg_init_list_l.patch
+++ b/queue/mm-list_lru.c-fix-memory-leak-in-__memcg_init_list_l.patch
@@ -1,4 +1,4 @@
-From 3510955b327176fd4cbab5baa75b449f077722a2 Mon Sep 17 00:00:00 2001
+From e957c8b9641936c6ad2b1c23fe61bc2414553233 Mon Sep 17 00:00:00 2001
From: Shakeel Butt <shakeelb@google.com>
Date: Thu, 13 Jun 2019 15:55:49 -0700
Subject: [PATCH] mm/list_lru.c: fix memory leak in __memcg_init_list_lru_node
@@ -50,12 +50,13 @@ Reviewed-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Cc: <stable@vger.kernel.org> [4.0+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/list_lru.c b/mm/list_lru.c
-index e4709fdaa8e6..927d85be32f6 100644
+index cbb603e7cc4c..b2a2d3c9b33c 100644
--- a/mm/list_lru.c
+++ b/mm/list_lru.c
-@@ -354,7 +354,7 @@ static int __memcg_init_list_lru_node(struct list_lru_memcg *memcg_lrus,
+@@ -315,7 +315,7 @@ static int __memcg_init_list_lru_node(struct list_lru_memcg *memcg_lrus,
}
return 0;
fail:
diff --git a/queue/mm-page_mkclean-vs-MADV_DONTNEED-race.patch b/queue/mm-page_mkclean-vs-MADV_DONTNEED-race.patch
index 9f9e93f..c4ad8d5 100644
--- a/queue/mm-page_mkclean-vs-MADV_DONTNEED-race.patch
+++ b/queue/mm-page_mkclean-vs-MADV_DONTNEED-race.patch
@@ -1,4 +1,4 @@
-From 024eee0e83f0df52317be607ca521e0fc572aa07 Mon Sep 17 00:00:00 2001
+From adb38358d9d98f3fa33506c903c0d0442ebb8cc5 Mon Sep 17 00:00:00 2001
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
Date: Mon, 13 May 2019 17:19:11 -0700
Subject: [PATCH] mm: page_mkclean vs MADV_DONTNEED race
@@ -44,12 +44,13 @@ Cc:"Kirill A . Shutemov" <kirill@shutemov.name>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/dax.c b/fs/dax.c
-index 83009875308c..f74386293632 100644
+index 0d3f640653c0..b2ade8141183 100644
--- a/fs/dax.c
+++ b/fs/dax.c
-@@ -814,7 +814,7 @@ static void dax_entry_mkclean(struct address_space *mapping, pgoff_t index,
+@@ -795,7 +795,7 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping,
goto unlock_pmd;
flush_cache_page(vma, address, pfn);
@@ -59,10 +60,10 @@ index 83009875308c..f74386293632 100644
pmd = pmd_mkclean(pmd);
set_pmd_at(vma->vm_mm, address, pmdp, pmd);
diff --git a/mm/rmap.c b/mm/rmap.c
-index b30c7c71d1d9..76c8dfd3ae1c 100644
+index 85b7f9423352..f048c2651954 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
-@@ -928,7 +928,7 @@ static bool page_mkclean_one(struct page *page, struct vm_area_struct *vma,
+@@ -926,7 +926,7 @@ static bool page_mkclean_one(struct page *page, struct vm_area_struct *vma,
continue;
flush_cache_page(vma, address, page_to_pfn(page));
diff --git a/queue/mm-slab.c-fix-an-infinite-loop-in-leaks_show.patch b/queue/mm-slab.c-fix-an-infinite-loop-in-leaks_show.patch
index e37a594..241f63e 100644
--- a/queue/mm-slab.c-fix-an-infinite-loop-in-leaks_show.patch
+++ b/queue/mm-slab.c-fix-an-infinite-loop-in-leaks_show.patch
@@ -1,4 +1,4 @@
-From 745e10146c31b1c6ed3326286704ae251b17f663 Mon Sep 17 00:00:00 2001
+From ee4f801e2ab65e4ad8d02fa79ae5ba66a91ad510 Mon Sep 17 00:00:00 2001
From: Qian Cai <cai@lca.pw>
Date: Mon, 13 May 2019 17:16:31 -0700
Subject: [PATCH] mm/slab.c: fix an infinite loop in leaks_show()
@@ -57,12 +57,13 @@ Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/slab.c b/mm/slab.c
-index da4068a95307..2915d912e89a 100644
+index 018d32496e8d..46f21e73db2f 100644
--- a/mm/slab.c
+++ b/mm/slab.c
-@@ -4291,8 +4291,12 @@ static int leaks_show(struct seq_file *m, void *p)
+@@ -4326,8 +4326,12 @@ static int leaks_show(struct seq_file *m, void *p)
* whole processing.
*/
do {
diff --git a/queue/mm-vmscan.c-fix-trying-to-reclaim-unevictable-LRU-pa.patch b/queue/mm-vmscan.c-fix-trying-to-reclaim-unevictable-LRU-pa.patch
index 32d0cb7..a289af2 100644
--- a/queue/mm-vmscan.c-fix-trying-to-reclaim-unevictable-LRU-pa.patch
+++ b/queue/mm-vmscan.c-fix-trying-to-reclaim-unevictable-LRU-pa.patch
@@ -1,4 +1,4 @@
-From a58f2cef26e1ca44182c8b22f4f4395e702a5795 Mon Sep 17 00:00:00 2001
+From 3bfee7fcef4a6ef90da1c275a08971bb18c4505e Mon Sep 17 00:00:00 2001
From: Minchan Kim <minchan@kernel.org>
Date: Thu, 13 Jun 2019 15:56:15 -0700
Subject: [PATCH] mm/vmscan.c: fix trying to reclaim unevictable LRU page
@@ -58,12 +58,13 @@ Cc: Pankaj Suryawanshi <pankaj.suryawanshi@einfochips.com>
Cc: <stable@vger.kernel.org> [4.12+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/vmscan.c b/mm/vmscan.c
-index ffa82b1d39a2..7889f583ced9 100644
+index 770cdb27e1a7..b32e99d55ff2 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
-@@ -1505,7 +1505,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone,
+@@ -1351,7 +1351,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone,
list_for_each_entry_safe(page, next, page_list, lru) {
if (page_is_file_cache(page) && !PageDirty(page) &&
diff --git a/queue/mmc-mmci-Prevent-polling-for-busy-detection-in-IRQ-c.patch b/queue/mmc-mmci-Prevent-polling-for-busy-detection-in-IRQ-c.patch
index e1f7f1a..80d84ac 100644
--- a/queue/mmc-mmci-Prevent-polling-for-busy-detection-in-IRQ-c.patch
+++ b/queue/mmc-mmci-Prevent-polling-for-busy-detection-in-IRQ-c.patch
@@ -1,4 +1,4 @@
-From 8520ce1e17799b220ff421d4f39438c9c572ade3 Mon Sep 17 00:00:00 2001
+From 069bf686b0aaa38b1a8d7204ec0b8647771adf27 Mon Sep 17 00:00:00 2001
From: Ludovic Barre <ludovic.barre@st.com>
Date: Fri, 26 Apr 2019 09:46:35 +0200
Subject: [PATCH] mmc: mmci: Prevent polling for busy detection in IRQ context
@@ -17,12 +17,13 @@ already been taken care of by mmci_cmd_irq().
Signed-off-by: Ludovic Barre <ludovic.barre@st.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/mmci.c b/drivers/mmc/host/mmci.c
-index 049f8e3676ac..356833a606d5 100644
+index f1849775e47e..cdbab4fe8ace 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
-@@ -1535,9 +1535,10 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
+@@ -1368,9 +1368,10 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
}
/*
diff --git a/queue/neigh-fix-use-after-free-read-in-pneigh_get_next.patch b/queue/neigh-fix-use-after-free-read-in-pneigh_get_next.patch
index 97727ce..936b9f6 100644
--- a/queue/neigh-fix-use-after-free-read-in-pneigh_get_next.patch
+++ b/queue/neigh-fix-use-after-free-read-in-pneigh_get_next.patch
@@ -1,4 +1,4 @@
-From f3e92cb8e2eb8c27d109e6fd73d3a69a8c09e288 Mon Sep 17 00:00:00 2001
+From f994fef434bb940ad7e58624ee34b58f5c1cb41c Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Sat, 15 Jun 2019 16:28:48 -0700
Subject: [PATCH] neigh: fix use-after-free read in pneigh_get_next
@@ -144,12 +144,13 @@ Fixes: 767e97e1e0db ("neigh: RCU conversion of struct neighbour")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index 0e2c07355463..9e7fc929bc50 100644
+index 1511043955f7..ea6ba7bd5d31 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
-@@ -3203,6 +3203,7 @@ static void *neigh_get_idx_any(struct seq_file *seq, loff_t *pos)
+@@ -2751,6 +2751,7 @@ static void *neigh_get_idx_any(struct seq_file *seq, loff_t *pos)
}
void *neigh_seq_start(struct seq_file *seq, loff_t *pos, struct neigh_table *tbl, unsigned int neigh_seq_flags)
@@ -157,7 +158,7 @@ index 0e2c07355463..9e7fc929bc50 100644
__acquires(rcu_bh)
{
struct neigh_seq_state *state = seq->private;
-@@ -3213,6 +3214,7 @@ void *neigh_seq_start(struct seq_file *seq, loff_t *pos, struct neigh_table *tbl
+@@ -2761,6 +2762,7 @@ void *neigh_seq_start(struct seq_file *seq, loff_t *pos, struct neigh_table *tbl
rcu_read_lock_bh();
state->nht = rcu_dereference_bh(tbl->nht);
@@ -165,7 +166,7 @@ index 0e2c07355463..9e7fc929bc50 100644
return *pos ? neigh_get_idx_any(seq, pos) : SEQ_START_TOKEN;
}
-@@ -3246,8 +3248,13 @@ out:
+@@ -2794,8 +2796,13 @@ void *neigh_seq_next(struct seq_file *seq, void *v, loff_t *pos)
EXPORT_SYMBOL(neigh_seq_next);
void neigh_seq_stop(struct seq_file *seq, void *v)
diff --git a/queue/net-aquantia-fix-LRO-with-FCS-error.patch b/queue/net-aquantia-fix-LRO-with-FCS-error.patch
index 435574e..bb53e60 100644
--- a/queue/net-aquantia-fix-LRO-with-FCS-error.patch
+++ b/queue/net-aquantia-fix-LRO-with-FCS-error.patch
@@ -1,4 +1,4 @@
-From eaeb3b7494ba9159323814a8ce8af06a9277d99b Mon Sep 17 00:00:00 2001
+From 8900b1135b4db6107bc0e822e0b530aada569eaa Mon Sep 17 00:00:00 2001
From: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
Date: Sat, 25 May 2019 09:58:03 +0000
Subject: [PATCH] net: aquantia: fix LRO with FCS error
@@ -19,12 +19,13 @@ Fixes: bab6de8fd180b ("net: ethernet: aquantia: Atlantic A0 and B0 specific func
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: Dmitry Bogdanov <dmitry.bogdanov@aquantia.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/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
-index bfcda12d73de..e979f227cf0b 100644
+index 7974e0713e12..e091d3d7397c 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
-@@ -713,38 +713,41 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
+@@ -693,38 +693,41 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self,
if ((rx_stat & BIT(0)) || rxd_wb->type & 0x1000U) {
/* MAC error or DMA error */
buff->is_error = 1U;
diff --git a/queue/net-aquantia-tx-clean-budget-logic-error.patch b/queue/net-aquantia-tx-clean-budget-logic-error.patch
index 7c6d98d..2dec738 100644
--- a/queue/net-aquantia-tx-clean-budget-logic-error.patch
+++ b/queue/net-aquantia-tx-clean-budget-logic-error.patch
@@ -1,4 +1,4 @@
-From 31bafc49a7736989e4c2d9f7280002c66536e590 Mon Sep 17 00:00:00 2001
+From 1bdee01eaf814df97664760b4fac7977ff92e41d Mon Sep 17 00:00:00 2001
From: Igor Russkikh <Igor.Russkikh@aquantia.com>
Date: Sat, 25 May 2019 09:57:59 +0000
Subject: [PATCH] net: aquantia: tx clean budget logic error
@@ -17,12 +17,13 @@ from the `for` statement and rewrite it in a clear way.
Fixes: b647d3980948e ("net: aquantia: Add tx clean budget and valid budget handling logic")
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.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/aquantia/atlantic/aq_ring.c b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
-index 350e385528fd..63ed00415904 100644
+index 6f3312350cac..b3c7994d73eb 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
-@@ -223,10 +223,10 @@ void aq_ring_queue_stop(struct aq_ring_s *ring)
+@@ -139,10 +139,10 @@ void aq_ring_queue_stop(struct aq_ring_s *ring)
bool aq_ring_tx_clean(struct aq_ring_s *self)
{
struct device *dev = aq_nic_get_dev(self->aq_nic);
@@ -36,7 +37,7 @@ index 350e385528fd..63ed00415904 100644
struct aq_ring_buff_s *buff = &self->buff_ring[self->sw_head];
if (likely(buff->is_mapped)) {
-@@ -251,6 +251,7 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)
+@@ -167,6 +167,7 @@ bool aq_ring_tx_clean(struct aq_ring_s *self)
buff->pa = 0U;
buff->eop_index = 0xffffU;
diff --git a/queue/net-hns3-return-0-and-print-warning-when-hit-duplica.patch b/queue/net-hns3-return-0-and-print-warning-when-hit-duplica.patch
index 91d9f22..3c5019a 100644
--- a/queue/net-hns3-return-0-and-print-warning-when-hit-duplica.patch
+++ b/queue/net-hns3-return-0-and-print-warning-when-hit-duplica.patch
@@ -1,4 +1,4 @@
-From b7c6beff7bdecd5fbb0a5337d349755516f989d5 Mon Sep 17 00:00:00 2001
+From 9c1379ff5511cdcc1ebe0eebebf188452a4b0d61 Mon Sep 17 00:00:00 2001
From: Peng Li <lipeng321@huawei.com>
Date: Thu, 4 Apr 2019 16:17:51 +0800
Subject: [PATCH] net: hns3: return 0 and print warning when hit duplicate MAC
@@ -16,6 +16,7 @@ configure HW.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.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/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 69ed8de41482..3bc8d1389592 100644
diff --git a/queue/net-mlx5-Avoid-reloading-already-removed-devices.patch b/queue/net-mlx5-Avoid-reloading-already-removed-devices.patch
index 4fa66cb..923f2e3 100644
--- a/queue/net-mlx5-Avoid-reloading-already-removed-devices.patch
+++ b/queue/net-mlx5-Avoid-reloading-already-removed-devices.patch
@@ -1,4 +1,4 @@
-From dd80857bf388abd0c64dd3aa4fbf7d407deba819 Mon Sep 17 00:00:00 2001
+From 4764fdc97b9c18389ed09a70fc235444edb24317 Mon Sep 17 00:00:00 2001
From: Alaa Hleihel <alaa@mellanox.com>
Date: Sun, 19 May 2019 11:11:49 +0300
Subject: [PATCH] net/mlx5: Avoid reloading already removed devices
@@ -17,12 +17,13 @@ protocol) only if the device is already added.
Fixes: c5447c70594b ("net/mlx5: E-Switch, Reload IB interface when switching devlink modes")
Signed-off-by: Alaa Hleihel <alaa@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
-index ebc046fa97d3..f6b1da99e6c2 100644
+index 37ba7c78859d..1c225be9c7db 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
-@@ -248,11 +248,32 @@ void mlx5_unregister_interface(struct mlx5_interface *intf)
+@@ -342,11 +342,32 @@ void mlx5_unregister_interface(struct mlx5_interface *intf)
}
EXPORT_SYMBOL(mlx5_unregister_interface);
diff --git a/queue/net-mvpp2-prs-Fix-parser-range-for-VID-filtering.patch b/queue/net-mvpp2-prs-Fix-parser-range-for-VID-filtering.patch
index 2d33295..44d77e9 100644
--- a/queue/net-mvpp2-prs-Fix-parser-range-for-VID-filtering.patch
+++ b/queue/net-mvpp2-prs-Fix-parser-range-for-VID-filtering.patch
@@ -1,4 +1,4 @@
-From 46b0090a6636cf34c0e856f15dd03e15ba4cdda6 Mon Sep 17 00:00:00 2001
+From 42fecb45f74ab52e9eab264b039686bcba5c7ba7 Mon Sep 17 00:00:00 2001
From: Maxime Chevallier <maxime.chevallier@bootlin.com>
Date: Tue, 11 Jun 2019 11:51:42 +0200
Subject: [PATCH] net: mvpp2: prs: Fix parser range for VID filtering
@@ -19,12 +19,13 @@ Fixes: 56beda3db602 ("net: mvpp2: Add hardware offloading for VLAN filtering")
Suggested-by: Yuri Chipchev <yuric@marvell.com>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.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/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-index 392fd895f278..e0da4db3bf56 100644
+index 6bb69f086794..4819f9883677 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-@@ -1905,8 +1905,7 @@ static int mvpp2_prs_ip6_init(struct mvpp2 *priv)
+@@ -1927,8 +1927,7 @@ static int mvpp2_prs_ip6_init(struct mvpp2 *priv)
}
/* Find tcam entry with matched pair <vid,port> */
@@ -34,7 +35,7 @@ index 392fd895f278..e0da4db3bf56 100644
{
unsigned char byte[2], enable[2];
struct mvpp2_prs_entry pe;
-@@ -1914,13 +1913,13 @@ static int mvpp2_prs_vid_range_find(struct mvpp2 *priv, int pmap, u16 vid,
+@@ -1936,13 +1935,13 @@ static int mvpp2_prs_vid_range_find(struct mvpp2 *priv, int pmap, u16 vid,
int tid;
/* Go through the all entries with MVPP2_PRS_LU_VID */
@@ -53,7 +54,7 @@ index 392fd895f278..e0da4db3bf56 100644
mvpp2_prs_tcam_data_byte_get(&pe, 2, &byte[0], &enable[0]);
mvpp2_prs_tcam_data_byte_get(&pe, 3, &byte[1], &enable[1]);
-@@ -1950,7 +1949,7 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
+@@ -1972,7 +1971,7 @@ int mvpp2_prs_vid_entry_add(struct mvpp2_port *port, u16 vid)
memset(&pe, 0, sizeof(pe));
/* Scan TCAM and see if entry with this <vid,port> already exist */
@@ -62,7 +63,7 @@ index 392fd895f278..e0da4db3bf56 100644
reg_val = mvpp2_read(priv, MVPP2_MH_REG(port->id));
if (reg_val & MVPP2_DSA_EXTENDED)
-@@ -2008,7 +2007,7 @@ void mvpp2_prs_vid_entry_remove(struct mvpp2_port *port, u16 vid)
+@@ -2030,7 +2029,7 @@ void mvpp2_prs_vid_entry_remove(struct mvpp2_port *port, u16 vid)
int tid;
/* Scan TCAM and see if entry with this <vid,port> already exist */
diff --git a/queue/net-mvpp2-prs-Use-the-correct-helpers-when-removing-.patch b/queue/net-mvpp2-prs-Use-the-correct-helpers-when-removing-.patch
index 0dc072f..b92531a 100644
--- a/queue/net-mvpp2-prs-Use-the-correct-helpers-when-removing-.patch
+++ b/queue/net-mvpp2-prs-Use-the-correct-helpers-when-removing-.patch
@@ -1,4 +1,4 @@
-From 6b7a3430c163455cf8a514d636bda52b04654972 Mon Sep 17 00:00:00 2001
+From f3c774d5fa97c6088b8ab53f5bbe543a3e01cfd0 Mon Sep 17 00:00:00 2001
From: Maxime Chevallier <maxime.chevallier@bootlin.com>
Date: Tue, 11 Jun 2019 11:51:43 +0200
Subject: [PATCH] net: mvpp2: prs: Use the correct helpers when removing all
@@ -16,12 +16,13 @@ Fixes: 56beda3db602 ("net: mvpp2: Add hardware offloading for VLAN filtering")
Suggested-by: Yuri Chipchev <yuric@marvell.com>
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.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/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-index e0da4db3bf56..ae2240074d8e 100644
+index 4819f9883677..4a642ad1cfa2 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
-@@ -2025,8 +2025,10 @@ void mvpp2_prs_vid_remove_all(struct mvpp2_port *port)
+@@ -2047,8 +2047,10 @@ void mvpp2_prs_vid_remove_all(struct mvpp2_port *port)
for (tid = MVPP2_PRS_VID_PORT_FIRST(port->id);
tid <= MVPP2_PRS_VID_PORT_LAST(port->id); tid++) {
diff --git a/queue/net-openvswitch-do-not-free-vport-if-register_netdev.patch b/queue/net-openvswitch-do-not-free-vport-if-register_netdev.patch
index 6ad65dc..d5c615e 100644
--- a/queue/net-openvswitch-do-not-free-vport-if-register_netdev.patch
+++ b/queue/net-openvswitch-do-not-free-vport-if-register_netdev.patch
@@ -1,4 +1,4 @@
-From 309b66970ee2abf721ecd0876a48940fa0b99a35 Mon Sep 17 00:00:00 2001
+From df0b79888e1558b6c1b560d5e2d850cc1039329d Mon Sep 17 00:00:00 2001
From: Taehee Yoo <ap420073@gmail.com>
Date: Sun, 9 Jun 2019 23:26:21 +0900
Subject: [PATCH] net: openvswitch: do not free vport if register_netdevice()
@@ -48,12 +48,13 @@ Fixes: cf124db566e6 ("net: Fix inconsistent teardown and release of private netd
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Reviewed-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c
-index 26f71cbf7527..5993405c25c1 100644
+index bb95c43aae76..5a304cfc8423 100644
--- a/net/openvswitch/vport-internal_dev.c
+++ b/net/openvswitch/vport-internal_dev.c
-@@ -170,7 +170,9 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
+@@ -169,7 +169,9 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
{
struct vport *vport;
struct internal_dev *internal_dev;
@@ -63,7 +64,7 @@ index 26f71cbf7527..5993405c25c1 100644
vport = ovs_vport_alloc(0, &ovs_internal_vport_ops, parms);
if (IS_ERR(vport)) {
-@@ -178,8 +180,9 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
+@@ -177,8 +179,9 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
goto error;
}
@@ -75,7 +76,7 @@ index 26f71cbf7527..5993405c25c1 100644
if (!vport->dev) {
err = -ENOMEM;
goto error_free_vport;
-@@ -200,8 +203,10 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
+@@ -199,8 +202,10 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
rtnl_lock();
err = register_netdevice(vport->dev);
@@ -87,7 +88,7 @@ index 26f71cbf7527..5993405c25c1 100644
dev_set_promiscuity(vport->dev, 1);
rtnl_unlock();
-@@ -211,11 +216,12 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
+@@ -210,11 +215,12 @@ static struct vport *internal_dev_create(const struct vport_parms *parms)
error_unlock:
rtnl_unlock();
diff --git a/queue/net-phy-dp83867-Set-up-RGMII-TX-delay.patch b/queue/net-phy-dp83867-Set-up-RGMII-TX-delay.patch
index 7103807..df7769a 100644
--- a/queue/net-phy-dp83867-Set-up-RGMII-TX-delay.patch
+++ b/queue/net-phy-dp83867-Set-up-RGMII-TX-delay.patch
@@ -1,4 +1,4 @@
-From 2b892649254fec01678c64f16427622b41fa27f4 Mon Sep 17 00:00:00 2001
+From 981c199257fe5acae95d6b3a456ac4ffe5d8cb77 Mon Sep 17 00:00:00 2001
From: Max Uvarov <muvarov@gmail.com>
Date: Tue, 28 May 2019 13:00:52 +0300
Subject: [PATCH] net: phy: dp83867: Set up RGMII TX delay
@@ -13,12 +13,13 @@ Signed-off-by: Max Uvarov <muvarov@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c
-index 1ec48ecf4133..c71c7d0f53f0 100644
+index b3935778b19f..e4bf9e7d7583 100644
--- a/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
-@@ -255,10 +255,8 @@ static int dp83867_config_init(struct phy_device *phydev)
+@@ -260,10 +260,8 @@ static int dp83867_config_init(struct phy_device *phydev)
ret = phy_write(phydev, MII_DP83867_PHYCTRL, val);
if (ret)
return ret;
diff --git a/queue/net-phylink-ensure-consistent-phy-interface-mode.patch b/queue/net-phylink-ensure-consistent-phy-interface-mode.patch
index 3786d9d..557a5d2 100644
--- a/queue/net-phylink-ensure-consistent-phy-interface-mode.patch
+++ b/queue/net-phylink-ensure-consistent-phy-interface-mode.patch
@@ -1,4 +1,4 @@
-From c678726305b9425454be7c8a7624290b602602fc Mon Sep 17 00:00:00 2001
+From 656f043a675f974561e52587a844d8bd95cf7efb Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 28 May 2019 10:27:21 +0100
Subject: [PATCH] net: phylink: ensure consistent phy interface mode
@@ -13,12 +13,13 @@ same interface mode.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
-index 74983593834b..9044b95d2afe 100644
+index 06bfd51670d8..2e157f475210 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -51,6 +51,10 @@ struct phylink {
+@@ -54,6 +54,10 @@ struct phylink {
/* The link configuration settings */
struct phylink_link_state link_config;
@@ -29,7 +30,7 @@ index 74983593834b..9044b95d2afe 100644
struct gpio_desc *link_gpio;
struct timer_list link_poll;
void (*get_fixed_state)(struct net_device *dev,
-@@ -446,12 +450,12 @@ static void phylink_resolve(struct work_struct *w)
+@@ -477,12 +481,12 @@ static void phylink_resolve(struct work_struct *w)
if (!link_state.link) {
netif_carrier_off(ndev);
pl->ops->mac_link_down(ndev, pl->link_an_mode,
diff --git a/queue/net-sh_eth-fix-mdio-access-in-sh_eth_close-for-R-Car.patch b/queue/net-sh_eth-fix-mdio-access-in-sh_eth_close-for-R-Car.patch
index 0524732..6c93c9f 100644
--- a/queue/net-sh_eth-fix-mdio-access-in-sh_eth_close-for-R-Car.patch
+++ b/queue/net-sh_eth-fix-mdio-access-in-sh_eth_close-for-R-Car.patch
@@ -1,4 +1,4 @@
-From 315ca92dd863fecbffc0bb52ae0ac11e0398726a Mon Sep 17 00:00:00 2001
+From a35caad352a9c961d7cb52f93840887b6412cc9b Mon Sep 17 00:00:00 2001
From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Date: Tue, 28 May 2019 13:10:46 +0900
Subject: [PATCH] net: sh_eth: fix mdio access in sh_eth_close() for R-Car Gen2
@@ -26,12 +26,13 @@ off).
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.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/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 6354f19a31eb..7ba35a0bdb29 100644
+index 6520379b390e..57870009902b 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1594,6 +1594,10 @@ static void sh_eth_dev_exit(struct net_device *ndev)
+@@ -1600,6 +1600,10 @@ static void sh_eth_dev_exit(struct net_device *ndev)
sh_eth_get_stats(ndev);
mdp->cd->soft_reset(ndev);
diff --git a/queue/net-stmmac-update-rx-tail-pointer-register-to-fix-rx.patch b/queue/net-stmmac-update-rx-tail-pointer-register-to-fix-rx.patch
index 355281d..611f306 100644
--- a/queue/net-stmmac-update-rx-tail-pointer-register-to-fix-rx.patch
+++ b/queue/net-stmmac-update-rx-tail-pointer-register-to-fix-rx.patch
@@ -1,4 +1,4 @@
-From 4523a5611526709ec9b4e2574f1bb7818212651e Mon Sep 17 00:00:00 2001
+From cf1d4746fbe6a1b37803c6398bd0e5048ec6c7be Mon Sep 17 00:00:00 2001
From: Biao Huang <biao.huang@mediatek.com>
Date: Fri, 24 May 2019 14:26:07 +0800
Subject: [PATCH] net: stmmac: update rx tail pointer register to fix rx dma
@@ -16,12 +16,13 @@ to the rx channel, so packets can be received continually
Fixes: 54139cf3bb33 ("net: stmmac: adding multiple buffers for rx")
Signed-off-by: Biao Huang <biao.huang@mediatek.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/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-index 2a1052704885..bc93c355f403 100644
+index b756fc6a0532..5dd303212e28 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -3338,6 +3338,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
+@@ -3298,6 +3298,7 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
entry = STMMAC_GET_ENTRY(entry, DMA_RX_SIZE);
}
rx_q->dirty_rx = entry;
diff --git a/queue/net-thunderbolt-Unregister-ThunderboltIP-protocol-ha.patch b/queue/net-thunderbolt-Unregister-ThunderboltIP-protocol-ha.patch
index 27717d6..8983e01 100644
--- a/queue/net-thunderbolt-Unregister-ThunderboltIP-protocol-ha.patch
+++ b/queue/net-thunderbolt-Unregister-ThunderboltIP-protocol-ha.patch
@@ -1,4 +1,4 @@
-From 9872760eb7b1d4f6066ad8b560714a5d0a728fdb Mon Sep 17 00:00:00 2001
+From e6f305faef5b7df0bd36b2283bee9568f7f83220 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Fri, 28 Sep 2018 12:21:17 +0300
Subject: [PATCH] net: thunderbolt: Unregister ThunderboltIP protocol handler
@@ -17,12 +17,13 @@ suspending and registering it back on resume.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c
-index c48c3a1eb1f8..fcf31335a8b6 100644
+index e0d6760f3219..4b5af2413970 100644
--- a/drivers/net/thunderbolt.c
+++ b/drivers/net/thunderbolt.c
-@@ -1282,6 +1282,7 @@ static int __maybe_unused tbnet_suspend(struct device *dev)
+@@ -1285,6 +1285,7 @@ static int __maybe_unused tbnet_suspend(struct device *dev)
tbnet_tear_down(net, true);
}
@@ -30,7 +31,7 @@ index c48c3a1eb1f8..fcf31335a8b6 100644
return 0;
}
-@@ -1290,6 +1291,8 @@ static int __maybe_unused tbnet_resume(struct device *dev)
+@@ -1293,6 +1294,8 @@ static int __maybe_unused tbnet_resume(struct device *dev)
struct tb_service *svc = tb_to_service(dev);
struct tbnet *net = tb_service_get_drvdata(svc);
diff --git a/queue/net-tulip-de4x5-Drop-redundant-MODULE_DEVICE_TABLE.patch b/queue/net-tulip-de4x5-Drop-redundant-MODULE_DEVICE_TABLE.patch
index 8ad72ff..4b7d753 100644
--- a/queue/net-tulip-de4x5-Drop-redundant-MODULE_DEVICE_TABLE.patch
+++ b/queue/net-tulip-de4x5-Drop-redundant-MODULE_DEVICE_TABLE.patch
@@ -1,4 +1,4 @@
-From 3e66b7cc50ef921121babc91487e1fb98af1ba6e Mon Sep 17 00:00:00 2001
+From 05584de3b8f670dd6141fe48088e184f9d26f997 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Fri, 24 May 2019 13:20:19 -0700
Subject: [PATCH] net: tulip: de4x5: Drop redundant MODULE_DEVICE_TABLE()
@@ -32,9 +32,10 @@ use of MODULE_DEVICE_TABLE().
Fixes: 07563c711fbc ("EISA bus MODALIAS attributes support")
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
-index 66535d1653f6..f16853c3c851 100644
+index a31b4df3e7ff..eaffa9621ea9 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -2107,7 +2107,6 @@ static struct eisa_driver de4x5_eisa_driver = {
diff --git a/queue/netfilter-nf_conntrack_h323-restore-boundary-check-c.patch b/queue/netfilter-nf_conntrack_h323-restore-boundary-check-c.patch
index 0501a18..013d0f6 100644
--- a/queue/netfilter-nf_conntrack_h323-restore-boundary-check-c.patch
+++ b/queue/netfilter-nf_conntrack_h323-restore-boundary-check-c.patch
@@ -1,4 +1,4 @@
-From f5e85ce8e733c2547827f6268136b70b802eabdb Mon Sep 17 00:00:00 2001
+From 1eacef22c4d768c5c8af997f0944e3df38f374fe Mon Sep 17 00:00:00 2001
From: Jakub Jankowski <shasta@toxcorp.com>
Date: Thu, 25 Apr 2019 23:46:50 +0200
Subject: [PATCH] netfilter: nf_conntrack_h323: restore boundary check
@@ -21,6 +21,7 @@ To fix it, stop dereferencing bs->cur and bs->end.
Fixes: bc7d811ace4a ("netfilter: nf_ct_h323: Convert CHECK_BOUND macro to function")
Signed-off-by: Jakub Jankowski <shasta@toxcorp.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c
index 1601275efe2d..4c2ef42e189c 100644
diff --git a/queue/netfilter-nf_flow_table-check-ttl-value-in-flow-offl.patch b/queue/netfilter-nf_flow_table-check-ttl-value-in-flow-offl.patch
index caaa7b9..f5c7c10 100644
--- a/queue/netfilter-nf_flow_table-check-ttl-value-in-flow-offl.patch
+++ b/queue/netfilter-nf_flow_table-check-ttl-value-in-flow-offl.patch
@@ -1,4 +1,4 @@
-From 33cc3c0cfa64c86b6c4bbee86997aea638534931 Mon Sep 17 00:00:00 2001
+From ad9c7b5e44c15deef5bebc6106ed042863322f02 Mon Sep 17 00:00:00 2001
From: Taehee Yoo <ap420073@gmail.com>
Date: Tue, 30 Apr 2019 01:55:54 +0900
Subject: [PATCH] netfilter: nf_flow_table: check ttl value in flow offload
@@ -13,9 +13,10 @@ Fixes: 97add9f0d66d ("netfilter: flow table support for IPv4")
Fixes: 0995210753a2 ("netfilter: flow table support for IPv6")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c
-index 1d291a51cd45..46022a2867d7 100644
+index 15ed91309992..129e9ec99ec9 100644
--- a/net/netfilter/nf_flow_table_ip.c
+++ b/net/netfilter/nf_flow_table_ip.c
@@ -181,6 +181,9 @@ static int nf_flow_tuple_ip(struct sk_buff *skb, const struct net_device *dev,
@@ -28,7 +29,7 @@ index 1d291a51cd45..46022a2867d7 100644
thoff = iph->ihl * 4;
if (!pskb_may_pull(skb, thoff + sizeof(*ports)))
return -1;
-@@ -411,6 +414,9 @@ static int nf_flow_tuple_ipv6(struct sk_buff *skb, const struct net_device *dev,
+@@ -412,6 +415,9 @@ static int nf_flow_tuple_ipv6(struct sk_buff *skb, const struct net_device *dev,
ip6h->nexthdr != IPPROTO_UDP)
return -1;
diff --git a/queue/netfilter-nf_flow_table-fix-missing-error-check-for-.patch b/queue/netfilter-nf_flow_table-fix-missing-error-check-for-.patch
index 736bfbe..60aff79 100644
--- a/queue/netfilter-nf_flow_table-fix-missing-error-check-for-.patch
+++ b/queue/netfilter-nf_flow_table-fix-missing-error-check-for-.patch
@@ -1,4 +1,4 @@
-From 43c8f131184faf20c07221f3e09724611c6525d8 Mon Sep 17 00:00:00 2001
+From b882bb576a1d1223bd9fd8ff346b61b1f874b7a8 Mon Sep 17 00:00:00 2001
From: Taehee Yoo <ap420073@gmail.com>
Date: Fri, 3 May 2019 01:56:38 +0900
Subject: [PATCH] netfilter: nf_flow_table: fix missing error check for
@@ -13,12 +13,13 @@ This patch just adds missing error checking.
Fixes: ac2a66665e23 ("netfilter: add generic flow table infrastructure")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
-index 7aabfd4b1e50..a9e4f74b1ff6 100644
+index 870d7c8e1cc8..386391b46ab3 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
-@@ -185,14 +185,25 @@ static const struct rhashtable_params nf_flow_offload_rhash_params = {
+@@ -188,14 +188,25 @@ static const struct rhashtable_params nf_flow_offload_rhash_params = {
int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
{
diff --git a/queue/netfilter-nf_flow_table-fix-netdev-refcnt-leak.patch b/queue/netfilter-nf_flow_table-fix-netdev-refcnt-leak.patch
index edd13ba..d384eee 100644
--- a/queue/netfilter-nf_flow_table-fix-netdev-refcnt-leak.patch
+++ b/queue/netfilter-nf_flow_table-fix-netdev-refcnt-leak.patch
@@ -1,4 +1,4 @@
-From 26a302afbe328ecb7507cae2035d938e6635131b Mon Sep 17 00:00:00 2001
+From 327a82b0deab3dec87a3a34cc251c78b9d10616c Mon Sep 17 00:00:00 2001
From: Taehee Yoo <ap420073@gmail.com>
Date: Tue, 30 Apr 2019 01:55:29 +0900
Subject: [PATCH] netfilter: nf_flow_table: fix netdev refcnt leak
@@ -18,12 +18,13 @@ message is printed:
Fixes: ac2a66665e23 ("netfilter: add generic flow table infrastructure")
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
-index 8968c7f5a72e..69d7a8439c7a 100644
+index 436cc14cfc59..7f85af4c40ff 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
-@@ -112,6 +112,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
+@@ -113,6 +113,7 @@ static void nft_flow_offload_eval(const struct nft_expr *expr,
if (ret < 0)
goto err_flow_add;
diff --git a/queue/netfilter-nf_queue-fix-reinject-verdict-handling.patch b/queue/netfilter-nf_queue-fix-reinject-verdict-handling.patch
index 5255d0e..b2a0849 100644
--- a/queue/netfilter-nf_queue-fix-reinject-verdict-handling.patch
+++ b/queue/netfilter-nf_queue-fix-reinject-verdict-handling.patch
@@ -1,4 +1,4 @@
-From 946c0d8e6ed43dae6527e878d0077c1e11015db0 Mon Sep 17 00:00:00 2001
+From f284da864a7e978edcd6507ed6627535656fa7f3 Mon Sep 17 00:00:00 2001
From: Jagdish Motwani <jagdish.motwani@sophos.com>
Date: Mon, 13 May 2019 23:47:40 +0530
Subject: [PATCH] netfilter: nf_queue: fix reinject verdict handling
@@ -15,12 +15,13 @@ reinjects the packet, it re-executes hooks in between.
Fixes: 960632ece694 ("netfilter: convert hook list to an array")
Signed-off-by: Jagdish Motwani <jagdish.motwani@sophos.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
-index 9dc1d6e04946..b5b2be55ca82 100644
+index d67a96a25a68..7569ba00e732 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
-@@ -255,6 +255,7 @@ static unsigned int nf_iterate(struct sk_buff *skb,
+@@ -238,6 +238,7 @@ static unsigned int nf_iterate(struct sk_buff *skb,
repeat:
verdict = nf_hook_entry_hookfn(hook, skb, state);
if (verdict != NF_ACCEPT) {
diff --git a/queue/nfc-Ensure-presence-of-required-attributes-in-the-de.patch b/queue/nfc-Ensure-presence-of-required-attributes-in-the-de.patch
index 41e66a8..668f7af 100644
--- a/queue/nfc-Ensure-presence-of-required-attributes-in-the-de.patch
+++ b/queue/nfc-Ensure-presence-of-required-attributes-in-the-de.patch
@@ -1,4 +1,4 @@
-From 385097a3675749cbc9e97c085c0e5dfe4269ca51 Mon Sep 17 00:00:00 2001
+From 27eda75835134b01e0e7dbeacc18e38e7e87253e Mon Sep 17 00:00:00 2001
From: Young Xiao <92siuyang@gmail.com>
Date: Fri, 14 Jun 2019 15:13:02 +0800
Subject: [PATCH] nfc: Ensure presence of required attributes in the
@@ -14,12 +14,13 @@ if they omit one or both of these attributes.
Signed-off-by: Young Xiao <92siuyang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
-index 1180b3e58a0a..ea64c90b14e8 100644
+index 376181cc1def..9f2875efb4ac 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
-@@ -911,7 +911,8 @@ static int nfc_genl_deactivate_target(struct sk_buff *skb,
+@@ -922,7 +922,8 @@ static int nfc_genl_deactivate_target(struct sk_buff *skb,
u32 device_idx, target_idx;
int rc;
diff --git a/queue/nfsd-allow-fh_want_write-to-be-called-twice.patch b/queue/nfsd-allow-fh_want_write-to-be-called-twice.patch
index f3509ab..0abcb41 100644
--- a/queue/nfsd-allow-fh_want_write-to-be-called-twice.patch
+++ b/queue/nfsd-allow-fh_want_write-to-be-called-twice.patch
@@ -1,4 +1,4 @@
-From 0b8f62625dc309651d0efcb6a6247c933acd8b45 Mon Sep 17 00:00:00 2001
+From ab9c1b5a799ed9068946bf825c04d5ce6176a8c3 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 12 Apr 2019 16:37:30 -0400
Subject: [PATCH] nfsd: allow fh_want_write to be called twice
@@ -24,6 +24,7 @@ fh_want_write()/fh_drop_write() imbalances so for now I think we need it
to be more forgiving.
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/nfsd/vfs.h b/fs/nfsd/vfs.h
index a7e107309f76..db351247892d 100644
diff --git a/queue/nfsd-avoid-uninitialized-variable-warning.patch b/queue/nfsd-avoid-uninitialized-variable-warning.patch
index 3b73a5e..5dbd805 100644
--- a/queue/nfsd-avoid-uninitialized-variable-warning.patch
+++ b/queue/nfsd-avoid-uninitialized-variable-warning.patch
@@ -1,4 +1,4 @@
-From 8cadf7eb6e26317aebc065ff7f8f5f226fe712d6 Mon Sep 17 00:00:00 2001
+From 54e4ea54100518651b53716f51bd0622a5cd12b7 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 22 Mar 2019 15:07:11 +0100
Subject: [PATCH] nfsd: avoid uninitialized variable warning
@@ -22,6 +22,7 @@ avoids the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index a96843c59fc1..ca1cd2bf8ba6 100644
diff --git a/queue/nouveau-Fix-build-with-CONFIG_NOUVEAU_LEGACY_CTX_SUP.patch b/queue/nouveau-Fix-build-with-CONFIG_NOUVEAU_LEGACY_CTX_SUP.patch
index 347cec7..b6156ff 100644
--- a/queue/nouveau-Fix-build-with-CONFIG_NOUVEAU_LEGACY_CTX_SUP.patch
+++ b/queue/nouveau-Fix-build-with-CONFIG_NOUVEAU_LEGACY_CTX_SUP.patch
@@ -1,4 +1,4 @@
-From d556dbb5c959a59ab9d9f1d76515b04af1f9438b Mon Sep 17 00:00:00 2001
+From 0711a3703a3826682acd4310015d98313c9026bc Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sat, 15 Jun 2019 12:22:44 +0300
Subject: [PATCH] nouveau: Fix build with CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT
@@ -33,6 +33,7 @@ Cc: stable@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 8c093ca4222e..ab47783f459d 100644
diff --git a/queue/ntp-Allow-TAI-UTC-offset-to-be-set-to-zero.patch b/queue/ntp-Allow-TAI-UTC-offset-to-be-set-to-zero.patch
index 8e23e3e..ec54713 100644
--- a/queue/ntp-Allow-TAI-UTC-offset-to-be-set-to-zero.patch
+++ b/queue/ntp-Allow-TAI-UTC-offset-to-be-set-to-zero.patch
@@ -1,4 +1,4 @@
-From fdc6bae940ee9eb869e493990540098b8c0fd6ab Mon Sep 17 00:00:00 2001
+From 480961d7ccdd113fd04e90c06aa51c7769ef95dd Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 17 Apr 2019 10:48:33 +0200
Subject: [PATCH] ntp: Allow TAI-UTC offset to be set to zero
@@ -23,12 +23,13 @@ Cc: John Stultz <john.stultz@linaro.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Link: https://lkml.kernel.org/r/20190417084833.7401-1-mlichvar@redhat.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
-index 92a90014a925..f43d47c8c3b6 100644
+index a09ded765f6c..33b3ec9ff28d 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
-@@ -690,7 +690,7 @@ static inline void process_adjtimex_modes(const struct __kernel_timex *txc,
+@@ -700,7 +700,7 @@ static inline void process_adjtimex_modes(struct timex *txc,
time_constant = max(time_constant, 0l);
}
diff --git a/queue/nvme-fix-memory-leak-for-power-latency-tolerance.patch b/queue/nvme-fix-memory-leak-for-power-latency-tolerance.patch
index 8d91c7b..27bb318 100644
--- a/queue/nvme-fix-memory-leak-for-power-latency-tolerance.patch
+++ b/queue/nvme-fix-memory-leak-for-power-latency-tolerance.patch
@@ -1,4 +1,4 @@
-From 510a405d945bc985abc513fafe45890cac34fafa Mon Sep 17 00:00:00 2001
+From fa17480349c3ef54aedea4270554340c1c6afe47 Mon Sep 17 00:00:00 2001
From: Yufen Yu <yuyufen@huawei.com>
Date: Thu, 16 May 2019 19:30:07 -0700
Subject: [PATCH] nvme: fix memory leak for power latency tolerance
@@ -16,12 +16,13 @@ Tested-by: David Milburn <dmilburn@redhat.com>
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
[changelog]
Signed-off-by: Keith Busch <keith.busch@intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index d4226c18eb71..e1449c196f20 100644
+index e918f0ad0459..22fc283e77b6 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
-@@ -3700,6 +3700,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl);
+@@ -3492,6 +3492,7 @@ EXPORT_SYMBOL_GPL(nvme_start_ctrl);
void nvme_uninit_ctrl(struct nvme_ctrl *ctrl)
{
diff --git a/queue/nvme-fix-srcu-locking-on-error-return-in-nvme_get_ns.patch b/queue/nvme-fix-srcu-locking-on-error-return-in-nvme_get_ns.patch
index f86cdae..e2c0abc 100644
--- a/queue/nvme-fix-srcu-locking-on-error-return-in-nvme_get_ns.patch
+++ b/queue/nvme-fix-srcu-locking-on-error-return-in-nvme_get_ns.patch
@@ -1,4 +1,4 @@
-From 100c815cbd56480b3e31518475b04719c363614a Mon Sep 17 00:00:00 2001
+From 6bf440090fd72f1c6294d435f56701bfee6b8d96 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 May 2019 02:47:33 -0700
Subject: [PATCH] nvme: fix srcu locking on error return in
@@ -13,12 +13,13 @@ Just do what callers would usually expect.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 308b9ce820cd..421bffd95aee 100644
+index 0dae0fca9a23..bd7093dad7be 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
-@@ -1361,9 +1361,14 @@ static struct nvme_ns *nvme_get_ns_from_disk(struct gendisk *disk,
+@@ -1265,9 +1265,14 @@ static struct nvme_ns *nvme_get_ns_from_disk(struct gendisk *disk,
{
#ifdef CONFIG_NVME_MULTIPATH
if (disk->fops == &nvme_ns_head_ops) {
@@ -34,7 +35,7 @@ index 308b9ce820cd..421bffd95aee 100644
}
#endif
*head = NULL;
-@@ -1410,9 +1415,9 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -1314,9 +1319,9 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
ns = nvme_get_ns_from_disk(bdev->bd_disk, &head, &srcu_idx);
if (unlikely(!ns))
diff --git a/queue/nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch b/queue/nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch
index c01abf3..6cdb341 100644
--- a/queue/nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch
+++ b/queue/nvme-merge-nvme_ns_ioctl-into-nvme_ioctl.patch
@@ -1,4 +1,4 @@
-From 90ec611adcf20b96d0c2b7166497d53e4301a57f Mon Sep 17 00:00:00 2001
+From 4d3bf4eb32014bff4fc5cc1f615299bc105da8e2 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 May 2019 02:47:35 -0700
Subject: [PATCH] nvme: merge nvme_ns_ioctl into nvme_ioctl
@@ -10,12 +10,13 @@ Merge the two functions to make future changes a little easier.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 4352f8582213..bc288990fd50 100644
+index 31243a03c34e..0eadfe715452 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
-@@ -1382,32 +1382,11 @@ static void nvme_put_ns_from_disk(struct nvme_ns_head *head, int idx)
+@@ -1286,32 +1286,11 @@ static void nvme_put_ns_from_disk(struct nvme_ns_head *head, int idx)
srcu_read_unlock(&head->srcu, idx);
}
@@ -49,7 +50,7 @@ index 4352f8582213..bc288990fd50 100644
struct nvme_ns *ns;
int srcu_idx, ret;
-@@ -1415,7 +1394,29 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -1319,7 +1298,29 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
if (unlikely(!ns))
return -EWOULDBLOCK;
diff --git a/queue/nvme-pci-shutdown-on-timeout-during-deletion.patch b/queue/nvme-pci-shutdown-on-timeout-during-deletion.patch
index 874e956..4304b04 100644
--- a/queue/nvme-pci-shutdown-on-timeout-during-deletion.patch
+++ b/queue/nvme-pci-shutdown-on-timeout-during-deletion.patch
@@ -1,4 +1,4 @@
-From 9dc1a38ef1925d23c2933c5867df816386d92ff8 Mon Sep 17 00:00:00 2001
+From 7db99e159ab9863fbe481f5842bada4196736ecf Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Tue, 30 Apr 2019 09:33:40 -0600
Subject: [PATCH] nvme-pci: shutdown on timeout during deletion
@@ -12,12 +12,13 @@ completions by shutting down the controller on timeout detection.
Reported-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index efc1da56521c..3df0f2b29427 100644
+index 5cc83c3a2906..38f348db6a4c 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
-@@ -1277,6 +1277,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
+@@ -1203,6 +1203,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
struct nvme_dev *dev = nvmeq->dev;
struct request *abort_req;
struct nvme_command cmd;
@@ -25,7 +26,7 @@ index efc1da56521c..3df0f2b29427 100644
u32 csts = readl(dev->bar + NVME_REG_CSTS);
/* If PCI error recovery process is happening, we cannot reset or
-@@ -1313,12 +1314,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
+@@ -1239,12 +1240,14 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
* shutdown, so we return BLK_EH_DONE.
*/
switch (dev->ctrl.state) {
diff --git a/queue/nvme-pci-unquiesce-admin-queue-on-shutdown.patch b/queue/nvme-pci-unquiesce-admin-queue-on-shutdown.patch
index 69e5c03..f892d6e 100644
--- a/queue/nvme-pci-unquiesce-admin-queue-on-shutdown.patch
+++ b/queue/nvme-pci-unquiesce-admin-queue-on-shutdown.patch
@@ -1,4 +1,4 @@
-From c8e9e9b7646ebe1c5066ddc420d7630876277eb4 Mon Sep 17 00:00:00 2001
+From ece338cbb2f7dbad4f581b6c50c13953bf88c05e Mon Sep 17 00:00:00 2001
From: Keith Busch <keith.busch@intel.com>
Date: Tue, 30 Apr 2019 09:33:41 -0600
Subject: [PATCH] nvme-pci: unquiesce admin queue on shutdown
@@ -12,12 +12,13 @@ request dispatch on a permanently disabled controller.
Reported-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index 3df0f2b29427..ac10d3ad1e75 100644
+index 24e294978a94..5cc83c3a2906 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
-@@ -2437,8 +2437,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
+@@ -2258,8 +2258,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
* must flush all entered requests to their failed completion to avoid
* deadlocking blk-mq hot-cpu notifier.
*/
diff --git a/queue/nvme-release-namespace-SRCU-protection-before-perfor.patch b/queue/nvme-release-namespace-SRCU-protection-before-perfor.patch
index 22f464a..2140dd4 100644
--- a/queue/nvme-release-namespace-SRCU-protection-before-perfor.patch
+++ b/queue/nvme-release-namespace-SRCU-protection-before-perfor.patch
@@ -1,4 +1,4 @@
-From 5fb4aac756acacf260b9ebd88747251effa3a2f2 Mon Sep 17 00:00:00 2001
+From 5e4ca0a0c44679b5500e8ced757a8918b59a7d69 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 May 2019 11:47:36 +0200
Subject: [PATCH] nvme: release namespace SRCU protection before performing
@@ -15,12 +15,13 @@ Reported-by: Kenneth Heitke <kenneth.heitke@intel.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index bc288990fd50..d4226c18eb71 100644
+index 0eadfe715452..e918f0ad0459 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
-@@ -1394,14 +1394,31 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -1298,14 +1298,31 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
if (unlikely(!ns))
return -EWOULDBLOCK;
@@ -55,7 +56,7 @@ index bc288990fd50..d4226c18eb71 100644
case NVME_IOCTL_IO_CMD:
ret = nvme_user_cmd(ns->ctrl, ns, argp);
break;
-@@ -1411,8 +1428,6 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -1315,8 +1332,6 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
default:
if (ns->ndev)
ret = nvme_nvm_ioctl(ns, cmd, arg);
diff --git a/queue/nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch b/queue/nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch
index 52e6af0..fa74055 100644
--- a/queue/nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch
+++ b/queue/nvme-remove-the-ifdef-around-nvme_nvm_ioctl.patch
@@ -1,4 +1,4 @@
-From 3f98bcc58cd5f1e4668db289dcab771874cc0920 Mon Sep 17 00:00:00 2001
+From 135362fe75924bc91ba2327992679fba9882accf Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 May 2019 02:47:34 -0700
Subject: [PATCH] nvme: remove the ifdef around nvme_nvm_ioctl
@@ -11,12 +11,13 @@ with the ifdef.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 421bffd95aee..4352f8582213 100644
+index bd7093dad7be..31243a03c34e 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
-@@ -1395,10 +1395,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
+@@ -1299,10 +1299,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
case NVME_IOCTL_SUBMIT_IO:
return nvme_submit_io(ns, (void __user *)arg);
default:
diff --git a/queue/nvmem-core-fix-read-buffer-in-place.patch b/queue/nvmem-core-fix-read-buffer-in-place.patch
index 3218254..7f43508 100644
--- a/queue/nvmem-core-fix-read-buffer-in-place.patch
+++ b/queue/nvmem-core-fix-read-buffer-in-place.patch
@@ -1,4 +1,4 @@
-From 2fe518fecb3a4727393be286db9804cd82ee2d91 Mon Sep 17 00:00:00 2001
+From af6fdb82c996018e5ad2cdcdb6e1b2a18813fc1a Mon Sep 17 00:00:00 2001
From: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Date: Sat, 13 Apr 2019 11:32:58 +0100
Subject: [PATCH] nvmem: core: fix read buffer in place
@@ -19,12 +19,13 @@ cleared.
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
-index 1d00f5671368..5abebf2128b8 100644
+index 122b52d0ebfd..a6f28082d544 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
-@@ -1166,7 +1166,7 @@ EXPORT_SYMBOL_GPL(nvmem_cell_put);
+@@ -1030,7 +1030,7 @@ EXPORT_SYMBOL_GPL(nvmem_cell_put);
static void nvmem_shift_read_buffer_in_place(struct nvmem_cell *cell, void *buf)
{
u8 *p, *b;
@@ -33,7 +34,7 @@ index 1d00f5671368..5abebf2128b8 100644
p = b = buf;
if (bit_offset) {
-@@ -1181,11 +1181,16 @@ static void nvmem_shift_read_buffer_in_place(struct nvmem_cell *cell, void *buf)
+@@ -1045,11 +1045,16 @@ static void nvmem_shift_read_buffer_in_place(struct nvmem_cell *cell, void *buf)
p = b;
*b++ >>= bit_offset;
}
diff --git a/queue/nvmem-sunxi_sid-Support-SID-on-A83T-and-H5.patch b/queue/nvmem-sunxi_sid-Support-SID-on-A83T-and-H5.patch
index c88a73a..372e71c 100644
--- a/queue/nvmem-sunxi_sid-Support-SID-on-A83T-and-H5.patch
+++ b/queue/nvmem-sunxi_sid-Support-SID-on-A83T-and-H5.patch
@@ -1,4 +1,4 @@
-From da75b8909756160b8e785104ba421a20b756c975 Mon Sep 17 00:00:00 2001
+From bdf3528ea216edf52727f05ca4218ce80a1a09c0 Mon Sep 17 00:00:00 2001
From: Chen-Yu Tsai <wens@csie.org>
Date: Sat, 13 Apr 2019 11:32:53 +0100
Subject: [PATCH] nvmem: sunxi_sid: Support SID on A83T and H5
@@ -17,12 +17,13 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
-index 14c114620ed6..e7936380ce89 100644
+index d020f89248fd..69f8e972e29c 100644
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
-@@ -200,8 +200,10 @@ static const struct sunxi_sid_cfg sun50i_a64_cfg = {
+@@ -235,8 +235,10 @@ static const struct sunxi_sid_cfg sun50i_a64_cfg = {
static const struct of_device_id sunxi_sid_of_match[] = {
{ .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg },
{ .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg },
diff --git a/queue/objtool-Don-t-use-ignore-flag-for-fake-jumps.patch b/queue/objtool-Don-t-use-ignore-flag-for-fake-jumps.patch
index dc29fe2..e001d15 100644
--- a/queue/objtool-Don-t-use-ignore-flag-for-fake-jumps.patch
+++ b/queue/objtool-Don-t-use-ignore-flag-for-fake-jumps.patch
@@ -1,4 +1,4 @@
-From e6da9567959e164f82bc81967e0d5b10dee870b4 Mon Sep 17 00:00:00 2001
+From 42426841197f686c116c44ccf327f3f8d9c1ddd6 Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Mon, 13 May 2019 12:01:31 -0500
Subject: [PATCH] objtool: Don't use ignore flag for fake jumps
@@ -25,9 +25,10 @@ Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/71abc072ff48b2feccc197723a9c52859476c068.1557766718.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
-index ac743a1d53ab..90226791df6b 100644
+index 1c609d88800c..c35a862f02be 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -28,6 +28,8 @@
@@ -39,7 +40,7 @@ index ac743a1d53ab..90226791df6b 100644
struct alternative {
struct list_head list;
struct instruction *insn;
-@@ -568,7 +570,7 @@ static int add_jump_destinations(struct objtool_file *file)
+@@ -501,7 +503,7 @@ static int add_jump_destinations(struct objtool_file *file)
insn->type != INSN_JUMP_UNCONDITIONAL)
continue;
@@ -48,7 +49,7 @@ index ac743a1d53ab..90226791df6b 100644
continue;
rela = find_rela_by_dest_range(insn->sec, insn->offset,
-@@ -745,10 +747,10 @@ static int handle_group_alt(struct objtool_file *file,
+@@ -670,10 +672,10 @@ static int handle_group_alt(struct objtool_file *file,
clear_insn_state(&fake_jump->state);
fake_jump->sec = special_alt->new_sec;
diff --git a/queue/ocfs2-fix-error-path-kobject-memory-leak.patch b/queue/ocfs2-fix-error-path-kobject-memory-leak.patch
index 835e3a6..eb3d4cc 100644
--- a/queue/ocfs2-fix-error-path-kobject-memory-leak.patch
+++ b/queue/ocfs2-fix-error-path-kobject-memory-leak.patch
@@ -1,4 +1,4 @@
-From b9fba67b3806e21b98bd5a98dc3921a8e9b42d61 Mon Sep 17 00:00:00 2001
+From 3257138f518fa52e16a94cf6769d367851d9bbf7 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <tobin@kernel.org>
Date: Fri, 31 May 2019 22:30:29 -0700
Subject: [PATCH] ocfs2: fix error path kobject memory leak
@@ -24,6 +24,7 @@ Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c
index f65f2b2f594d..1906cc962c4d 100644
diff --git a/queue/percpu-do-not-search-past-bitmap-when-allocating-an-.patch b/queue/percpu-do-not-search-past-bitmap-when-allocating-an-.patch
index fea2b62..efa5f43 100644
--- a/queue/percpu-do-not-search-past-bitmap-when-allocating-an-.patch
+++ b/queue/percpu-do-not-search-past-bitmap-when-allocating-an-.patch
@@ -1,4 +1,4 @@
-From 8c43004af01635cc9fbb11031d070e5e0d327ef2 Mon Sep 17 00:00:00 2001
+From 30128d8d7bb06a77f0f56d339ff8b71530567a38 Mon Sep 17 00:00:00 2001
From: Dennis Zhou <dennis@kernel.org>
Date: Thu, 21 Feb 2019 15:54:11 -0800
Subject: [PATCH] percpu: do not search past bitmap when allocating an area
@@ -17,12 +17,13 @@ in a chunk.
Signed-off-by: Dennis Zhou <dennis@kernel.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/percpu.c b/mm/percpu.c
-index 938f295a60d4..769b7583975b 100644
+index 1adbff41b31d..5babf57d6faa 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
-@@ -988,7 +988,8 @@ static int pcpu_alloc_area(struct pcpu_chunk *chunk, int alloc_bits,
+@@ -980,7 +980,8 @@ static int pcpu_alloc_area(struct pcpu_chunk *chunk, int alloc_bits,
/*
* Search to find a fit.
*/
diff --git a/queue/percpu-remove-spurious-lock-dependency-between-percp.patch b/queue/percpu-remove-spurious-lock-dependency-between-percp.patch
index b4b94cb..97d730d 100644
--- a/queue/percpu-remove-spurious-lock-dependency-between-percp.patch
+++ b/queue/percpu-remove-spurious-lock-dependency-between-percp.patch
@@ -1,4 +1,4 @@
-From 198790d9a3aeaef5792d33a560020861126edc22 Mon Sep 17 00:00:00 2001
+From 1c4ed7d732726bda6521b9d3275f674cb825e2d7 Mon Sep 17 00:00:00 2001
From: John Sperbeck <jsperbeck@google.com>
Date: Tue, 7 May 2019 18:43:20 -0700
Subject: [PATCH] percpu: remove spurious lock dependency between percpu and
@@ -138,12 +138,13 @@ Call Trace:
Signed-off-by: John Sperbeck <jsperbeck@google.com>
Signed-off-by: Dennis Zhou <dennis@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/mm/percpu.c b/mm/percpu.c
-index 30e683f42861..7d038393d8f5 100644
+index 69b0b29fdfde..1adbff41b31d 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
-@@ -1959,6 +1959,7 @@ void free_percpu(void __percpu *ptr)
+@@ -1711,6 +1711,7 @@ void free_percpu(void __percpu *ptr)
struct pcpu_chunk *chunk;
unsigned long flags;
int off;
@@ -151,7 +152,7 @@ index 30e683f42861..7d038393d8f5 100644
if (!ptr)
return;
-@@ -1980,7 +1981,7 @@ void free_percpu(void __percpu *ptr)
+@@ -1732,7 +1733,7 @@ void free_percpu(void __percpu *ptr)
list_for_each_entry(pos, &pcpu_slot[pcpu_nr_slots - 1], list)
if (pos != chunk) {
@@ -160,7 +161,7 @@ index 30e683f42861..7d038393d8f5 100644
break;
}
}
-@@ -1988,6 +1989,9 @@ void free_percpu(void __percpu *ptr)
+@@ -1740,6 +1741,9 @@ void free_percpu(void __percpu *ptr)
trace_percpu_free_percpu(chunk->base_addr, off, ptr);
spin_unlock_irqrestore(&pcpu_lock, flags);
diff --git a/queue/perf-data-Fix-strncat-may-truncate-build-failure-wit.patch b/queue/perf-data-Fix-strncat-may-truncate-build-failure-wit.patch
index f7317df..0ebeedb 100644
--- a/queue/perf-data-Fix-strncat-may-truncate-build-failure-wit.patch
+++ b/queue/perf-data-Fix-strncat-may-truncate-build-failure-wit.patch
@@ -1,4 +1,4 @@
-From 97acec7df172cd1e450f81f5e293c0aa145a2797 Mon Sep 17 00:00:00 2001
+From 6021414878c7b2066a578e51eb34b49810cce35c Mon Sep 17 00:00:00 2001
From: Shawn Landden <shawn@git.icu>
Date: Sat, 18 May 2019 15:32:38 -0300
Subject: [PATCH] perf data: Fix 'strncat may truncate' build failure with
@@ -31,9 +31,10 @@ Cc: Wang Nan <wangnan0@huawei.com>
LPU-Reference: 20190518183238.10954-1-shawn@git.icu
Link: https://lkml.kernel.org/n/tip-289f1jice17ta7tr3tstm9jm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
-index e0311c9750ad..9097543a818b 100644
+index 5744c12641a5..2d5bd237b85a 100644
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -271,7 +271,7 @@ static int string_set_value(struct bt_ctf_field *field, const char *string)
diff --git a/queue/perf-namespace-Protect-reading-thread-s-namespace.patch b/queue/perf-namespace-Protect-reading-thread-s-namespace.patch
index 5eee3cd..4be95c4 100644
--- a/queue/perf-namespace-Protect-reading-thread-s-namespace.patch
+++ b/queue/perf-namespace-Protect-reading-thread-s-namespace.patch
@@ -1,4 +1,4 @@
-From 6584140ba9e6762dd7ec73795243289b914f31f9 Mon Sep 17 00:00:00 2001
+From 264733a584a94bd86d4baa22e2ff980fe2419272 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@kernel.org>
Date: Wed, 22 May 2019 14:32:48 +0900
Subject: [PATCH] perf namespace: Protect reading thread's namespace
@@ -14,12 +14,13 @@ Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Krister Johansen <kjlx@templeofstupid.com>
Link: http://lkml.kernel.org/r/20190522053250.207156-2-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
-index 403045a2bbea..b413ba5b9835 100644
+index 2048d393ece6..56007a7e0b4d 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
-@@ -133,7 +133,7 @@ void thread__put(struct thread *thread)
+@@ -128,7 +128,7 @@ void thread__put(struct thread *thread)
}
}
@@ -28,7 +29,7 @@ index 403045a2bbea..b413ba5b9835 100644
{
if (list_empty(&thread->namespaces_list))
return NULL;
-@@ -141,10 +141,21 @@ struct namespaces *thread__namespaces(const struct thread *thread)
+@@ -136,10 +136,21 @@ struct namespaces *thread__namespaces(const struct thread *thread)
return list_first_entry(&thread->namespaces_list, struct namespaces, list);
}
diff --git a/queue/perf-record-Fix-s390-missing-module-symbol-and-warni.patch b/queue/perf-record-Fix-s390-missing-module-symbol-and-warni.patch
index 54b1e38..5cb7116 100644
--- a/queue/perf-record-Fix-s390-missing-module-symbol-and-warni.patch
+++ b/queue/perf-record-Fix-s390-missing-module-symbol-and-warni.patch
@@ -1,4 +1,4 @@
-From 6738028dd57df064b969d8392c943ef3b3ae705d Mon Sep 17 00:00:00 2001
+From 4fbf3f240a7882d2c963688a48f8794679b4fbd4 Mon Sep 17 00:00:00 2001
From: Thomas Richter <tmricht@linux.ibm.com>
Date: Wed, 22 May 2019 16:46:01 +0200
Subject: [PATCH] perf record: Fix s390 missing module symbol and warning for
@@ -66,6 +66,7 @@ Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Link: http://lkml.kernel.org/r/20190522144601.50763-4-tmricht@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/perf/arch/s390/util/machine.c b/tools/perf/arch/s390/util/machine.c
index 0b2054007314..a19690a17291 100644
diff --git a/queue/perf-ring-buffer-Always-use-READ-WRITE-_ONCE-for-rb-.patch b/queue/perf-ring-buffer-Always-use-READ-WRITE-_ONCE-for-rb-.patch
index 6745390..3fb58b3 100644
--- a/queue/perf-ring-buffer-Always-use-READ-WRITE-_ONCE-for-rb-.patch
+++ b/queue/perf-ring-buffer-Always-use-READ-WRITE-_ONCE-for-rb-.patch
@@ -1,4 +1,4 @@
-From 20965cc9a24e43b4272fa545f256aa57d42a9d45 Mon Sep 17 00:00:00 2001
+From 5239f27b81bdbc621a12da42dd9d986f52a06b98 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Fri, 17 May 2019 13:52:33 +0200
Subject: [PATCH] perf/ring-buffer: Always use {READ,WRITE}_ONCE() for
@@ -26,6 +26,7 @@ Cc: namhyung@kernel.org
Fixes: 7b732a750477 ("perf_counter: new output ABI - part 1")
Link: http://lkml.kernel.org/r/20190517115418.394192145@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index d32b9375ec0e..12f351b253bb 100644
diff --git a/queue/perf-ring_buffer-Add-ordering-to-rb-nest-increment.patch b/queue/perf-ring_buffer-Add-ordering-to-rb-nest-increment.patch
index 19baf58..59c6260 100644
--- a/queue/perf-ring_buffer-Add-ordering-to-rb-nest-increment.patch
+++ b/queue/perf-ring_buffer-Add-ordering-to-rb-nest-increment.patch
@@ -1,4 +1,4 @@
-From 3f9fbe9bd86c534eba2faf5d840fd44c6049f50e Mon Sep 17 00:00:00 2001
+From 817860d34d1f132b0d90430389b2ec1a93bd555e Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Fri, 17 May 2019 13:52:32 +0200
Subject: [PATCH] perf/ring_buffer: Add ordering to rb->nest increment
@@ -30,12 +30,13 @@ Cc: namhyung@kernel.org
Fixes: ef60777c9abd ("perf: Optimize the perf_output() path by removing IRQ-disables")
Link: http://lkml.kernel.org/r/20190517115418.309516009@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
-index 009467a60578..4b5f8d932400 100644
+index 31edf1f39cca..d32b9375ec0e 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
-@@ -48,6 +48,15 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
+@@ -49,6 +49,15 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
unsigned long head;
again:
diff --git a/queue/perf-ring_buffer-Fix-exposing-a-temporarily-decrease.patch b/queue/perf-ring_buffer-Fix-exposing-a-temporarily-decrease.patch
index 2da5be6..d8734e4 100644
--- a/queue/perf-ring_buffer-Fix-exposing-a-temporarily-decrease.patch
+++ b/queue/perf-ring_buffer-Fix-exposing-a-temporarily-decrease.patch
@@ -1,4 +1,4 @@
-From 1b038c6e05ff70a1e66e3e571c2e6106bdb75f53 Mon Sep 17 00:00:00 2001
+From 9f63cbfe77d6991538cec2df5a0858868c646c36 Mon Sep 17 00:00:00 2001
From: Yabin Cui <yabinc@google.com>
Date: Fri, 17 May 2019 13:52:31 +0200
Subject: [PATCH] perf/ring_buffer: Fix exposing a temporarily decreased
@@ -42,12 +42,13 @@ Cc: mark.rutland@arm.com
Fixes: ef60777c9abd ("perf: Optimize the perf_output() path by removing IRQ-disables")
Link: http://lkml.kernel.org/r/20190517115418.224478157@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
-index 674b35383491..009467a60578 100644
+index 99c7f199f2d4..31edf1f39cca 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
-@@ -51,11 +51,18 @@ again:
+@@ -52,11 +52,18 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
head = local_read(&rb->head);
/*
@@ -68,7 +69,7 @@ index 674b35383491..009467a60578 100644
/*
* Since the mmap() consumer (userspace) can run on a different CPU:
-@@ -87,9 +94,18 @@ again:
+@@ -88,9 +95,18 @@ static void perf_output_put_handle(struct perf_output_handle *handle)
rb->user_page->data_head = head;
/*
diff --git a/queue/perf-x86-intel-ds-Fix-EVENT-vs.-UEVENT-PEBS-constrai.patch b/queue/perf-x86-intel-ds-Fix-EVENT-vs.-UEVENT-PEBS-constrai.patch
index cd006d0..f65c062 100644
--- a/queue/perf-x86-intel-ds-Fix-EVENT-vs.-UEVENT-PEBS-constrai.patch
+++ b/queue/perf-x86-intel-ds-Fix-EVENT-vs.-UEVENT-PEBS-constrai.patch
@@ -1,4 +1,4 @@
-From 23e3983a466cd540ffdd2bbc6e0c51e31934f941 Mon Sep 17 00:00:00 2001
+From afba3c933f7cbd6c5f13753757ef30deb1e40cab Mon Sep 17 00:00:00 2001
From: Stephane Eranian <eranian@google.com>
Date: Mon, 20 May 2019 17:52:46 -0700
Subject: [PATCH] perf/x86/intel/ds: Fix EVENT vs. UEVENT PEBS constraints
@@ -37,9 +37,10 @@ Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: kan.liang@intel.com
Link: http://lkml.kernel.org/r/20190521005246.423-1-eranian@google.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/ds.c b/arch/x86/events/intel/ds.c
-index 7a9f5dac5abe..7acc526b4ad2 100644
+index 8dbba77e0518..7d8c3ff735c2 100644
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -684,7 +684,7 @@ struct event_constraint intel_core2_pebs_event_constraints[] = {
@@ -69,7 +70,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
/* Allow all events as PEBS with no flags */
INTEL_ALL_EVENT_CONSTRAINT(0, 0x1),
EVENT_CONSTRAINT_END
-@@ -726,7 +726,7 @@ struct event_constraint intel_nehalem_pebs_event_constraints[] = {
+@@ -732,7 +732,7 @@ struct event_constraint intel_nehalem_pebs_event_constraints[] = {
INTEL_FLAGS_EVENT_CONSTRAINT(0xcb, 0xf), /* MEM_LOAD_RETIRED.* */
INTEL_FLAGS_EVENT_CONSTRAINT(0xf7, 0xf), /* FP_ASSIST.* */
/* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */
@@ -78,7 +79,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
EVENT_CONSTRAINT_END
};
-@@ -743,7 +743,7 @@ struct event_constraint intel_westmere_pebs_event_constraints[] = {
+@@ -749,7 +749,7 @@ struct event_constraint intel_westmere_pebs_event_constraints[] = {
INTEL_FLAGS_EVENT_CONSTRAINT(0xcb, 0xf), /* MEM_LOAD_RETIRED.* */
INTEL_FLAGS_EVENT_CONSTRAINT(0xf7, 0xf), /* FP_ASSIST.* */
/* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */
@@ -87,7 +88,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
EVENT_CONSTRAINT_END
};
-@@ -752,7 +752,7 @@ struct event_constraint intel_snb_pebs_event_constraints[] = {
+@@ -758,7 +758,7 @@ struct event_constraint intel_snb_pebs_event_constraints[] = {
INTEL_PLD_CONSTRAINT(0x01cd, 0x8), /* MEM_TRANS_RETIRED.LAT_ABOVE_THR */
INTEL_PST_CONSTRAINT(0x02cd, 0x8), /* MEM_TRANS_RETIRED.PRECISE_STORES */
/* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */
@@ -96,7 +97,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
INTEL_EXCLEVT_CONSTRAINT(0xd0, 0xf), /* MEM_UOP_RETIRED.* */
INTEL_EXCLEVT_CONSTRAINT(0xd1, 0xf), /* MEM_LOAD_UOPS_RETIRED.* */
INTEL_EXCLEVT_CONSTRAINT(0xd2, 0xf), /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
-@@ -767,9 +767,9 @@ struct event_constraint intel_ivb_pebs_event_constraints[] = {
+@@ -773,9 +773,9 @@ struct event_constraint intel_ivb_pebs_event_constraints[] = {
INTEL_PLD_CONSTRAINT(0x01cd, 0x8), /* MEM_TRANS_RETIRED.LAT_ABOVE_THR */
INTEL_PST_CONSTRAINT(0x02cd, 0x8), /* MEM_TRANS_RETIRED.PRECISE_STORES */
/* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */
@@ -108,7 +109,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
INTEL_EXCLEVT_CONSTRAINT(0xd0, 0xf), /* MEM_UOP_RETIRED.* */
INTEL_EXCLEVT_CONSTRAINT(0xd1, 0xf), /* MEM_LOAD_UOPS_RETIRED.* */
INTEL_EXCLEVT_CONSTRAINT(0xd2, 0xf), /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
-@@ -783,9 +783,9 @@ struct event_constraint intel_hsw_pebs_event_constraints[] = {
+@@ -789,9 +789,9 @@ struct event_constraint intel_hsw_pebs_event_constraints[] = {
INTEL_FLAGS_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PRECDIST */
INTEL_PLD_CONSTRAINT(0x01cd, 0xf), /* MEM_TRANS_RETIRED.* */
/* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */
@@ -120,7 +121,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA(0x01c2, 0xf), /* UOPS_RETIRED.ALL */
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_XLD(0x11d0, 0xf), /* MEM_UOPS_RETIRED.STLB_MISS_LOADS */
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_XLD(0x21d0, 0xf), /* MEM_UOPS_RETIRED.LOCK_LOADS */
-@@ -806,9 +806,9 @@ struct event_constraint intel_bdw_pebs_event_constraints[] = {
+@@ -812,9 +812,9 @@ struct event_constraint intel_bdw_pebs_event_constraints[] = {
INTEL_FLAGS_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PRECDIST */
INTEL_PLD_CONSTRAINT(0x01cd, 0xf), /* MEM_TRANS_RETIRED.* */
/* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */
@@ -132,7 +133,7 @@ index 7a9f5dac5abe..7acc526b4ad2 100644
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA(0x01c2, 0xf), /* UOPS_RETIRED.ALL */
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf), /* MEM_UOPS_RETIRED.STLB_MISS_LOADS */
INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x21d0, 0xf), /* MEM_UOPS_RETIRED.LOCK_LOADS */
-@@ -829,9 +829,9 @@ struct event_constraint intel_bdw_pebs_event_constraints[] = {
+@@ -835,9 +835,9 @@ struct event_constraint intel_bdw_pebs_event_constraints[] = {
struct event_constraint intel_skl_pebs_event_constraints[] = {
INTEL_FLAGS_UEVENT_CONSTRAINT(0x1c0, 0x2), /* INST_RETIRED.PREC_DIST */
/* INST_RETIRED.PREC_DIST, inv=1, cmask=16 (cycles:ppp). */
diff --git a/queue/platform-chrome-cros_ec_proto-check-for-NULL-transfe.patch b/queue/platform-chrome-cros_ec_proto-check-for-NULL-transfe.patch
index 335dcde..2da2b14 100644
--- a/queue/platform-chrome-cros_ec_proto-check-for-NULL-transfe.patch
+++ b/queue/platform-chrome-cros_ec_proto-check-for-NULL-transfe.patch
@@ -1,4 +1,4 @@
-From 94d4e7af14a1170e34cf082d92e4c02de9e9fb88 Mon Sep 17 00:00:00 2001
+From dc33dfb41e887a9149ae44cb9092ce405008ecd0 Mon Sep 17 00:00:00 2001
From: Enrico Granata <egranata@chromium.org>
Date: Wed, 3 Apr 2019 15:40:36 -0700
Subject: [PATCH] platform/chrome: cros_ec_proto: check for NULL transfer
@@ -20,12 +20,13 @@ situation.
Signed-off-by: Enrico Granata <egranata@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c
-index 97a068dff192..3bb954997ebc 100644
+index 409e0eda4b5b..5710fed68750 100644
--- a/drivers/platform/chrome/cros_ec_proto.c
+++ b/drivers/platform/chrome/cros_ec_proto.c
-@@ -56,6 +56,17 @@ static int send_command(struct cros_ec_device *ec_dev,
+@@ -67,6 +67,17 @@ static int send_command(struct cros_ec_device *ec_dev,
else
xfer_fxn = ec_dev->cmd_xfer;
diff --git a/queue/platform-x86-intel_pmc_ipc-adding-error-handling.patch b/queue/platform-x86-intel_pmc_ipc-adding-error-handling.patch
index bcb4afc..ff7d5e6 100644
--- a/queue/platform-x86-intel_pmc_ipc-adding-error-handling.patch
+++ b/queue/platform-x86-intel_pmc_ipc-adding-error-handling.patch
@@ -1,4 +1,4 @@
-From e61985d0550df8c2078310202aaad9b41049c36c Mon Sep 17 00:00:00 2001
+From 7d11c22193ab23d8d989eef3d208f6c3a54c6abe Mon Sep 17 00:00:00 2001
From: Junxiao Chang <junxiao.chang@intel.com>
Date: Mon, 8 Apr 2019 17:40:22 +0800
Subject: [PATCH] platform/x86: intel_pmc_ipc: adding error handling
@@ -14,12 +14,13 @@ intel_pmc_ipc.
Fixes: 48c1917088ba ("platform:x86: Add Intel telemetry platform device")
Signed-off-by: Junxiao Chang <junxiao.chang@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
-index 7964ba22ef8d..d37cbd1cf58c 100644
+index e7edc8c63936..4ad9d127f2f5 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
-@@ -771,13 +771,17 @@ static int ipc_create_pmc_devices(void)
+@@ -776,13 +776,17 @@ static int ipc_create_pmc_devices(void)
if (ret) {
dev_err(ipcdev.dev, "Failed to add punit platform device\n");
platform_device_unregister(ipcdev.tco_dev);
diff --git a/queue/power-supply-max14656-fix-potential-use-before-alloc.patch b/queue/power-supply-max14656-fix-potential-use-before-alloc.patch
index 01002f2..ce5338d 100644
--- a/queue/power-supply-max14656-fix-potential-use-before-alloc.patch
+++ b/queue/power-supply-max14656-fix-potential-use-before-alloc.patch
@@ -1,4 +1,4 @@
-From 0cd0e49711556d2331a06b1117b68dd786cb54d2 Mon Sep 17 00:00:00 2001
+From 57fc651f86ddbd7b8dabec971912b90afd229c77 Mon Sep 17 00:00:00 2001
From: Sven Van Asbroeck <thesven73@gmail.com>
Date: Fri, 15 Feb 2019 16:43:02 -0500
Subject: [PATCH] power: supply: max14656: fix potential use-before-alloc
@@ -21,6 +21,7 @@ Fix by registering the power supply before requesting the irq.
Cc: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/power/supply/max14656_charger_detector.c b/drivers/power/supply/max14656_charger_detector.c
index b91b1d2999dc..d19307f791c6 100644
diff --git a/queue/powerpc-powernv-Return-for-invalid-IMC-domain.patch b/queue/powerpc-powernv-Return-for-invalid-IMC-domain.patch
index 8cb55bf..7b12c24 100644
--- a/queue/powerpc-powernv-Return-for-invalid-IMC-domain.patch
+++ b/queue/powerpc-powernv-Return-for-invalid-IMC-domain.patch
@@ -1,4 +1,4 @@
-From b59bd3527fe3c1939340df558d7f9d568fc9f882 Mon Sep 17 00:00:00 2001
+From 50c3d2b86d8b7a25c6ea36fe39b1625aa2a07996 Mon Sep 17 00:00:00 2001
From: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Date: Mon, 20 May 2019 14:27:53 +0530
Subject: [PATCH] powerpc/powernv: Return for invalid IMC domain
@@ -25,9 +25,10 @@ Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Reviewed-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
[mpe: Reword change log a bit]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
-index 3e497b91d210..52e9e159bb70 100644
+index 3d27f02695e4..828f6656f8f7 100644
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -161,6 +161,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
diff --git a/queue/ptrace-restore-smp_rmb-in-__ptrace_may_access.patch b/queue/ptrace-restore-smp_rmb-in-__ptrace_may_access.patch
index afa4b3f..2728d8b 100644
--- a/queue/ptrace-restore-smp_rmb-in-__ptrace_may_access.patch
+++ b/queue/ptrace-restore-smp_rmb-in-__ptrace_may_access.patch
@@ -1,4 +1,4 @@
-From f6581f5b55141a95657ef5742cf6a6bfa20a109f Mon Sep 17 00:00:00 2001
+From c70a130169f4075471804e31c67e19c221c43a25 Mon Sep 17 00:00:00 2001
From: Jann Horn <jannh@google.com>
Date: Wed, 29 May 2019 13:31:57 +0200
Subject: [PATCH] ptrace: restore smp_rmb() in __ptrace_may_access()
@@ -15,12 +15,13 @@ Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/cred.c b/kernel/cred.c
-index 45d77284aed0..07e069d00696 100644
+index ecf03657e71c..efd04b2ec84c 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
-@@ -450,6 +450,15 @@ int commit_creds(struct cred *new)
+@@ -448,6 +448,15 @@ int commit_creds(struct cred *new)
if (task->mm)
set_dumpable(task->mm, suid_dumpable);
task->pdeath_signal = 0;
@@ -37,7 +38,7 @@ index 45d77284aed0..07e069d00696 100644
}
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 02c6528ead5c..c9b4646ad375 100644
+index ed33066a9736..5d0838c2349e 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -323,6 +323,16 @@ static int __ptrace_may_access(struct task_struct *task, unsigned int mode)
diff --git a/queue/pwm-Fix-deadlock-warning-when-removing-PWM-device.patch b/queue/pwm-Fix-deadlock-warning-when-removing-PWM-device.patch
index 26eb3ee..d452c5d 100644
--- a/queue/pwm-Fix-deadlock-warning-when-removing-PWM-device.patch
+++ b/queue/pwm-Fix-deadlock-warning-when-removing-PWM-device.patch
@@ -1,4 +1,4 @@
-From 347ab9480313737c0f1aaa08e8f2e1a791235535 Mon Sep 17 00:00:00 2001
+From 8c453f5886c3978ee8111634165a903301bebc68 Mon Sep 17 00:00:00 2001
From: Phong Hoang <phong.hoang.wz@renesas.com>
Date: Tue, 19 Mar 2019 19:40:08 +0900
Subject: [PATCH] pwm: Fix deadlock warning when removing PWM device
@@ -171,9 +171,10 @@ Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
-index 3149204567f3..8c9200a0df5e 100644
+index 1581f6ab1b1f..c45e5719ba17 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -311,10 +311,12 @@ int pwmchip_add_with_polarity(struct pwm_chip *chip,
@@ -210,10 +211,10 @@ index 3149204567f3..8c9200a0df5e 100644
mutex_unlock(&pwm_lock);
return ret;
diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c
-index ceb233dd6048..13d9bd54dfce 100644
+index 7c71cdb8a9d8..1c64fd8e9234 100644
--- a/drivers/pwm/sysfs.c
+++ b/drivers/pwm/sysfs.c
-@@ -411,19 +411,6 @@ void pwmchip_sysfs_export(struct pwm_chip *chip)
+@@ -401,19 +401,6 @@ void pwmchip_sysfs_export(struct pwm_chip *chip)
void pwmchip_sysfs_unexport(struct pwm_chip *chip)
{
struct device *parent;
@@ -233,7 +234,7 @@ index ceb233dd6048..13d9bd54dfce 100644
unsigned int i;
parent = class_find_device(&pwm_class, NULL, chip,
-@@ -439,6 +426,7 @@ void pwmchip_sysfs_unexport_children(struct pwm_chip *chip)
+@@ -429,6 +416,7 @@ void pwmchip_sysfs_unexport_children(struct pwm_chip *chip)
}
put_device(parent);
@@ -242,10 +243,10 @@ index ceb233dd6048..13d9bd54dfce 100644
static int __init pwm_sysfs_init(void)
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
-index b628abfffacc..eaa5c6e3fc9f 100644
+index 56518adc31dd..bd7d611d63e9 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
-@@ -596,7 +596,6 @@ static inline void pwm_remove_table(struct pwm_lookup *table, size_t num)
+@@ -639,7 +639,6 @@ static inline void pwm_remove_table(struct pwm_lookup *table, size_t num)
#ifdef CONFIG_PWM_SYSFS
void pwmchip_sysfs_export(struct pwm_chip *chip);
void pwmchip_sysfs_unexport(struct pwm_chip *chip);
@@ -253,7 +254,7 @@ index b628abfffacc..eaa5c6e3fc9f 100644
#else
static inline void pwmchip_sysfs_export(struct pwm_chip *chip)
{
-@@ -605,10 +604,6 @@ static inline void pwmchip_sysfs_export(struct pwm_chip *chip)
+@@ -648,10 +647,6 @@ static inline void pwmchip_sysfs_export(struct pwm_chip *chip)
static inline void pwmchip_sysfs_unexport(struct pwm_chip *chip)
{
}
diff --git a/queue/pwm-meson-Use-the-spin-lock-only-to-protect-register.patch b/queue/pwm-meson-Use-the-spin-lock-only-to-protect-register.patch
index f63b348..2eb0c7b 100644
--- a/queue/pwm-meson-Use-the-spin-lock-only-to-protect-register.patch
+++ b/queue/pwm-meson-Use-the-spin-lock-only-to-protect-register.patch
@@ -1,4 +1,4 @@
-From f173747fffdf037c791405ab4f1ec0eb392fc48e Mon Sep 17 00:00:00 2001
+From a9c3f3b0952c07e56733bd49658840dac728e830 Mon Sep 17 00:00:00 2001
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Mon, 1 Apr 2019 19:57:48 +0200
Subject: [PATCH] pwm: meson: Use the spin-lock only to protect register
@@ -31,9 +31,10 @@ Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
-index 2ab3d216b35a..e247ab632530 100644
+index c1ed641b3e26..f6e738ad7bd9 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -111,6 +111,10 @@ struct meson_pwm {
@@ -114,7 +115,7 @@ index 2ab3d216b35a..e247ab632530 100644
}
if (state->period != channel->state.period ||
-@@ -324,7 +335,7 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+@@ -329,7 +340,7 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
err = meson_pwm_calc(meson, channel, pwm->hwpwm,
state->duty_cycle, state->period);
if (err < 0)
@@ -123,7 +124,7 @@ index 2ab3d216b35a..e247ab632530 100644
channel->state.polarity = state->polarity;
channel->state.period = state->period;
-@@ -336,9 +347,7 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
+@@ -341,9 +352,7 @@ static int meson_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
channel->state.enabled = true;
}
diff --git a/queue/pwm-tiehrpwm-Update-shadow-register-for-disabling-PW.patch b/queue/pwm-tiehrpwm-Update-shadow-register-for-disabling-PW.patch
index 97a2fd5..5797535 100644
--- a/queue/pwm-tiehrpwm-Update-shadow-register-for-disabling-PW.patch
+++ b/queue/pwm-tiehrpwm-Update-shadow-register-for-disabling-PW.patch
@@ -1,4 +1,4 @@
-From b00ef53053191d3025c15e8041699f8c9d132daf Mon Sep 17 00:00:00 2001
+From 927dbb498b2cbe8f2c919e610ad475605e7dc3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Vogtl=C3=A4nder?=
<c.vogtlaender@sigma-surface-science.com>
Date: Tue, 12 Mar 2019 14:38:46 +0530
@@ -24,6 +24,7 @@ Signed-off-by: Christoph Vogtländer <c.vogtlaender@sigma-surface-science.com>
[vigneshr@ti.com: Improve commit message]
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index f7b8a86fa5c5..ad4a40c0f27c 100644
diff --git a/queue/rapidio-fix-a-NULL-pointer-dereference-when-create_w.patch b/queue/rapidio-fix-a-NULL-pointer-dereference-when-create_w.patch
index 918e4b1..b95b675 100644
--- a/queue/rapidio-fix-a-NULL-pointer-dereference-when-create_w.patch
+++ b/queue/rapidio-fix-a-NULL-pointer-dereference-when-create_w.patch
@@ -1,4 +1,4 @@
-From 23015b22e47c5409620b1726a677d69e5cd032ba Mon Sep 17 00:00:00 2001
+From 6d4b923650da9dcbedc4d65c6a24c21a8693867c Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Tue, 14 May 2019 15:44:49 -0700
Subject: [PATCH] rapidio: fix a NULL pointer dereference when
@@ -14,12 +14,13 @@ Acked-by: Alexandre Bounine <alex.bou9@gmail.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/rapidio/rio_cm.c b/drivers/rapidio/rio_cm.c
-index cf45829585cb..b29fc258eeba 100644
+index bad0e0ea4f30..ef989a15aefc 100644
--- a/drivers/rapidio/rio_cm.c
+++ b/drivers/rapidio/rio_cm.c
-@@ -2147,6 +2147,14 @@ static int riocm_add_mport(struct device *dev,
+@@ -2145,6 +2145,14 @@ static int riocm_add_mport(struct device *dev,
mutex_init(&cm->rx_lock);
riocm_rx_fill(cm, RIOCM_RX_RING_SIZE);
cm->rx_wq = create_workqueue(DRV_NAME "/rxq");
diff --git a/queue/rtc-pcf8523-don-t-return-invalid-date-when-battery-i.patch b/queue/rtc-pcf8523-don-t-return-invalid-date-when-battery-i.patch
index 1598c7d..c098012 100644
--- a/queue/rtc-pcf8523-don-t-return-invalid-date-when-battery-i.patch
+++ b/queue/rtc-pcf8523-don-t-return-invalid-date-when-battery-i.patch
@@ -1,4 +1,4 @@
-From ecb4a353d3afd45b9bb30c85d03ee113a0589079 Mon Sep 17 00:00:00 2001
+From 49eeabc9e05bdb54b80ac6a73bcaf5eb47c81f51 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Wed, 5 Dec 2018 17:00:09 +0200
Subject: [PATCH] rtc: pcf8523: don't return invalid date when battery is low
@@ -15,6 +15,7 @@ Check the battery health on pcf8523_rtc_read_time() to avoid that.
Reported-by: Erik ÄŒuk <erik.cuk@domel.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c
index 453615f8ac9a..3fcd2cbafc84 100644
diff --git a/queue/s390-kasan-fix-strncpy_from_user-kasan-checks.patch b/queue/s390-kasan-fix-strncpy_from_user-kasan-checks.patch
index ca01fbe..b5ec966 100644
--- a/queue/s390-kasan-fix-strncpy_from_user-kasan-checks.patch
+++ b/queue/s390-kasan-fix-strncpy_from_user-kasan-checks.patch
@@ -1,4 +1,4 @@
-From 01eb42afb45719cb41bb32c278e068073738899d Mon Sep 17 00:00:00 2001
+From 6c81df274ae900605fbeb360857b4762ad52f4b4 Mon Sep 17 00:00:00 2001
From: Vasily Gorbik <gor@linux.ibm.com>
Date: Tue, 23 Apr 2019 15:36:36 +0200
Subject: [PATCH] s390/kasan: fix strncpy_from_user kasan checks
@@ -16,12 +16,13 @@ to make sure kasan checks are fully functional.
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
-index 007fcb9aeeb8..bd2fd9a7821d 100644
+index ad6b91013a05..5332f628c1ed 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
-@@ -55,8 +55,10 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n);
+@@ -56,8 +56,10 @@ raw_copy_from_user(void *to, const void __user *from, unsigned long n);
unsigned long __must_check
raw_copy_to_user(void __user *to, const void *from, unsigned long n);
diff --git a/queue/scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shift-opera.patch b/queue/scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shift-opera.patch
index ecb11c3..59bd46e 100644
--- a/queue/scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shift-opera.patch
+++ b/queue/scsi-bnx2fc-fix-incorrect-cast-to-u64-on-shift-opera.patch
@@ -1,4 +1,4 @@
-From d0c0d902339249c75da85fd9257a86cbb98dfaa5 Mon Sep 17 00:00:00 2001
+From 7f1c23ce4ad35abe366d18b6bd244f8ca88495bf Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Sat, 4 May 2019 17:48:29 +0100
Subject: [PATCH] scsi: bnx2fc: fix incorrect cast to u64 on shift operation
@@ -14,12 +14,13 @@ Fixes: 7b594769120b ("[SCSI] bnx2fc: Handle REC_TOV error code from firmware")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-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/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
-index 039328d9ef13..30e6d78e82f0 100644
+index e8ae4d671d23..097305949a95 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
-@@ -830,7 +830,7 @@ ret_err_rqe:
+@@ -830,7 +830,7 @@ static void bnx2fc_process_unsol_compl(struct bnx2fc_rport *tgt, u16 wqe)
((u64)err_entry->data.err_warn_bitmap_hi << 32) |
(u64)err_entry->data.err_warn_bitmap_lo;
for (i = 0; i < BNX2FC_NUM_ERR_BITS; i++) {
diff --git a/queue/scsi-libcxgbi-add-a-check-for-NULL-pointer-in-cxgbi_.patch b/queue/scsi-libcxgbi-add-a-check-for-NULL-pointer-in-cxgbi_.patch
index 8fbe513..4f93d38 100644
--- a/queue/scsi-libcxgbi-add-a-check-for-NULL-pointer-in-cxgbi_.patch
+++ b/queue/scsi-libcxgbi-add-a-check-for-NULL-pointer-in-cxgbi_.patch
@@ -1,4 +1,4 @@
-From cc555759117e8349088e0c5d19f2f2a500bafdbd Mon Sep 17 00:00:00 2001
+From fff17c64da9f29eebfe68426de5a932b5e1b8505 Mon Sep 17 00:00:00 2001
From: Varun Prakash <varun@chelsio.com>
Date: Wed, 22 May 2019 20:10:55 +0530
Subject: [PATCH] scsi: libcxgbi: add a check for NULL pointer in
@@ -10,12 +10,13 @@ ip_dev_find() can return NULL so add a check for NULL pointer.
Signed-off-by: Varun Prakash <varun@chelsio.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/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
-index 8b915d4ed98d..7d43e014bd21 100644
+index f2c561ca731a..cd2c247d6d0c 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
-@@ -639,6 +639,10 @@ cxgbi_check_route(struct sockaddr *dst_addr, int ifindex)
+@@ -641,6 +641,10 @@ cxgbi_check_route(struct sockaddr *dst_addr, int ifindex)
if (ndev->flags & IFF_LOOPBACK) {
ndev = ip_dev_find(&init_net, daddr->sin_addr.s_addr);
diff --git a/queue/scsi-libsas-delete-sas-port-if-expander-discover-fai.patch b/queue/scsi-libsas-delete-sas-port-if-expander-discover-fai.patch
index d602512..261d99c 100644
--- a/queue/scsi-libsas-delete-sas-port-if-expander-discover-fai.patch
+++ b/queue/scsi-libsas-delete-sas-port-if-expander-discover-fai.patch
@@ -1,4 +1,4 @@
-From 3b0541791453fbe7f42867e310e0c9eb6295364d Mon Sep 17 00:00:00 2001
+From 4d04f3d7781eafdfda848bcb8e1ad81bc1f03b5b Mon Sep 17 00:00:00 2001
From: Jason Yan <yanaijie@huawei.com>
Date: Tue, 14 May 2019 10:42:39 +0800
Subject: [PATCH] scsi: libsas: delete sas port if expander discover failed
@@ -66,12 +66,13 @@ Reported-by: Jian Luo <luojian5@huawei.com>
Signed-off-by: Jason Yan <yanaijie@huawei.com>
CC: 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 83f2fd70ce76..9f7e2457360e 100644
+index 231eb79efa32..b141d1061f38 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
-@@ -1019,6 +1019,8 @@ static struct domain_device *sas_ex_discover_expander(
+@@ -989,6 +989,8 @@ static struct domain_device *sas_ex_discover_expander(
list_del(&child->dev_list_node);
spin_unlock_irq(&parent->port->dev_list_lock);
sas_put_device(child);
diff --git a/queue/scsi-lpfc-add-check-for-loss-of-ndlp-when-sending-RR.patch b/queue/scsi-lpfc-add-check-for-loss-of-ndlp-when-sending-RR.patch
index 9b1b0ff..6e71dc9 100644
--- a/queue/scsi-lpfc-add-check-for-loss-of-ndlp-when-sending-RR.patch
+++ b/queue/scsi-lpfc-add-check-for-loss-of-ndlp-when-sending-RR.patch
@@ -1,4 +1,4 @@
-From c8cb261a072c88ca1aff0e804a30db4c7606521b Mon Sep 17 00:00:00 2001
+From 2976d1fcb7bda7b9a0caad68cdef655ebb79cad8 Mon Sep 17 00:00:00 2001
From: James Smart <jsmart2021@gmail.com>
Date: Mon, 6 May 2019 17:26:49 -0700
Subject: [PATCH] scsi: lpfc: add check for loss of ndlp when sending RRQ
@@ -12,12 +12,13 @@ Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Tested-by: Bart Van Assche <bvanassche@acm.org>
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_els.c b/drivers/scsi/lpfc/lpfc_els.c
-index c8fb0b455f2a..5ac4f8d76b91 100644
+index 655fececb400..164d616ed5c0 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
-@@ -7334,7 +7334,10 @@ int
+@@ -7062,7 +7062,10 @@ int
lpfc_send_rrq(struct lpfc_hba *phba, struct lpfc_node_rrq *rrq)
{
struct lpfc_nodelist *ndlp = lpfc_findnode_did(rrq->vport,
diff --git a/queue/scsi-qedi-remove-memset-memcpy-to-nfunc-and-use-func.patch b/queue/scsi-qedi-remove-memset-memcpy-to-nfunc-and-use-func.patch
index e8dffd2..4688cec 100644
--- a/queue/scsi-qedi-remove-memset-memcpy-to-nfunc-and-use-func.patch
+++ b/queue/scsi-qedi-remove-memset-memcpy-to-nfunc-and-use-func.patch
@@ -1,4 +1,4 @@
-From c09581a52765a85f19fc35340127396d5e3379cc Mon Sep 17 00:00:00 2001
+From 08ea0b2020acad5f08ed0746af59f1fcb8571861 Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Sat, 20 Apr 2019 12:05:54 +0800
Subject: [PATCH] scsi: qedi: remove memset/memcpy to nfunc and use func
@@ -61,6 +61,7 @@ Fixes: ace7f46ba5fd ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver frame
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.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/qedi/qedi_dbg.c b/drivers/scsi/qedi/qedi_dbg.c
index 8fd28b056f73..3383314a3882 100644
diff --git a/queue/scsi-qedi-remove-set-but-not-used-variables-cdev-and.patch b/queue/scsi-qedi-remove-set-but-not-used-variables-cdev-and.patch
index 946bdbd..28ff0a7 100644
--- a/queue/scsi-qedi-remove-set-but-not-used-variables-cdev-and.patch
+++ b/queue/scsi-qedi-remove-set-but-not-used-variables-cdev-and.patch
@@ -1,4 +1,4 @@
-From d0adee5d12752256ff0c87ad7f002f21fe49d618 Mon Sep 17 00:00:00 2001
+From 5466c238b0e55001bf9fc74be6a5c3053380b64e Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Wed, 24 Apr 2019 16:02:56 +0800
Subject: [PATCH] scsi: qedi: remove set but not used variables 'cdev' and
@@ -17,12 +17,13 @@ These have never been used since introduction.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Manish Rangankar <mrangankar@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/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c
-index 615cea4fad56..82153c808b40 100644
+index 4130b9117055..1b7049dce169 100644
--- a/drivers/scsi/qedi/qedi_iscsi.c
+++ b/drivers/scsi/qedi/qedi_iscsi.c
-@@ -809,8 +809,6 @@ qedi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
+@@ -810,8 +810,6 @@ qedi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
struct qedi_endpoint *qedi_ep;
struct sockaddr_in *addr;
struct sockaddr_in6 *addr6;
@@ -31,7 +32,7 @@ index 615cea4fad56..82153c808b40 100644
struct iscsi_path path_req;
u32 msg_type = ISCSI_KEVENT_IF_DOWN;
u32 iscsi_cid = QEDI_CID_RESERVED;
-@@ -830,8 +828,6 @@ qedi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
+@@ -831,8 +829,6 @@ qedi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
}
qedi = iscsi_host_priv(shost);
diff --git a/queue/scsi-qla2xxx-Reset-the-FCF_ASYNC_-SENT-ACTIVE-flags.patch b/queue/scsi-qla2xxx-Reset-the-FCF_ASYNC_-SENT-ACTIVE-flags.patch
index b03087e..1694e99 100644
--- a/queue/scsi-qla2xxx-Reset-the-FCF_ASYNC_-SENT-ACTIVE-flags.patch
+++ b/queue/scsi-qla2xxx-Reset-the-FCF_ASYNC_-SENT-ACTIVE-flags.patch
@@ -1,4 +1,4 @@
-From e0a19ec3fadd62324d8a367fa689c75ab4584725 Mon Sep 17 00:00:00 2001
+From be43d230ee8d999dc22c72ef64def05f02d4590d Mon Sep 17 00:00:00 2001
From: Giridhar Malavali <gmalavali@marvell.com>
Date: Tue, 2 Apr 2019 14:24:22 -0700
Subject: [PATCH] scsi: qla2xxx: Reset the FCF_ASYNC_{SENT|ACTIVE} flags
@@ -15,6 +15,7 @@ advance the state machine.
Signed-off-by: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@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/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index c492af5bcd95..94f6a48ef254 100644
diff --git a/queue/scsi-scsi_dh_alua-Fix-possible-null-ptr-deref.patch b/queue/scsi-scsi_dh_alua-Fix-possible-null-ptr-deref.patch
index 29d8958..0e62877 100644
--- a/queue/scsi-scsi_dh_alua-Fix-possible-null-ptr-deref.patch
+++ b/queue/scsi-scsi_dh_alua-Fix-possible-null-ptr-deref.patch
@@ -1,4 +1,4 @@
-From 12e750bc62044de096ab9a95201213fd912b9994 Mon Sep 17 00:00:00 2001
+From 2ad8db309c41360f317452874e752e2440e69241 Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Mon, 27 May 2019 22:22:09 +0800
Subject: [PATCH] scsi: scsi_dh_alua: Fix possible null-ptr-deref
@@ -34,12 +34,13 @@ Fixes: 03197b61c5ec ("scsi_dh_alua: Use workqueue for RTPG")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
-index d7ac498ba35a..2a9dcb8973b7 100644
+index 12dc7100bb4c..d1154baa9436 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
-@@ -1174,10 +1174,8 @@ static int __init alua_init(void)
+@@ -1173,10 +1173,8 @@ static int __init alua_init(void)
int r;
kaluad_wq = alloc_workqueue("kaluad", WQ_MEM_RECLAIM, 0);
diff --git a/queue/scsi-smartpqi-properly-set-both-the-DMA-mask-and-the.patch b/queue/scsi-smartpqi-properly-set-both-the-DMA-mask-and-the.patch
index 484107c..96cb22e 100644
--- a/queue/scsi-smartpqi-properly-set-both-the-DMA-mask-and-the.patch
+++ b/queue/scsi-smartpqi-properly-set-both-the-DMA-mask-and-the.patch
@@ -1,4 +1,4 @@
-From 1d94f06e7f5df4064ef336b7b710f50143b64a53 Mon Sep 17 00:00:00 2001
+From c8b554360930b73026b84de6bf0eb6599e2981ff Mon Sep 17 00:00:00 2001
From: Lianbo Jiang <lijiang@redhat.com>
Date: Mon, 27 May 2019 08:59:34 +0800
Subject: [PATCH] scsi: smartpqi: properly set both the DMA mask and the
@@ -34,12 +34,13 @@ Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
Acked-by: Don Brace <don.brace@microsemi.com>
Tested-by: Don Brace <don.brace@microsemi.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/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
-index b17761eafca9..d6be4e8f4a8f 100644
+index 31066acc901f..462e687c913e 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
-@@ -7291,7 +7291,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
+@@ -6360,7 +6360,7 @@ static int pqi_pci_init(struct pqi_ctrl_info *ctrl_info)
else
mask = DMA_BIT_MASK(32);
diff --git a/queue/sctp-Free-cookie-before-we-memdup-a-new-one.patch b/queue/sctp-Free-cookie-before-we-memdup-a-new-one.patch
index e78c79a..0e46229 100644
--- a/queue/sctp-Free-cookie-before-we-memdup-a-new-one.patch
+++ b/queue/sctp-Free-cookie-before-we-memdup-a-new-one.patch
@@ -1,4 +1,4 @@
-From ce950f1050cece5e406a5cde723c69bba60e1b26 Mon Sep 17 00:00:00 2001
+From e953fdf3343771af0580e9fb1a1b8d523ea5930e Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Thu, 13 Jun 2019 06:35:59 -0400
Subject: [PATCH] sctp: Free cookie before we memdup a new one
@@ -35,12 +35,13 @@ CC: "David S. Miller" <davem@davemloft.net>
CC: netdev@vger.kernel.org
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
-index f17908f5c4f3..9b0e5b0d701a 100644
+index ae65a1cfa596..fb546b2d67ca 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
-@@ -2583,6 +2583,8 @@ do_addr_param:
+@@ -2600,6 +2600,8 @@ static int sctp_process_param(struct sctp_association *asoc,
case SCTP_PARAM_STATE_COOKIE:
asoc->peer.cookie_len =
ntohs(param.p->length) - sizeof(struct sctp_paramhdr);
@@ -49,7 +50,7 @@ index f17908f5c4f3..9b0e5b0d701a 100644
asoc->peer.cookie = kmemdup(param.cookie->body, asoc->peer.cookie_len, gfp);
if (!asoc->peer.cookie)
retval = 0;
-@@ -2647,6 +2649,8 @@ do_addr_param:
+@@ -2664,6 +2666,8 @@ static int sctp_process_param(struct sctp_association *asoc,
goto fall_through;
/* Save peer's random parameter */
@@ -58,7 +59,7 @@ index f17908f5c4f3..9b0e5b0d701a 100644
asoc->peer.peer_random = kmemdup(param.p,
ntohs(param.p->length), gfp);
if (!asoc->peer.peer_random) {
-@@ -2660,6 +2664,8 @@ do_addr_param:
+@@ -2677,6 +2681,8 @@ static int sctp_process_param(struct sctp_association *asoc,
goto fall_through;
/* Save peer's HMAC list */
@@ -67,7 +68,7 @@ index f17908f5c4f3..9b0e5b0d701a 100644
asoc->peer.peer_hmacs = kmemdup(param.p,
ntohs(param.p->length), gfp);
if (!asoc->peer.peer_hmacs) {
-@@ -2675,6 +2681,8 @@ do_addr_param:
+@@ -2692,6 +2698,8 @@ static int sctp_process_param(struct sctp_association *asoc,
if (!ep->auth_enable)
goto fall_through;
diff --git a/queue/selftests-fib_rule_tests-fix-local-IPv4-address-typo.patch b/queue/selftests-fib_rule_tests-fix-local-IPv4-address-typo.patch
index 1a95be8..4bf05d9 100644
--- a/queue/selftests-fib_rule_tests-fix-local-IPv4-address-typo.patch
+++ b/queue/selftests-fib_rule_tests-fix-local-IPv4-address-typo.patch
@@ -1,4 +1,4 @@
-From fc82d93e57e3d41f79eff19031588b262fc3d0b6 Mon Sep 17 00:00:00 2001
+From 405c634461ea19042a28d7330c54bf5e7fd5d3e9 Mon Sep 17 00:00:00 2001
From: Hangbin Liu <liuhangbin@gmail.com>
Date: Mon, 20 May 2019 12:36:54 +0800
Subject: [PATCH] selftests: fib_rule_tests: fix local IPv4 address typo
@@ -12,9 +12,10 @@ Fixes: 65b2b4939a64 ("selftests: net: initial fib rule tests")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/testing/selftests/net/fib_rule_tests.sh b/tools/testing/selftests/net/fib_rule_tests.sh
-index 4b7e107865bf..1ba069967fa2 100755
+index d84193bdc307..dbd90ca73e44 100755
--- a/tools/testing/selftests/net/fib_rule_tests.sh
+++ b/tools/testing/selftests/net/fib_rule_tests.sh
@@ -55,7 +55,7 @@ setup()
diff --git a/queue/selftests-netfilter-missing-error-check-when-setting.patch b/queue/selftests-netfilter-missing-error-check-when-setting.patch
index 1ae1652..d79ec4f 100644
--- a/queue/selftests-netfilter-missing-error-check-when-setting.patch
+++ b/queue/selftests-netfilter-missing-error-check-when-setting.patch
@@ -1,4 +1,4 @@
-From 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 Mon Sep 17 00:00:00 2001
+From 308d01dbf384d8d9bf8dfe4eeb092bfbcd77274c Mon Sep 17 00:00:00 2001
From: Jeffrin Jose T <jeffrin@rajagiritech.edu.in>
Date: Wed, 15 May 2019 12:14:04 +0530
Subject: [PATCH] selftests: netfilter: missing error check when setting up
@@ -14,12 +14,13 @@ code for reasonable error display and correct code exit.
Signed-off-by: Jeffrin Jose T <jeffrin@rajagiritech.edu.in>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh
-index 21159f5f3362..f102a65aa8b7 100755
+index a39433761fed..32f502f4db87 100755
--- a/tools/testing/selftests/netfilter/nft_nat.sh
+++ b/tools/testing/selftests/netfilter/nft_nat.sh
-@@ -24,7 +24,11 @@ ip netns add ns0
+@@ -23,7 +23,11 @@ ip netns add ns0
ip netns add ns1
ip netns add ns2
diff --git a/queue/selftests-timers-Add-missing-fflush-stdout-calls.patch b/queue/selftests-timers-Add-missing-fflush-stdout-calls.patch
index 8ff8a44..5ed72bd 100644
--- a/queue/selftests-timers-Add-missing-fflush-stdout-calls.patch
+++ b/queue/selftests-timers-Add-missing-fflush-stdout-calls.patch
@@ -1,4 +1,4 @@
-From fe48319243a626c860fd666ca032daacc2ba84a5 Mon Sep 17 00:00:00 2001
+From 2fd58fcf118748ad645a13c2afc8d6be41c67784 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Mon, 20 May 2019 15:37:49 -0700
Subject: [PATCH] selftests/timers: Add missing fflush(stdout) calls
@@ -12,6 +12,7 @@ can enjoy.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c
index 0caca3a06bd2..54d8d87f36b3 100644
diff --git a/queue/signal-ptrace-Don-t-leak-unitialized-kernel-memory-w.patch b/queue/signal-ptrace-Don-t-leak-unitialized-kernel-memory-w.patch
index 6d3dbc8..c924039 100644
--- a/queue/signal-ptrace-Don-t-leak-unitialized-kernel-memory-w.patch
+++ b/queue/signal-ptrace-Don-t-leak-unitialized-kernel-memory-w.patch
@@ -1,4 +1,4 @@
-From c7e13e15a15a40db6c7b1d2362e09d7754f9ac4e Mon Sep 17 00:00:00 2001
+From 467632febdb259781b8a5eb24ecec4849847f8ae Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 28 May 2019 18:46:37 -0500
Subject: [PATCH] signal/ptrace: Don't leak unitialized kernel memory with
@@ -31,6 +31,7 @@ Cc: stable@vger.kernel.org
Reported-by: syzbot+0d602a1b0d8c95bdf299@syzkaller.appspotmail.com
Fixes: 84c751bd4aeb ("ptrace: add ability to retrieve signals without removing from a queue (v4)")
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index fc0d667f5792..ed33066a9736 100644
diff --git a/queue/soc-mediatek-pwrap-Zero-initialize-rdata-in-pwrap_in.patch b/queue/soc-mediatek-pwrap-Zero-initialize-rdata-in-pwrap_in.patch
index 2d1a721..ef196b4 100644
--- a/queue/soc-mediatek-pwrap-Zero-initialize-rdata-in-pwrap_in.patch
+++ b/queue/soc-mediatek-pwrap-Zero-initialize-rdata-in-pwrap_in.patch
@@ -1,4 +1,4 @@
-From 89e28da82836530f1ac7a3a32fecc31f22d79b3e Mon Sep 17 00:00:00 2001
+From 1ee2649dd8d402bc5ab5a934ee398ae9b3c772a7 Mon Sep 17 00:00:00 2001
From: Nathan Chancellor <natechancellor@gmail.com>
Date: Thu, 7 Mar 2019 15:56:51 -0700
Subject: [PATCH] soc: mediatek: pwrap: Zero initialize rdata in
@@ -22,12 +22,13 @@ Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
-index 73f0be0567bd..c4449a163991 100644
+index 2afae64061d8..2dad55045519 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
-@@ -1371,7 +1371,7 @@ static bool pwrap_is_pmic_cipher_ready(struct pmic_wrapper *wrp)
+@@ -1054,7 +1054,7 @@ static bool pwrap_is_pmic_cipher_ready(struct pmic_wrapper *wrp)
static int pwrap_init_cipher(struct pmic_wrapper *wrp)
{
int ret;
diff --git a/queue/soc-renesas-Identify-R-Car-M3-W-ES1.3.patch b/queue/soc-renesas-Identify-R-Car-M3-W-ES1.3.patch
index 2fa738b..9d78c78 100644
--- a/queue/soc-renesas-Identify-R-Car-M3-W-ES1.3.patch
+++ b/queue/soc-renesas-Identify-R-Car-M3-W-ES1.3.patch
@@ -1,4 +1,4 @@
-From 15160f6de0bba712fcea078c5ac7571fe33fcd5d Mon Sep 17 00:00:00 2001
+From 74382bc2f0b8019e3980cd55c3cadbecadf0ba93 Mon Sep 17 00:00:00 2001
From: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Date: Thu, 28 Feb 2019 12:00:48 +0100
Subject: [PATCH] soc: renesas: Identify R-Car M3-W ES1.3
@@ -11,12 +11,13 @@ revision as ES2.1. Add a workaround to fix this.
Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
-index 4af96e668a2f..3299cf5365f3 100644
+index d44d0e687ab8..2a43d6e99962 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
-@@ -335,6 +335,9 @@ static int __init renesas_soc_init(void)
+@@ -285,6 +285,9 @@ static int __init renesas_soc_init(void)
/* R-Car M3-W ES1.1 incorrectly identifies as ES2.0 */
if ((product & 0x7fff) == 0x5210)
product ^= 0x11;
diff --git a/queue/soc-rockchip-Set-the-proper-PWM-for-rk3288.patch b/queue/soc-rockchip-Set-the-proper-PWM-for-rk3288.patch
index 309819a..6cd1f02 100644
--- a/queue/soc-rockchip-Set-the-proper-PWM-for-rk3288.patch
+++ b/queue/soc-rockchip-Set-the-proper-PWM-for-rk3288.patch
@@ -1,4 +1,4 @@
-From bbdc00a7de24cc90315b1775fb74841373fe12f7 Mon Sep 17 00:00:00 2001
+From 9889e5c8238c27e35e83fe158c28c6b474e523e7 Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Tue, 9 Apr 2019 13:49:05 -0700
Subject: [PATCH] soc: rockchip: Set the proper PWM for rk3288
@@ -29,6 +29,7 @@ series [1] in downstream kernels.
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/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
index 96882ffde67e..3b81e1d75a97 100644
diff --git a/queue/sunhv-Fix-device-naming-inconsistency-between-sunhv_.patch b/queue/sunhv-Fix-device-naming-inconsistency-between-sunhv_.patch
index d6ac435..58f0f33 100644
--- a/queue/sunhv-Fix-device-naming-inconsistency-between-sunhv_.patch
+++ b/queue/sunhv-Fix-device-naming-inconsistency-between-sunhv_.patch
@@ -1,4 +1,4 @@
-From 07a6d63eb1b54b5fb38092780fe618dfe1d96e23 Mon Sep 17 00:00:00 2001
+From 6e904d63ec4cf560744f89d42a8c6e40d3003e10 Mon Sep 17 00:00:00 2001
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Tue, 11 Jun 2019 17:38:37 +0200
Subject: [PATCH] sunhv: Fix device naming inconsistency between sunhv_console
@@ -42,6 +42,7 @@ a SPARC LDOM.
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c
index 63e34d868de8..f8503f8fc44e 100644
diff --git a/queue/switchtec-Fix-unintended-mask-of-MRPC-event.patch b/queue/switchtec-Fix-unintended-mask-of-MRPC-event.patch
index 5d62a3c..d350f89 100644
--- a/queue/switchtec-Fix-unintended-mask-of-MRPC-event.patch
+++ b/queue/switchtec-Fix-unintended-mask-of-MRPC-event.patch
@@ -1,4 +1,4 @@
-From 083c1b5e50b701899dc32445efa8b153685260d5 Mon Sep 17 00:00:00 2001
+From ed4467438cb47242ed4d94f35d0733b04e8ff480 Mon Sep 17 00:00:00 2001
From: Wesley Sheng <wesley.sheng@microchip.com>
Date: Mon, 15 Apr 2019 22:41:42 +0800
Subject: [PATCH] switchtec: Fix unintended mask of MRPC event
@@ -22,12 +22,13 @@ Fixes: 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver")
Signed-off-by: Wesley Sheng <wesley.sheng@microchip.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
-index 7df9a69f7d93..30f6e080bad8 100644
+index 38069503ca4e..20340ad5bbe7 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
-@@ -1177,7 +1177,8 @@ static int mask_event(struct switchtec_dev *stdev, int eid, int idx)
+@@ -1116,7 +1116,8 @@ static int mask_event(struct switchtec_dev *stdev, int eid, int idx)
if (!(hdr & SWITCHTEC_EVENT_OCCURRED && hdr & SWITCHTEC_EVENT_EN_IRQ))
return 0;
diff --git a/queue/sysctl-return-EINVAL-if-val-violates-minmax.patch b/queue/sysctl-return-EINVAL-if-val-violates-minmax.patch
index 085e32d..415d720 100644
--- a/queue/sysctl-return-EINVAL-if-val-violates-minmax.patch
+++ b/queue/sysctl-return-EINVAL-if-val-violates-minmax.patch
@@ -1,4 +1,4 @@
-From e260ad01f0aa9e96b5386d5cd7184afd949dc457 Mon Sep 17 00:00:00 2001
+From ba163dadeb8a837ba7c70fd1c341267856e2c0b4 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian@brauner.io>
Date: Tue, 14 May 2019 15:44:55 -0700
Subject: [PATCH] sysctl: return -EINVAL if val violates minmax
@@ -26,12 +26,13 @@ Cc: Joe Lawrence <joe.lawrence@redhat.com>
Cc: Waiman Long <longman@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index d82f9161adb8..f7bd1aead3bf 100644
+index b04776bfefc1..6483f2feef43 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
-@@ -2886,8 +2886,10 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+@@ -2770,8 +2770,10 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
if (neg)
continue;
val = convmul * val / convdiv;
diff --git a/queue/thermal-rcar_gen3_thermal-disable-interrupt-in-.remo.patch b/queue/thermal-rcar_gen3_thermal-disable-interrupt-in-.remo.patch
index afa6c30..4e5ffcb 100644
--- a/queue/thermal-rcar_gen3_thermal-disable-interrupt-in-.remo.patch
+++ b/queue/thermal-rcar_gen3_thermal-disable-interrupt-in-.remo.patch
@@ -1,4 +1,4 @@
-From 63f55fcea50c25ae5ad45af92d08dae3b84534c2 Mon Sep 17 00:00:00 2001
+From 17c315f2d13e30b7b39cd244f170b4bc7db1158a Mon Sep 17 00:00:00 2001
From: Jiada Wang <jiada_wang@mentor.com>
Date: Wed, 24 Apr 2019 14:11:45 +0900
Subject: [PATCH] thermal: rcar_gen3_thermal: disable interrupt in .remove
@@ -16,12 +16,13 @@ Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
-index cf5ae8f6e8ed..e6727bd09f86 100644
+index 766521eb7071..8f6f0f3bb2b0 100644
--- a/drivers/thermal/rcar_gen3_thermal.c
+++ b/drivers/thermal/rcar_gen3_thermal.c
-@@ -307,6 +307,9 @@ MODULE_DEVICE_TABLE(of, rcar_gen3_thermal_dt_ids);
+@@ -337,6 +337,9 @@ MODULE_DEVICE_TABLE(of, rcar_gen3_thermal_dt_ids);
static int rcar_gen3_thermal_remove(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
diff --git a/queue/timekeeping-Repair-ktime_get_coarse-granularity.patch b/queue/timekeeping-Repair-ktime_get_coarse-granularity.patch
index 3043f79..19647ea 100644
--- a/queue/timekeeping-Repair-ktime_get_coarse-granularity.patch
+++ b/queue/timekeeping-Repair-ktime_get_coarse-granularity.patch
@@ -1,4 +1,4 @@
-From e3ff9c3678b4d80e22d2557b68726174578eaf52 Mon Sep 17 00:00:00 2001
+From a3ae38e9cd0bd9692fbd2fde5df027f4aa0f0d71 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 13 Jun 2019 21:40:45 +0200
Subject: [PATCH] timekeeping: Repair ktime_get_coarse*() granularity
@@ -27,12 +27,13 @@ Cc: Sultan Alsawaf <sultan@kerneltoast.com>
Cc: Waiman Long <longman@redhat.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/alpine.DEB.2.21.1906132136280.1791@nanos.tec.linutronix.de
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index 85f5912d8f70..44b726bab4bd 100644
+index 601758d532c6..c63dd4bb9b8d 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
-@@ -808,17 +808,18 @@ ktime_t ktime_get_coarse_with_offset(enum tk_offsets offs)
+@@ -802,17 +802,18 @@ ktime_t ktime_get_coarse_with_offset(enum tk_offsets offs)
struct timekeeper *tk = &tk_core.timekeeper;
unsigned int seq;
ktime_t base, *offset = offsets[offs];
diff --git a/queue/tipc-purge-deferredq-list-for-each-grp-member-in-tip.patch b/queue/tipc-purge-deferredq-list-for-each-grp-member-in-tip.patch
index 73790c5..38affdb 100644
--- a/queue/tipc-purge-deferredq-list-for-each-grp-member-in-tip.patch
+++ b/queue/tipc-purge-deferredq-list-for-each-grp-member-in-tip.patch
@@ -1,4 +1,4 @@
-From 5cf02612b33f104fe1015b2dfaf1758ad3675588 Mon Sep 17 00:00:00 2001
+From 8e7622e83ebda74ab68c0adde78d0d07144032e1 Mon Sep 17 00:00:00 2001
From: Xin Long <lucien.xin@gmail.com>
Date: Sun, 16 Jun 2019 17:24:07 +0800
Subject: [PATCH] tipc: purge deferredq list for each grp member in
@@ -20,12 +20,13 @@ Reported-by: syzbot+78fbe679c8ca8d264a8d@syzkaller.appspotmail.com
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/tipc/group.c b/net/tipc/group.c
-index 992be6113676..5f98d38bcf08 100644
+index d7a7befeddd4..bd1de6123749 100644
--- a/net/tipc/group.c
+++ b/net/tipc/group.c
-@@ -218,6 +218,7 @@ void tipc_group_delete(struct net *net, struct tipc_group *grp)
+@@ -223,6 +223,7 @@ void tipc_group_delete(struct net *net, struct tipc_group *grp)
rbtree_postorder_for_each_entry_safe(m, tmp, tree, tree_node) {
tipc_group_proto_xmit(grp, m, GRP_LEAVE_MSG, &xmitq);
diff --git a/queue/tools-kvm_stat-fix-fields-filter-for-child-events.patch b/queue/tools-kvm_stat-fix-fields-filter-for-child-events.patch
index e6ce7c2..c4fce9a 100644
--- a/queue/tools-kvm_stat-fix-fields-filter-for-child-events.patch
+++ b/queue/tools-kvm_stat-fix-fields-filter-for-child-events.patch
@@ -1,4 +1,4 @@
-From 883d25e70b2f699fed9017e509d1ef8e36229b89 Mon Sep 17 00:00:00 2001
+From 6aa1940e39e0e1ca8b65c79d22f5afc2bf2141d9 Mon Sep 17 00:00:00 2001
From: Stefan Raspl <stefan.raspl@de.ibm.com>
Date: Sun, 21 Apr 2019 15:26:24 +0200
Subject: [PATCH] tools/kvm_stat: fix fields filter for child events
@@ -32,9 +32,10 @@ on first sight.
Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat
-index 2ed395b817cb..bc508dae286c 100755
+index 7c92545931e3..0740f42ed4fa 100755
--- a/tools/kvm/kvm_stat/kvm_stat
+++ b/tools/kvm/kvm_stat/kvm_stat
@@ -575,8 +575,12 @@ class TracepointProvider(Provider):
diff --git a/queue/tracing-Prevent-hist_field_var_ref-from-accessing-NU.patch b/queue/tracing-Prevent-hist_field_var_ref-from-accessing-NU.patch
index 061f5b2..a2fbf89 100644
--- a/queue/tracing-Prevent-hist_field_var_ref-from-accessing-NU.patch
+++ b/queue/tracing-Prevent-hist_field_var_ref-from-accessing-NU.patch
@@ -1,4 +1,4 @@
-From 55267c88c003a3648567beae7c90512d3e2ab15e Mon Sep 17 00:00:00 2001
+From 731323a4ddfab52ad016dafb9042c9cdcf251a29 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tom.zanussi@linux.intel.com>
Date: Thu, 18 Apr 2019 10:18:50 -0500
Subject: [PATCH] tracing: Prevent hist_field_var_ref() from accessing NULL
@@ -26,12 +26,13 @@ Link: http://lkml.kernel.org/r/64ec8dc15c14d305295b64cdfcc6b2b9dd14753f.15555970
Reported-by: Vincent Bernat <vincent@bernat.ch>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
-index 7fca3457c705..06e7b9f66de6 100644
+index 8d96ae7d23c2..746d37b5599c 100644
--- a/kernel/trace/trace_events_hist.c
+++ b/kernel/trace/trace_events_hist.c
-@@ -1854,6 +1854,9 @@ static u64 hist_field_var_ref(struct hist_field *hist_field,
+@@ -1641,6 +1641,9 @@ static u64 hist_field_var_ref(struct hist_field *hist_field,
struct hist_elt_data *elt_data;
u64 var_val = 0;
diff --git a/queue/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch b/queue/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch
index 20e6948..e7f8736 100644
--- a/queue/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch
+++ b/queue/uml-fix-a-boot-splat-wrt-use-of-cpu_all_mask.patch
@@ -1,4 +1,4 @@
-From 689a58605b63173acb0a8cf954af6a8f60440c93 Mon Sep 17 00:00:00 2001
+From 55e46c4c672319200e289dd0aa083898303d92db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Wed, 10 Apr 2019 11:11:23 -0700
Subject: [PATCH] uml: fix a boot splat wrt use of cpu_all_mask
@@ -64,6 +64,7 @@ Cc: linux-um@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 052de4c8acb2..0c572a48158e 100644
diff --git a/queue/usb-dwc2-Fix-DMA-cache-alignment-issues.patch b/queue/usb-dwc2-Fix-DMA-cache-alignment-issues.patch
index a2651b1..13ccfc5 100644
--- a/queue/usb-dwc2-Fix-DMA-cache-alignment-issues.patch
+++ b/queue/usb-dwc2-Fix-DMA-cache-alignment-issues.patch
@@ -1,4 +1,4 @@
-From 4a4863bf2e7932e584a3a462d3c6daf891142ddc Mon Sep 17 00:00:00 2001
+From 14df88ad58adb67e979b5afd8c1cdb3df4e63163 Mon Sep 17 00:00:00 2001
From: Martin Schiller <ms@dev.tdt.de>
Date: Mon, 18 Feb 2019 07:37:30 +0100
Subject: [PATCH] usb: dwc2: Fix DMA cache alignment issues
@@ -19,12 +19,13 @@ Reviewed-by: Douglas Anderson <dianders@chromium.org>
Acked-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index 5c51bf5506d1..2192a2873c7c 100644
+index 05a68f035d19..4b86f1879659 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
-@@ -2480,8 +2480,10 @@ static void dwc2_free_dma_aligned_buffer(struct urb *urb)
+@@ -2674,8 +2674,10 @@ static void dwc2_free_dma_aligned_buffer(struct urb *urb)
return;
/* Restore urb->transfer_buffer from the end of the allocated area */
@@ -37,7 +38,7 @@ index 5c51bf5506d1..2192a2873c7c 100644
if (usb_urb_dir_in(urb)) {
if (usb_pipeisoc(urb->pipe))
-@@ -2513,6 +2515,7 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
+@@ -2707,6 +2709,7 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
* DMA
*/
kmalloc_size = urb->transfer_buffer_length +
@@ -45,7 +46,7 @@ index 5c51bf5506d1..2192a2873c7c 100644
sizeof(urb->transfer_buffer);
kmalloc_ptr = kmalloc(kmalloc_size, mem_flags);
-@@ -2523,7 +2526,8 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
+@@ -2717,7 +2720,8 @@ static int dwc2_alloc_dma_aligned_buffer(struct urb *urb, gfp_t mem_flags)
* Position value of original urb->transfer_buffer pointer to the end
* of allocation for later referencing
*/
diff --git a/queue/usb-dwc2-host-Fix-wMaxPacketSize-handling-fix-webcam.patch b/queue/usb-dwc2-host-Fix-wMaxPacketSize-handling-fix-webcam.patch
index 9957087..1113d46 100644
--- a/queue/usb-dwc2-host-Fix-wMaxPacketSize-handling-fix-webcam.patch
+++ b/queue/usb-dwc2-host-Fix-wMaxPacketSize-handling-fix-webcam.patch
@@ -1,4 +1,4 @@
-From babd183915e91a64e976b9e8ab682bb56624df76 Mon Sep 17 00:00:00 2001
+From 639e6c834fa4f1c5169260297db73393bc97a678 Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Fri, 31 May 2019 13:04:12 -0700
Subject: [PATCH] usb: dwc2: host: Fix wMaxPacketSize handling (fix webcam
@@ -34,12 +34,13 @@ Acked-by: Minas Harutyunyan <hminas@synopsys.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
-index b50ec3714fd8..5c51bf5506d1 100644
+index 4b86f1879659..4d030e55c338 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
-@@ -2608,7 +2608,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
+@@ -2806,7 +2806,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
chan->dev_addr = dwc2_hcd_get_dev_addr(&urb->pipe_info);
chan->ep_num = dwc2_hcd_get_ep_num(&urb->pipe_info);
chan->speed = qh->dev_speed;
@@ -48,7 +49,7 @@ index b50ec3714fd8..5c51bf5506d1 100644
chan->xfer_started = 0;
chan->halt_status = DWC2_HC_XFER_NO_HALT_STATUS;
-@@ -2686,7 +2686,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
+@@ -2884,7 +2884,7 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
* This value may be modified when the transfer is started
* to reflect the actual transfer length
*/
@@ -57,7 +58,7 @@ index b50ec3714fd8..5c51bf5506d1 100644
if (hsotg->params.dma_desc_enable) {
chan->desc_list_addr = qh->desc_list_dma;
-@@ -3806,19 +3806,21 @@ static struct dwc2_hcd_urb *dwc2_hcd_urb_alloc(struct dwc2_hsotg *hsotg,
+@@ -3996,19 +3996,21 @@ static struct dwc2_hcd_urb *dwc2_hcd_urb_alloc(struct dwc2_hsotg *hsotg,
static void dwc2_hcd_urb_set_pipeinfo(struct dwc2_hsotg *hsotg,
struct dwc2_hcd_urb *urb, u8 dev_addr,
@@ -83,7 +84,7 @@ index b50ec3714fd8..5c51bf5506d1 100644
}
/*
-@@ -3909,8 +3911,9 @@ void dwc2_hcd_dump_state(struct dwc2_hsotg *hsotg)
+@@ -4099,8 +4101,9 @@ void dwc2_hcd_dump_state(struct dwc2_hsotg *hsotg)
dwc2_hcd_is_pipe_in(&urb->pipe_info) ?
"IN" : "OUT");
dev_dbg(hsotg->dev,
@@ -95,7 +96,7 @@ index b50ec3714fd8..5c51bf5506d1 100644
dev_dbg(hsotg->dev,
" transfer_buffer: %p\n",
urb->buf);
-@@ -4510,8 +4513,10 @@ static void dwc2_dump_urb_info(struct usb_hcd *hcd, struct urb *urb,
+@@ -4656,8 +4659,10 @@ static void dwc2_dump_urb_info(struct usb_hcd *hcd, struct urb *urb,
}
dev_vdbg(hsotg->dev, " Speed: %s\n", speed);
@@ -108,7 +109,7 @@ index b50ec3714fd8..5c51bf5506d1 100644
dev_vdbg(hsotg->dev, " Data buffer length: %d\n",
urb->transfer_buffer_length);
dev_vdbg(hsotg->dev, " Transfer buffer: %p, Transfer DMA: %08lx\n",
-@@ -4594,8 +4599,8 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
+@@ -4740,8 +4745,8 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
dwc2_hcd_urb_set_pipeinfo(hsotg, dwc2_urb, usb_pipedevice(urb->pipe),
usb_pipeendpoint(urb->pipe), ep_type,
usb_pipein(urb->pipe),
@@ -120,7 +121,7 @@ index b50ec3714fd8..5c51bf5506d1 100644
buf = urb->transfer_buffer;
diff --git a/drivers/usb/dwc2/hcd.h b/drivers/usb/dwc2/hcd.h
-index c089ffa1f0a8..ce6445a06588 100644
+index 93483dc37801..144536618b3d 100644
--- a/drivers/usb/dwc2/hcd.h
+++ b/drivers/usb/dwc2/hcd.h
@@ -171,7 +171,8 @@ struct dwc2_hcd_pipe_info {
@@ -180,7 +181,7 @@ index c089ffa1f0a8..ce6445a06588 100644
* Returns true if frame1 index is greater than frame2 index. The comparison
* is done modulo FRLISTEN_64_SIZE. This accounts for the rollover of the
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
-index 88b5dcf3aefc..a052d39b4375 100644
+index 8ce10caf3e19..51fceec6ab54 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -1617,8 +1617,9 @@ static void dwc2_hc_ahberr_intr(struct dwc2_hsotg *hsotg,
@@ -196,7 +197,7 @@ index 88b5dcf3aefc..a052d39b4375 100644
dev_err(hsotg->dev, " Transfer buffer: %p, Transfer DMA: %08lx\n",
urb->buf, (unsigned long)urb->dma);
diff --git a/drivers/usb/dwc2/hcd_queue.c b/drivers/usb/dwc2/hcd_queue.c
-index ea3aa640c15c..68bbac64b753 100644
+index 60caf8e0b762..86f22cdcad3c 100644
--- a/drivers/usb/dwc2/hcd_queue.c
+++ b/drivers/usb/dwc2/hcd_queue.c
@@ -708,7 +708,7 @@ static void dwc2_hs_pmap_unschedule(struct dwc2_hsotg *hsotg,
diff --git a/queue/usb-typec-fusb302-Check-vconn-is-off-when-we-start-t.patch b/queue/usb-typec-fusb302-Check-vconn-is-off-when-we-start-t.patch
index e38a339..4071fea 100644
--- a/queue/usb-typec-fusb302-Check-vconn-is-off-when-we-start-t.patch
+++ b/queue/usb-typec-fusb302-Check-vconn-is-off-when-we-start-t.patch
@@ -1,4 +1,4 @@
-From c502c5cdace20464576c54c39fe7bfa8b558e017 Mon Sep 17 00:00:00 2001
+From 01b9cf586eb7d2c36ceaf59ea3d9eacb3e22e861 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Mon, 11 Mar 2019 11:48:14 +0100
Subject: [PATCH] usb: typec: fusb302: Check vconn is off when we start
@@ -14,6 +14,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/typec/fusb302/fusb302.c b/drivers/usb/typec/fusb302/fusb302.c
index 1e68da10bf17..e74bf0f96002 100644
diff --git a/queue/usb-xhci-Fix-a-potential-null-pointer-dereference-in.patch b/queue/usb-xhci-Fix-a-potential-null-pointer-dereference-in.patch
index f239299..6e0dd73 100644
--- a/queue/usb-xhci-Fix-a-potential-null-pointer-dereference-in.patch
+++ b/queue/usb-xhci-Fix-a-potential-null-pointer-dereference-in.patch
@@ -1,4 +1,4 @@
-From 5bce256f0b528624a34fe907db385133bb7be33e Mon Sep 17 00:00:00 2001
+From 761a0bf35e4ba3adf19ac03e950c0652dd8d5b3e Mon Sep 17 00:00:00 2001
From: Jia-Ju Bai <baijiaju1990@gmail.com>
Date: Wed, 22 May 2019 14:33:58 +0300
Subject: [PATCH] usb: xhci: Fix a potential null pointer dereference in
@@ -21,6 +21,7 @@ Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/usb/host/xhci-debugfs.c b/drivers/usb/host/xhci-debugfs.c
index cadc01336bf8..7ba6afc7ef23 100644
diff --git a/queue/usbnet-ipheth-fix-racing-condition.patch b/queue/usbnet-ipheth-fix-racing-condition.patch
index 9ff7023..2b6c450 100644
--- a/queue/usbnet-ipheth-fix-racing-condition.patch
+++ b/queue/usbnet-ipheth-fix-racing-condition.patch
@@ -1,4 +1,4 @@
-From 94d250fae48e6f873d8362308f5c4d02cd1b1fd2 Mon Sep 17 00:00:00 2001
+From 1e261f45b7e61688b686e9bf2c7cf17b848609b0 Mon Sep 17 00:00:00 2001
From: Bernd Eckstein <3erndeckstein@gmail.com>
Date: Mon, 20 May 2019 17:31:09 +0200
Subject: [PATCH] usbnet: ipheth: fix racing condition
@@ -28,12 +28,13 @@ With this patch: Download: 36.23 Mbit/s, Upload: 17.61 Mbit/s
Signed-off-by: Oliver Zweigle <Oliver.Zweigle@faro.com>
Signed-off-by: Bernd Eckstein <3ernd.Eckstein@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
-index c247aed2dceb..8c01fbf68a89 100644
+index 3d8a70d3ea9b..3d71f1716390 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
-@@ -383,17 +383,18 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
+@@ -437,17 +437,18 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)
dev);
dev->tx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
diff --git a/queue/vfio-Fix-WARNING-do-not-call-blocking-ops-when-TASK_.patch b/queue/vfio-Fix-WARNING-do-not-call-blocking-ops-when-TASK_.patch
index cf0633c..cfc7e7f 100644
--- a/queue/vfio-Fix-WARNING-do-not-call-blocking-ops-when-TASK_.patch
+++ b/queue/vfio-Fix-WARNING-do-not-call-blocking-ops-when-TASK_.patch
@@ -1,4 +1,4 @@
-From 41be3e2618174fdf3361e49e64f2bf530f40c6b0 Mon Sep 17 00:00:00 2001
+From a99a7a2d0770c4d193d3bfb358f5644b80b95862 Mon Sep 17 00:00:00 2001
From: Farhan Ali <alifm@linux.ibm.com>
Date: Wed, 3 Apr 2019 14:22:27 -0400
Subject: [PATCH] vfio: Fix WARNING "do not call blocking ops when
@@ -59,9 +59,10 @@ https://lwn.net/Articles/628628/.
Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
[remove now redundant vfio_dev_present()]
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
-index 7fb68968097a..82fcf07fa9ea 100644
+index 64833879f75d..7a386fb30bf1 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -34,6 +34,7 @@
@@ -72,7 +73,7 @@ index 7fb68968097a..82fcf07fa9ea 100644
#define DRIVER_VERSION "0.3"
#define DRIVER_AUTHOR "Alex Williamson <alex.williamson@redhat.com>"
-@@ -901,30 +902,17 @@ void *vfio_device_data(struct vfio_device *device)
+@@ -904,30 +905,17 @@ void *vfio_device_data(struct vfio_device *device)
}
EXPORT_SYMBOL_GPL(vfio_device_data);
@@ -104,7 +105,7 @@ index 7fb68968097a..82fcf07fa9ea 100644
bool interrupted = false;
/*
-@@ -961,6 +949,8 @@ void *vfio_del_group_dev(struct device *dev)
+@@ -964,6 +952,8 @@ void *vfio_del_group_dev(struct device *dev)
* interval with counter to allow the driver to take escalating
* measures to release the device if it has the ability to do so.
*/
@@ -113,7 +114,7 @@ index 7fb68968097a..82fcf07fa9ea 100644
do {
device = vfio_group_get_device(group, dev);
if (!device)
-@@ -972,12 +962,10 @@ void *vfio_del_group_dev(struct device *dev)
+@@ -975,12 +965,10 @@ void *vfio_del_group_dev(struct device *dev)
vfio_device_put(device);
if (interrupted) {
@@ -129,7 +130,7 @@ index 7fb68968097a..82fcf07fa9ea 100644
interrupted = true;
dev_warn(dev,
"Device is currently in use, task"
-@@ -986,8 +974,10 @@ void *vfio_del_group_dev(struct device *dev)
+@@ -989,8 +977,10 @@ void *vfio_del_group_dev(struct device *dev)
current->comm, task_pid_nr(current));
}
}
diff --git a/queue/video-hgafb-fix-potential-NULL-pointer-dereference.patch b/queue/video-hgafb-fix-potential-NULL-pointer-dereference.patch
index f5529ac..f758a0f 100644
--- a/queue/video-hgafb-fix-potential-NULL-pointer-dereference.patch
+++ b/queue/video-hgafb-fix-potential-NULL-pointer-dereference.patch
@@ -1,4 +1,4 @@
-From ec7f6aad57ad29e4e66cc2e18e1e1599ddb02542 Mon Sep 17 00:00:00 2001
+From b7bdfb3b4f469ba3ec59314a57e21271120ce2c9 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 1 Apr 2019 17:46:58 +0200
Subject: [PATCH] video: hgafb: fix potential NULL pointer dereference
@@ -13,6 +13,7 @@ Cc: Aditya Pakki <pakki001@umn.edu>
Cc: Ferenc Bakonyi <fero@drama.obuda.kando.hu>
[b.zolnierkie: minor patch summary fixup]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/video/fbdev/hgafb.c b/drivers/video/fbdev/hgafb.c
index 463028543173..59e1cae57948 100644
diff --git a/queue/video-imsttfb-fix-potential-NULL-pointer-dereference.patch b/queue/video-imsttfb-fix-potential-NULL-pointer-dereference.patch
index 564dd9d..babaed0 100644
--- a/queue/video-imsttfb-fix-potential-NULL-pointer-dereference.patch
+++ b/queue/video-imsttfb-fix-potential-NULL-pointer-dereference.patch
@@ -1,4 +1,4 @@
-From 1d84353d205a953e2381044953b7fa31c8c9702d Mon Sep 17 00:00:00 2001
+From 10422c85adab9e259f72dbcf51dba22a2f7e87c5 Mon Sep 17 00:00:00 2001
From: Kangjie Lu <kjlu@umn.edu>
Date: Mon, 1 Apr 2019 17:46:58 +0200
Subject: [PATCH] video: imsttfb: fix potential NULL pointer dereferences
@@ -15,12 +15,13 @@ Cc: Rob Herring <robh@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[b.zolnierkie: minor patch summary fixup]
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
-index 4b9615e4ce74..35bba3c2036d 100644
+index ecdcf358ad5e..ffcf553719a3 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
-@@ -1515,6 +1515,11 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -1516,6 +1516,11 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
info->fix.smem_start = addr;
info->screen_base = (__u8 *)ioremap(addr, par->ramdac == IBM ?
0x400000 : 0x800000);
diff --git a/queue/vsock-virtio-set-SOCK_DONE-on-peer-shutdown.patch b/queue/vsock-virtio-set-SOCK_DONE-on-peer-shutdown.patch
index db3f4bd..06d0379 100644
--- a/queue/vsock-virtio-set-SOCK_DONE-on-peer-shutdown.patch
+++ b/queue/vsock-virtio-set-SOCK_DONE-on-peer-shutdown.patch
@@ -1,4 +1,4 @@
-From 42f5cda5eaf4396a939ae9bb43bb8d1d09c1b15c Mon Sep 17 00:00:00 2001
+From 5c569681a5bc7071fe4a060604ca1b7b9762dde8 Mon Sep 17 00:00:00 2001
From: Stephen Barber <smbarber@chromium.org>
Date: Fri, 14 Jun 2019 23:42:37 -0700
Subject: [PATCH] vsock/virtio: set SOCK_DONE on peer shutdown
@@ -15,6 +15,7 @@ This fixes the following bug:
Signed-off-by: Stephen Barber <smbarber@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index f3f3d06cb6d8..e30f53728725 100644
diff --git a/queue/watchdog-fix-compile-time-error-of-pretimeout-govern.patch b/queue/watchdog-fix-compile-time-error-of-pretimeout-govern.patch
index dfd32cb..f11671c 100644
--- a/queue/watchdog-fix-compile-time-error-of-pretimeout-govern.patch
+++ b/queue/watchdog-fix-compile-time-error-of-pretimeout-govern.patch
@@ -1,4 +1,4 @@
-From a223770bfa7b6647f3a70983257bd89f9cafce46 Mon Sep 17 00:00:00 2001
+From 4a6149082172ae7ef7bb98905c1568e27ee2b57b Mon Sep 17 00:00:00 2001
From: Vladimir Zapolskiy <vz@mleia.com>
Date: Tue, 12 Mar 2019 01:54:25 +0200
Subject: [PATCH] watchdog: fix compile time error of pretimeout governors
@@ -28,12 +28,13 @@ Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
-index 242eea859637..fa325b49672e 100644
+index 9af07fd92763..4f909d4c2a0a 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -2028,6 +2028,7 @@ comment "Watchdog Pretimeout Governors"
+@@ -1957,6 +1957,7 @@ comment "Watchdog Pretimeout Governors"
config WATCHDOG_PRETIMEOUT_GOV
bool "Enable watchdog pretimeout governors"
diff --git a/queue/watchdog-imx2_wdt-Fix-set_timeout-for-big-timeout-va.patch b/queue/watchdog-imx2_wdt-Fix-set_timeout-for-big-timeout-va.patch
index 5003754..399351c 100644
--- a/queue/watchdog-imx2_wdt-Fix-set_timeout-for-big-timeout-va.patch
+++ b/queue/watchdog-imx2_wdt-Fix-set_timeout-for-big-timeout-va.patch
@@ -1,4 +1,4 @@
-From b07e228eee69601addba98b47b1a3850569e5013 Mon Sep 17 00:00:00 2001
+From f01649974b371043cd893c230c85d9a1e0041d36 Mon Sep 17 00:00:00 2001
From: Georg Hofmann <georg@hofmannsweb.com>
Date: Mon, 8 Apr 2019 21:25:54 +0200
Subject: [PATCH] watchdog: imx2_wdt: Fix set_timeout for big timeout values
@@ -15,12 +15,13 @@ Signed-off-by: Georg Hofmann <georg@hofmannsweb.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
-index 1b0faa26dbd4..a606005dd65f 100644
+index f07850d2c977..c95079b76fd0 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
-@@ -178,8 +178,10 @@ static void __imx2_wdt_set_timeout(struct watchdog_device *wdog,
+@@ -181,8 +181,10 @@ static void __imx2_wdt_set_timeout(struct watchdog_device *wdog,
static int imx2_wdt_set_timeout(struct watchdog_device *wdog,
unsigned int new_timeout)
{
diff --git a/queue/x86-CPU-AMD-Don-t-force-the-CPB-cap-when-running-und.patch b/queue/x86-CPU-AMD-Don-t-force-the-CPB-cap-when-running-und.patch
index fd44153..0484777 100644
--- a/queue/x86-CPU-AMD-Don-t-force-the-CPB-cap-when-running-und.patch
+++ b/queue/x86-CPU-AMD-Don-t-force-the-CPB-cap-when-running-und.patch
@@ -1,4 +1,4 @@
-From 2ac44ab608705948564791ce1d15d43ba81a1e38 Mon Sep 17 00:00:00 2001
+From 4d3c9191f93410568091a11ae0b27d9224d01c34 Mon Sep 17 00:00:00 2001
From: Frank van der Linden <fllinden@amazon.com>
Date: Wed, 22 May 2019 22:17:45 +0000
Subject: [PATCH] x86/CPU/AMD: Don't force the CPB cap when running under a
@@ -41,12 +41,13 @@ Fixes: 0237199186e7 ("x86/CPU/AMD: Set the CPB bit unconditionally on F17h")
Link: http://lkml.kernel.org/r/20190522221745.GA15789@dev-dsk-fllinden-2c-c1893d73.us-west-2.amazon.com
[ Minor edits to the changelog. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 80a405c2048a..8d4e50428b68 100644
+index 909a474e74b1..6adf09779fa0 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
-@@ -824,8 +824,11 @@ static void init_amd_zn(struct cpuinfo_x86 *c)
+@@ -813,8 +813,11 @@ static void init_amd_zn(struct cpuinfo_x86 *c)
{
set_cpu_cap(c, X86_FEATURE_ZEN);
diff --git a/queue/x86-PCI-Fix-PCI-IRQ-routing-table-memory-leak.patch b/queue/x86-PCI-Fix-PCI-IRQ-routing-table-memory-leak.patch
index ceb7b14..e8fa336 100644
--- a/queue/x86-PCI-Fix-PCI-IRQ-routing-table-memory-leak.patch
+++ b/queue/x86-PCI-Fix-PCI-IRQ-routing-table-memory-leak.patch
@@ -1,4 +1,4 @@
-From ea094d53580f40c2124cef3d072b73b2425e7bfd Mon Sep 17 00:00:00 2001
+From c0b31bc0c57755ec150c228f4fabfbb0bcd1b103 Mon Sep 17 00:00:00 2001
From: Wenwen Wang <wang6495@umn.edu>
Date: Wed, 17 Apr 2019 09:18:50 -0500
Subject: [PATCH] x86/PCI: Fix PCI IRQ routing table memory leak
@@ -20,6 +20,7 @@ use the irq_routing_table local variable name he suggested]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 52e55108404e..d3a73f9335e1 100644
diff --git a/queue/x86-kasan-Fix-boot-with-5-level-paging-and-KASAN.patch b/queue/x86-kasan-Fix-boot-with-5-level-paging-and-KASAN.patch
index 112b30f..4a4cbe4 100644
--- a/queue/x86-kasan-Fix-boot-with-5-level-paging-and-KASAN.patch
+++ b/queue/x86-kasan-Fix-boot-with-5-level-paging-and-KASAN.patch
@@ -1,4 +1,4 @@
-From f3176ec9420de0c385023afa3e4970129444ac2f Mon Sep 17 00:00:00 2001
+From 057ee67af926efeccac933eb33e7bb86ad2e3d1f Mon Sep 17 00:00:00 2001
From: Andrey Ryabinin <aryabinin@virtuozzo.com>
Date: Fri, 14 Jun 2019 17:31:49 +0300
Subject: [PATCH] x86/kasan: Fix boot with 5-level paging and KASAN
@@ -39,12 +39,13 @@ Cc: kasan-dev@googlegroups.com
Cc: stable@vger.kernel.org
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20190614143149.2227-1-aryabinin@virtuozzo.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
-index 8dc0fc0b1382..296da58f3013 100644
+index e3e77527f8df..4bfd14d5da8e 100644
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
-@@ -199,7 +199,7 @@ static inline p4d_t *early_p4d_offset(pgd_t *pgd, unsigned long addr)
+@@ -198,7 +198,7 @@ static inline p4d_t *early_p4d_offset(pgd_t *pgd, unsigned long addr)
if (!pgtable_l5_enabled())
return (p4d_t *)pgd;
diff --git a/queue/x86-microcode-cpuhotplug-Add-a-microcode-loader-CPU-.patch b/queue/x86-microcode-cpuhotplug-Add-a-microcode-loader-CPU-.patch
index 837f70f..0e3b30a 100644
--- a/queue/x86-microcode-cpuhotplug-Add-a-microcode-loader-CPU-.patch
+++ b/queue/x86-microcode-cpuhotplug-Add-a-microcode-loader-CPU-.patch
@@ -1,4 +1,4 @@
-From 78f4e932f7760d965fb1569025d1576ab77557c5 Mon Sep 17 00:00:00 2001
+From 81b3cc7f00bd6157a67615f2649f12ad9b66a132 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Thu, 13 Jun 2019 15:49:02 +0200
Subject: [PATCH] x86/microcode, cpuhotplug: Add a microcode loader CPU hotplug
@@ -45,12 +45,13 @@ Cc: Peter Zijlstra <peterz@infradead.org>
Cc: <stable@vger.kernel.org>
Cc: x86@kernel.org
Link: https://bugzilla.kernel.org/show_bug.cgi?id=203637
+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 70a04436380e..a813987b5552 100644
+index b43ddefd77f4..b7027e667604 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
-@@ -872,7 +872,7 @@ int __init microcode_init(void)
+@@ -873,7 +873,7 @@ int __init microcode_init(void)
goto out_ucode_group;
register_syscore_ops(&mc_syscore_ops);
@@ -60,7 +61,7 @@ index 70a04436380e..a813987b5552 100644
pr_info("Microcode Update Driver: v%s.", DRIVER_VERSION);
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
-index 6a381594608c..5c6062206760 100644
+index 8796ba387152..ae6cfca6ff7b 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -101,6 +101,7 @@ enum cpuhp_state {
diff --git a/queue/x86-mm-KASLR-Compute-the-size-of-the-vmemmap-section.patch b/queue/x86-mm-KASLR-Compute-the-size-of-the-vmemmap-section.patch
index df038d2..2eb8415 100644
--- a/queue/x86-mm-KASLR-Compute-the-size-of-the-vmemmap-section.patch
+++ b/queue/x86-mm-KASLR-Compute-the-size-of-the-vmemmap-section.patch
@@ -1,4 +1,4 @@
-From 00e5a2bbcc31d5fea853f8daeba0f06c1c88c3ff Mon Sep 17 00:00:00 2001
+From 1cdbd2e105966e033cc6665d0e733672dde992bf Mon Sep 17 00:00:00 2001
From: Baoquan He <bhe@redhat.com>
Date: Thu, 23 May 2019 10:57:44 +0800
Subject: [PATCH] x86/mm/KASLR: Compute the size of the vmemmap section
@@ -45,12 +45,13 @@ Cc: stable <stable@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190523025744.3756-1-bhe@redhat.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
-index dc3f058bdf9b..dc6182eecefa 100644
+index 0988971069c9..bfe769209eae 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
-@@ -52,7 +52,7 @@ static __initdata struct kaslr_memory_region {
+@@ -51,7 +51,7 @@ static __initdata struct kaslr_memory_region {
} kaslr_regions[] = {
{ &page_offset_base, 0 },
{ &vmalloc_base, 0 },
@@ -59,7 +60,7 @@ index dc3f058bdf9b..dc6182eecefa 100644
};
/* Get size in bytes used by the memory region */
-@@ -78,6 +78,7 @@ void __init kernel_randomize_memory(void)
+@@ -77,6 +77,7 @@ void __init kernel_randomize_memory(void)
unsigned long rand, memory_tb;
struct rnd_state rand_state;
unsigned long remain_entropy;
@@ -67,7 +68,7 @@ index dc3f058bdf9b..dc6182eecefa 100644
vaddr_start = pgtable_l5_enabled() ? __PAGE_OFFSET_BASE_L5 : __PAGE_OFFSET_BASE_L4;
vaddr = vaddr_start;
-@@ -109,6 +110,14 @@ void __init kernel_randomize_memory(void)
+@@ -108,6 +109,14 @@ void __init kernel_randomize_memory(void)
if (memory_tb < kaslr_regions[0].size_tb)
kaslr_regions[0].size_tb = memory_tb;
diff --git a/queue/x86-resctrl-Prevent-NULL-pointer-dereference-when-lo.patch b/queue/x86-resctrl-Prevent-NULL-pointer-dereference-when-lo.patch
index 760d69b..7430a20 100644
--- a/queue/x86-resctrl-Prevent-NULL-pointer-dereference-when-lo.patch
+++ b/queue/x86-resctrl-Prevent-NULL-pointer-dereference-when-lo.patch
@@ -1,4 +1,4 @@
-From 7a9601ac82e59966d54cfe60df659e4b80e18a2e Mon Sep 17 00:00:00 2001
+From 99e36d7219ccec44b24cde787cc2648154e5f18c Mon Sep 17 00:00:00 2001
From: Prarit Bhargava <prarit@redhat.com>
Date: Mon, 10 Jun 2019 13:15:44 -0400
Subject: [PATCH] x86/resctrl: Prevent NULL pointer dereference when local MBM
@@ -29,6 +29,7 @@ Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20190610171544.13474-1-prarit@redhat.com
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arch/x86/kernel/cpu/intel_rdt_monitor.c b/arch/x86/kernel/cpu/intel_rdt_monitor.c
index b0f3aed76b75..3d4ec80a6bb9 100644
diff --git a/queue/x86-uaccess-kcov-Disable-stack-protector.patch b/queue/x86-uaccess-kcov-Disable-stack-protector.patch
index e6fb88b..aadb242 100644
--- a/queue/x86-uaccess-kcov-Disable-stack-protector.patch
+++ b/queue/x86-uaccess-kcov-Disable-stack-protector.patch
@@ -1,4 +1,4 @@
-From 40ea97290b08be2e038b31cbb33097d1145e8169 Mon Sep 17 00:00:00 2001
+From c291c0ceffc429ef363362d4ed0449d1dfb2c003 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <peterz@infradead.org>
Date: Thu, 7 Mar 2019 19:54:25 +0100
Subject: [PATCH] x86/uaccess, kcov: Disable stack protector
@@ -20,9 +20,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/kernel/Makefile b/kernel/Makefile
-index 6c57e78817da..62471e75a2b0 100644
+index 04bc07c2b42a..88461007bace 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -30,6 +30,7 @@ KCOV_INSTRUMENT_extable.o := n
diff --git a/queue/xen-pvcalls-Remove-set-but-not-used-variable.patch b/queue/xen-pvcalls-Remove-set-but-not-used-variable.patch
index b5f6c19..b200368 100644
--- a/queue/xen-pvcalls-Remove-set-but-not-used-variable.patch
+++ b/queue/xen-pvcalls-Remove-set-but-not-used-variable.patch
@@ -1,4 +1,4 @@
-From 41349672e3cbc2e8349831f21253509c3415aa2b Mon Sep 17 00:00:00 2001
+From c558f8c3be0ec4d3a61c6cd372a4a38590600f7f Mon Sep 17 00:00:00 2001
From: YueHaibing <yuehaibing@huawei.com>
Date: Sat, 25 May 2019 22:21:51 +0800
Subject: [PATCH] xen/pvcalls: Remove set but not used variable
@@ -17,12 +17,13 @@ They are never used since introduction.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
-index 8a249c95c193..d7438fdc5706 100644
+index 91da7e44d5d4..3a144eecb6a7 100644
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
-@@ -540,7 +540,6 @@ out:
+@@ -538,7 +538,6 @@ static int __write_ring(struct pvcalls_data_intf *intf,
int pvcalls_front_sendmsg(struct socket *sock, struct msghdr *msg,
size_t len)
{
@@ -30,7 +31,7 @@ index 8a249c95c193..d7438fdc5706 100644
struct sock_mapping *map;
int sent, tot_sent = 0;
int count = 0, flags;
-@@ -552,7 +551,6 @@ int pvcalls_front_sendmsg(struct socket *sock, struct msghdr *msg,
+@@ -550,7 +549,6 @@ int pvcalls_front_sendmsg(struct socket *sock, struct msghdr *msg,
map = pvcalls_enter_sock(sock);
if (IS_ERR(map))
return PTR_ERR(map);
@@ -38,7 +39,7 @@ index 8a249c95c193..d7438fdc5706 100644
mutex_lock(&map->active.out_mutex);
if ((flags & MSG_DONTWAIT) && !pvcalls_front_write_todo(map)) {
-@@ -635,7 +633,6 @@ out:
+@@ -633,7 +631,6 @@ static int __read_ring(struct pvcalls_data_intf *intf,
int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
int flags)
{
@@ -46,7 +47,7 @@ index 8a249c95c193..d7438fdc5706 100644
int ret;
struct sock_mapping *map;
-@@ -645,7 +642,6 @@ int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+@@ -643,7 +640,6 @@ int pvcalls_front_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
map = pvcalls_enter_sock(sock);
if (IS_ERR(map))
return PTR_ERR(map);
diff --git a/queue/xenbus-Avoid-deadlock-during-suspend-due-to-open-tra.patch b/queue/xenbus-Avoid-deadlock-during-suspend-due-to-open-tra.patch
index adabb59..db6c39f 100644
--- a/queue/xenbus-Avoid-deadlock-during-suspend-due-to-open-tra.patch
+++ b/queue/xenbus-Avoid-deadlock-during-suspend-due-to-open-tra.patch
@@ -1,4 +1,4 @@
-From d10e0cc113c9e1b64b5c6e3db37b5c839794f3df Mon Sep 17 00:00:00 2001
+From e217fac10f56c9af088c6922e3e3c8d949304400 Mon Sep 17 00:00:00 2001
From: Ross Lagerwall <ross.lagerwall@citrix.com>
Date: Mon, 13 May 2019 14:56:35 +0100
Subject: [PATCH] xenbus: Avoid deadlock during suspend due to open
@@ -35,6 +35,7 @@ before freezing.
Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/drivers/xen/xenbus/xenbus.h b/drivers/xen/xenbus/xenbus.h
index 092981171df1..d75a2385b37c 100644
@@ -56,7 +57,7 @@ index 092981171df1..d75a2385b37c 100644
+
#endif
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
-index faf452d0edf0..08adc590f631 100644
+index 0782ff3c2273..39c63152a358 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -62,6 +62,8 @@