Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-15 11:22:49 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-15 11:26:40 +0200
commitc1e9c04963c2cb1fee36cae28bff28389da29fe0 (patch)
tree8b6bc507b1d6e4cc1a3d8e282226e6bb1af525c2
parentc190c41fb2e45114027544fa93d23be179c35bf0 (diff)
Move upstreamed nvme and powerpc patches to sorted section
-rw-r--r--patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch3
-rw-r--r--patches.arch/powerpc-numa-improve-control-of-topology-updates.patch3
-rw-r--r--patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch3
-rw-r--r--patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch3
-rw-r--r--patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch3
-rw-r--r--series.conf14
6 files changed, 10 insertions, 19 deletions
diff --git a/patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch b/patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch
index ce83ac8841..9f5a29a14b 100644
--- a/patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch
+++ b/patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch
@@ -5,8 +5,7 @@ Subject: [PATCH] powerpc/numa: document topology_updates_enabled, disable by
default
References: bsc#1133584
-Patch-mainline: queued
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Patch-mainline: v5.2-rc1
Git-commit: 558f86493df09f68f79fe056d9028d317a3ce8ab
Changing the NUMA associations for CPUs and memory at runtime is
diff --git a/patches.arch/powerpc-numa-improve-control-of-topology-updates.patch b/patches.arch/powerpc-numa-improve-control-of-topology-updates.patch
index f62c6c2bae..3a04a469dd 100644
--- a/patches.arch/powerpc-numa-improve-control-of-topology-updates.patch
+++ b/patches.arch/powerpc-numa-improve-control-of-topology-updates.patch
@@ -4,8 +4,7 @@ Date: Thu, 18 Apr 2019 13:56:57 -0500
Subject: [PATCH] powerpc/numa: improve control of topology updates
References: bsc#1133584
-Patch-mainline: queued
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Patch-mainline: v5.2-rc1
Git-commit: 2d4d9b308f8f8dec68f6dbbff18c68ec7c6bd26f
When booted with "topology_updates=no", or when "off" is written to
diff --git a/patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch b/patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch
index 2e49b98154..50b4452a92 100644
--- a/patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch
+++ b/patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch
@@ -4,9 +4,8 @@ Date: Tue, 2 Oct 2018 10:35:59 -0500
Subject: [PATCH] powerpc/pseries: Track LMB nid instead of using device tree
References: bsc#1108270
-Patch-mainline: queued
+Patch-mainline: v5.2-rc1
Git-commit: b2d3b5ee66f2a04a918cc043cec0c9ed3de58f40
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
When removing memory we need to remove the memory from the node
it was added to instead of looking up the node it should be in
diff --git a/patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch b/patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch
index 35a8322a0d..0eb3f926d5 100644
--- a/patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch
+++ b/patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch
@@ -4,9 +4,8 @@ Date: Wed, 16 Jan 2019 14:47:44 -0200
Subject: [PATCH] powerpc/tm: Avoid machine crash on rt_sigreturn()
References: bsc#1118338
-Patch-mainline: queued
+Patch-mainline: v5.2-rc1
Git-commit: e620d45065c7b5b8d6ae11217c09c09380103b83
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
There is a kernel crash that happens if rt_sigreturn() is called inside
a transactional block.
diff --git a/patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch b/patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch
index 67fa11cf5e..da6a698744 100644
--- a/patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch
+++ b/patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch
@@ -3,8 +3,7 @@ Date: Tue, 30 Apr 2019 18:57:09 +0200
Subject: [PATCH] nvme-multipath: split bios with the ns_head bio_set before
submitting
Git-commit: 525aa5a705d86e193726ee465d1a975265fabf19
-Git-repo: git://git.infradead.org/nvme.git
-Patch-Mainline: queued in subsystem maintainer tree
+Patch-Mainline: v5.2-rc1
References: bsc#1103259, bsc#1131673
If the bio is moved to a different queue via blk_steal_bios() and
diff --git a/series.conf b/series.conf
index 7b69a9964f..08dbbed8c0 100644
--- a/series.conf
+++ b/series.conf
@@ -21799,6 +21799,7 @@
patches.fixes/Revert-ide-unexport-DISK_EVENT_MEDIA_CHANGE-for-ide-.patch
patches.suse/Revert-block-unexport-DISK_EVENT_MEDIA_CHANGE-for.patch
patches.suse/block-check_events-don-t-bother-with-events-if-un.patch
+ patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch
patches.fixes/audit-fix-a-memleak-caused-by-auditing-load-module.patch
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch
patches.fixes/openvswitch-add-seqadj-extension-when-NAT-is-used.patch
@@ -21876,6 +21877,10 @@
patches.drivers/dmaengine-tegra210-dma-free-dma-controller-in-remove.patch
patches.drivers/clk-rockchip-fix-wrong-clock-definitions-for-rk3328.patch
patches.drivers/clk-rockchip-Fix-video-codec-clocks-on-rk3288.patch
+ patches.arch/powerpc-numa-improve-control-of-topology-updates.patch
+ patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch
+ patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch
+ patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch
patches.drivers/pwm-Fix-deadlock-warning-when-removing-PWM-device.patch
patches.drivers/pwm-tiehrpwm-Update-shadow-register-for-disabling-PW.patch
patches.drivers/pwm-meson-Consider-128-a-valid-pre-divider.patch
@@ -21898,12 +21903,6 @@
patches.drivers/net-ibmvnic-Update-MAC-address-settings-after-adapte.patch
patches.drivers/net-ibmvnic-Update-carrier-state-after-link-state-ch.patch
- # powerpc/linux next
- patches.arch/powerpc-numa-improve-control-of-topology-updates.patch
- patches.arch/powerpc-numa-document-topology_updates_enabled-disab.patch
- patches.arch/powerpc-pseries-Track-LMB-nid-instead-of-using-devic.patch
- patches.arch/powerpc-tm-Avoid-machine-crash-on-rt_sigreturn.patch
-
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
patches.suse/0002-efi-Add-EFI-signature-data-types.patch
@@ -21929,9 +21928,6 @@
# end of sorted patches
########################################################
- # git://git.infradead.org/nvme.git nvme-5.2
- patches.fixes/nvme-multipath-split-bios-with-the-ns_head-bio_set-b.patch
-
# MDS
patches.arch/x86-msr-index-cleanup-bit-defines.patch
patches.arch/x86-speculation-consolidate-cpu-whitelists.patch