rebase patches on top of Ubuntu-4.15.0-32.35

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov
2018-08-16 12:20:46 +02:00
committed by Dietmar Maurer
parent 7f421f4002
commit e2af2a6161
4 changed files with 8 additions and 12 deletions
@@ -54,10 +54,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 files changed, 110 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index c14cccce6272..b3aa6fcfe035 100644
index e1c10a202abe..e40248310433 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2971,6 +2971,15 @@
@@ -3049,6 +3049,15 @@
nomsi [MSI] If the PCI_MSI kernel config parameter is
enabled, this kernel boot option can be used to
disable the use of MSI interrupts system-wide.