Skip to content

Commit

Permalink
Update to kernel-5.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
fepitre committed May 11, 2019
1 parent 732780e commit c68ee34
Show file tree
Hide file tree
Showing 17 changed files with 159 additions and 92 deletions.
6 changes: 3 additions & 3 deletions 0001-kbuild-AFTER_LINK.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 59ee809914574cb2f858e94755fa17be86f34844 Mon Sep 17 00:00:00 2001
From 73ea910506e9e59f7262fc5c94ebdddd4526fed9 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 6 Oct 2008 23:03:03 -0700
Subject: [PATCH] kbuild: AFTER_LINK
Expand Down Expand Up @@ -47,10 +47,10 @@ index 5bfe2243a08f..b6ec22f85266 100644
VDSO_LDFLAGS = -shared $(call ld-option, --hash-style=both) \
$(call ld-option, --build-id) $(call ld-option, --eh-frame-hdr) \
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index c8cf45362bd6..ee9c4d8e1ddf 100755
index dc0e8c5a1402..78056cc98fc4 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -112,6 +112,10 @@ vmlinux_link()
@@ -89,6 +89,10 @@ vmlinux_link()
-lutil -lrt -lpthread
rm -f linux
fi
Expand Down
2 changes: 1 addition & 1 deletion 0002-xen-netfront-detach-crash.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 12e8f728cbc2bc04bb92b6507369462119aae167 Mon Sep 17 00:00:00 2001
From 1aa7dd7bf8f02b5447a63182bd45a96da25de4f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Thu, 6 Sep 2018 15:09:44 +0200
Expand Down
6 changes: 3 additions & 3 deletions 0003-mce-hide-EBUSY-initialization-error-on-Xen.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d067698d74ef4d62d6afffc5433cf8d2a6aa69e0 Mon Sep 17 00:00:00 2001
From 791f22b92868334abf94870eba965ffcd3a34130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Tue, 5 Jan 2016 02:44:04 +0100
Expand Down Expand Up @@ -39,7 +39,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 9 insertions(+)

diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
index 6ce290c506d9..8db95e580a85 100644
index b7fb541a4873..1947eb18d874 100644
--- a/arch/x86/kernel/cpu/mce/core.c
+++ b/arch/x86/kernel/cpu/mce/core.c
@@ -50,6 +50,10 @@
Expand All @@ -53,7 +53,7 @@ index 6ce290c506d9..8db95e580a85 100644
#include "internal.h"

static DEFINE_MUTEX(mce_log_mutex);
@@ -2406,6 +2410,11 @@ static __init int mcheck_init_device(void)
@@ -2376,6 +2380,11 @@ static __init int mcheck_init_device(void)
free_cpumask_var(mce_device_initialized);

err_out:
Expand Down
2 changes: 1 addition & 1 deletion 0004-Log-error-code-of-EVTCHNOP_bind_pirq-failure.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6cc28f4d36c81f198dc8cdade583039642942dab Mon Sep 17 00:00:00 2001
From d4a2de0378cb95512e61a6f6af542b92ec4fda76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Sat, 30 Jan 2016 01:53:26 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ad4aeb98f9ebc13ebf9a81de5392ad8cd30c7525 Mon Sep 17 00:00:00 2001
From 82b169276e10dc42c5bb8666eefd97dacf4bfc7e Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Mon, 11 Jun 2012 22:49:31 +0200
Subject: [PATCH] pvops: respect 'removable' xenstore flag for block devices
Expand All @@ -10,7 +10,7 @@ by normal user.
1 file changed, 7 insertions(+)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 0ed4b200fa58..2054a3e9e435 100644
index d43a5677ccbc..a8df7688673a 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -2339,6 +2339,7 @@ static void blkfront_connect(struct blkfront_info *info)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From fea008c8237d8d1aa6ecf6e8bc16fbcf12da2b09 Mon Sep 17 00:00:00 2001
From eac56ff23482839805609d61ae8a7c1e325b4fe0 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sun, 15 Jul 2012 19:57:47 +0200
Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
Expand All @@ -8,7 +8,7 @@ Subject: [PATCH] pvops/xen-blkfront: handle FDEJECT as detach request (#630)
1 file changed, 4 insertions(+)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 2054a3e9e435..132723c0b337 100644
index a8df7688673a..b71f03a684ee 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -47,6 +47,7 @@
Expand Down
10 changes: 5 additions & 5 deletions 0007-block-add-no_part_scan-module-parameter.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 7a37309da40875ffaab868473df535b2f19d6e7a Mon Sep 17 00:00:00 2001
From e6678551bfaed27e7c22877afd15a542c1d5d13f Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@openmailbox.org>
Date: Mon, 11 Jul 2016 13:05:38 +0000
Subject: [PATCH] block: add no_part_scan module parameter
Expand All @@ -15,11 +15,11 @@ the /sys/module/block/parameters/no_part_scan file.
1 file changed, 12 insertions(+)

diff --git a/block/genhd.c b/block/genhd.c
index 1dd8fd6613b8..3eeba80e40bf 100644
index 703267865f14..d23df3adf080 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -661,6 +661,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
WARN_ON(err);
@@ -663,6 +663,15 @@ static void register_disk(struct device *parent, struct gendisk *disk,
}
}

