Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <ohering@suse.de>2019-04-25 09:47:46 +0200
committerOlaf Hering <ohering@suse.de>2019-04-25 09:47:46 +0200
commit3d524cb7308a1dfdd4a6fa267ffa0a241d77b26d (patch)
tree5c96154d16adafcab09c07b4eb8eaade6056a3af
parent3aad3aa51dd9d73f55048f0403f28297b26f51c7 (diff)
ad mainline tags to ibmvnic patches to allow further work in this branchSLE12-SP4
-rw-r--r--patches.drivers/ibmvnic-Enable-GRO.patch3
-rw-r--r--patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch3
-rw-r--r--series.conf6
3 files changed, 4 insertions, 8 deletions
diff --git a/patches.drivers/ibmvnic-Enable-GRO.patch b/patches.drivers/ibmvnic-Enable-GRO.patch
index c760f85d21..f4be4562a3 100644
--- a/patches.drivers/ibmvnic-Enable-GRO.patch
+++ b/patches.drivers/ibmvnic-Enable-GRO.patch
@@ -4,8 +4,7 @@ Date: Wed, 10 Apr 2019 11:06:59 -0500
Subject: [PATCH] ibmvnic: Enable GRO
References: bsc#1132227
-Patch-mainline: queued
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Patch-mainline: v5.1-rc6
Git-commit: b66b7bd2bdc1a74c46a0a470f9ac19629320d212
Enable Generic Receive Offload in the ibmvnic driver.
diff --git a/patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch b/patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch
index 6262c9c6af..378be225ee 100644
--- a/patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch
+++ b/patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch
@@ -4,8 +4,7 @@ Date: Wed, 10 Apr 2019 11:07:00 -0500
Subject: [PATCH] ibmvnic: Fix netdev feature clobbering during a reset
References: bsc#1132227
-Patch-mainline: queued
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+Patch-mainline: v5.1-rc6
Git-commit: dde746a35f8b7da4b9515dd3dc4708a9926fbd65
While determining offload capabilities of backing hardware during
diff --git a/series.conf b/series.conf
index 2cabfba363..f140f4c263 100644
--- a/series.conf
+++ b/series.conf
@@ -21680,6 +21680,8 @@
patches.drivers/PCI-Add-function-1-DMA-alias-quirk-for-Marvell-9170-.patch
patches.fixes/0001-PCI-pciehp-Ignore-Link-State-Changes-after-powering-.patch
patches.arch/svm-avic-fix-invalidate-logical-apic-id-entry
+ patches.drivers/ibmvnic-Enable-GRO.patch
+ patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch
patches.fixes/crypto-x86-poly1305-fix-overflow-during-partial-redu.patch
patches.drivers/Input-snvs_pwrkey-initialize-necessary-driver-data-b.patch
patches.drivers/iio-cros_ec-Fix-the-maths-for-gyro-scale-calculation.patch
@@ -21691,10 +21693,6 @@
patches.drivers/ALSA-core-Fix-card-races-between-register-and-discon.patch
patches.drivers/ALSA-hda-realtek-add-two-more-pin-configuration-sets.patch
- # davem/net
- patches.drivers/ibmvnic-Enable-GRO.patch
- patches.drivers/ibmvnic-Fix-netdev-feature-clobbering-during-a-reset.patch
-
# davem/net-next
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch