Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora

12 files changed, 39 insertions, 5 deletions

diff --git a/configs/fedora/generic/x86/CONFIG_CMA_ALIGNMENT b/configs/fedora/generic/x86/CONFIG_CMA_ALIGNMENT
new file mode 100644
index 000000000..7941445e7
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CMA_ALIGNMENT
@@ -0,0 +1 @@
+CONFIG_CMA_ALIGNMENT=8
diff --git a/configs/fedora/generic/x86/CONFIG_CMA_SIZE_MBYTES b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_MBYTES
new file mode 100644
index 000000000..2fb4d4a55
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_MBYTES
@@ -0,0 +1 @@
+CONFIG_CMA_SIZE_MBYTES=0
diff --git a/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MAX b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MAX
new file mode 100644
index 000000000..e8ad8cf05
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MAX
@@ -0,0 +1 @@
+# CONFIG_CMA_SIZE_SEL_MAX is not set
diff --git a/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MBYTES b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MBYTES
new file mode 100644
index 000000000..2a76a105c
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MBYTES
@@ -0,0 +1 @@
+CONFIG_CMA_SIZE_SEL_MBYTES=y
diff --git a/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MIN b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MIN
new file mode 100644
index 000000000..2748b1eb6
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_MIN
@@ -0,0 +1 @@
+# CONFIG_CMA_SIZE_SEL_MIN is not set
diff --git a/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_PERCENTAGE b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_PERCENTAGE
new file mode 100644
index 000000000..a23118a96
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_CMA_SIZE_SEL_PERCENTAGE
@@ -0,0 +1 @@
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
diff --git a/configs/fedora/generic/x86/CONFIG_DMA_CMA b/configs/fedora/generic/x86/CONFIG_DMA_CMA
new file mode 100644
index 000000000..c7c1c2c43
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_DMA_CMA
@@ -0,0 +1 @@
+CONFIG_DMA_CMA=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 8632d9732..c1f0feddb 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -803,7 +803,13 @@ CONFIG_CM32181=m
 # CONFIG_CM3323 is not set
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 # CONFIG_CMA is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
@@ -1159,7 +1165,7 @@ CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index fb839a497..f147467a8 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -802,7 +802,13 @@ CONFIG_CM32181=m
 # CONFIG_CM3323 is not set
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 # CONFIG_CMA is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
@@ -1151,7 +1157,7 @@ CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 0ef052075..4477b4270 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -812,9 +812,15 @@ CONFIG_CM32181=m
 # CONFIG_CM3323 is not set
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
@@ -1197,7 +1203,7 @@ CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG_SG is not set
 CONFIG_DMA_API_DEBUG=y
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 51308d14a..9b611e802 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -811,9 +811,15 @@ CONFIG_CM32181=m
 # CONFIG_CM3323 is not set
 CONFIG_CM3605=m
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_PARTITION is not set
@@ -1189,7 +1195,7 @@ CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
diff --git a/kernel.spec b/kernel.spec
index 004c9b1f2..a67a65a98 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -887,7 +887,7 @@ Patch507: 0001-mm-Avoid-creating-virtual-address-aliases-in-brk-mma.patch
 Patch508: 0001-drm-i915-Serialise-i915_active_acquire-with-__active.patch
 
 # Backport vboxsf from 5.6, can be dropped when we move to 5.6
-Patch509: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch
+Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -2921,6 +2921,9 @@ fi
 #
 #
 %changelog
+* Mon Feb 24 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.6-200
+- Linux v5.5.6
+
 * Fri Feb 21 2020 Hans de Goede <hdegoede@redhat.com>
 - Backport Virtual Box Guest shared folder support from 5.6