+/* copied (not moved) from far down below, to have fewer patch hunks */
Expand All @@ -34,7 +34,7 @@ index 1dd8fd6613b8..3eeba80e40bf 100644
/**
* __device_add_disk - add disk information to kernel list
* @parent: parent device for the disk
@@ -680,6 +689,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
@@ -682,6 +691,9 @@ static void __device_add_disk(struct device *parent, struct gendisk *disk,
dev_t devt;
int retval;

Expand Down
2 changes: 1 addition & 1 deletion 0008-xen-Add-RING_COPY_RESPONSE.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d3ad2f3739a7c6eca8f7177a89449cbd16557c7f Mon Sep 17 00:00:00 2001
From 8ed84d55e0fab9af237e3506ac23b6c5a08f49f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Tue, 15 Dec 2015 21:35:14 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 48468975242efd6098b66685a00e6f906fa740e2 Mon Sep 17 00:00:00 2001
From 451fe08638b8bb5c7579ef66d763b796e2345d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:09:55 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8ea03fbc0533da4a06b5b13a2ebff11c5e7e5db6 Mon Sep 17 00:00:00 2001
From bdda44ef5cc1ed1929e4ae193a1cc85cf5db45df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:19:37 +0100
Expand Down
2 changes: 1 addition & 1 deletion 0011-xen-netfront-add-range-check-for-Tx-response-id.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From becb6fe42dc732b626000752a79e9374b6502417 Mon Sep 17 00:00:00 2001
From d81bcfcdadd17347a661d1379960d3144d2f69fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:22:24 +0100
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 137c43d513048974b8f2cf662b05f6b5b9b5711d Mon Sep 17 00:00:00 2001
From f65e1229bf1ad7925618d195fa1b79a7d5ec2c51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 05:51:10 +0100
Expand All @@ -20,7 +20,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 132723c0b337..a11d39df586b 100644
index b71f03a684ee..8bd9fc13f6c9 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1551,7 +1551,7 @@ static bool blkif_completion(unsigned long *id,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From d611c137661200e874ce07633fd1f18232ad8ad2 Mon Sep 17 00:00:00 2001
From 53b58dbc83cdbfb8cb06636b4a150d0a832836f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
<marmarek@invisiblethingslab.com>
Date: Wed, 16 Dec 2015 06:07:14 +0100
Expand All @@ -22,7 +22,7 @@ Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
1 file changed, 44 insertions(+), 32 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index a11d39df586b..d55e18aa1cff 100644
index 8bd9fc13f6c9..08d565b193ba 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -527,19 +527,16 @@ static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5d1abeb05f35d53d7344eead0f8fcce4eea783fb Mon Sep 17 00:00:00 2001
From 412a7ffe316ed4803553cef9cf4fb7a0a02b7f31 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 1 Apr 2015 17:01:26 -0400
Subject: [PATCH] xen/pcifront/pciback: Update pciif.h with ->err and ->result
Expand Down Expand Up @@ -34,10 +34,10 @@ index eba6e33147a2..cc6dcb13f1a8 100644

static void pci_frontend_disable_msix(struct pci_dev *dev)
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index ea4a08b83fa0..2d63aa2946a3 100644
index 787966f44589..0574c9121124 100644
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -268,7 +268,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
@@ -266,7 +266,7 @@ int xen_pcibk_enable_msix(struct xen_pcibk_device *pdev,
if (dev_data)
dev_data->ack_intr = 0;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 38e59128707d1efda6ccba7e5ad548f5c2118926 Mon Sep 17 00:00:00 2001
From 447afa1fafa01e66cabb4d42a5ffe3d851f8989f Mon Sep 17 00:00:00 2001
From: HW42 <hw42@ipsumj.de>
Date: Tue, 12 Sep 2017 00:49:02 +0200
Subject: [PATCH] xen-pciback: add attribute to allow MSI enable flag writes
Expand Down
Loading

0 comments on commit c68ee34

Please sign in to comment.