kernel-5.9.0-0.rc4.4

* Mon Sep 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc4.4]
- Merge ark-patches
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2020-09-07 08:20:03 -05:00
parent 6493c5a9c4
commit 45d4c5a623
31 changed files with 268 additions and 118 deletions

View File

@ -8,7 +8,7 @@ Subject: [PATCH] Drop that for now
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 983e704d720b..7fdaaa5d20a4 100644
index 33c63014f15a..0cc2def5e1c5 100644
--- a/Makefile
+++ b/Makefile
@@ -497,7 +497,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE

View File

@ -27,7 +27,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
1 file changed, 6 insertions(+)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index df6479d7ff5f..e7fd1198c20b 100644
index 5e5ac50d9137..ce77b8dfe47a 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -4155,11 +4155,17 @@ static int bpf_iter_create(union bpf_attr *attr)

View File

@ -66,7 +66,7 @@ index f14f238dc36a..156d1e44d9f7 100644
#define TAINT_FLAGS_COUNT 32
#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 1bf960aa615c..df6479d7ff5f 100644
index b999e7ff2583..5e5ac50d9137 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -24,6 +24,7 @@

View File

@ -59,7 +59,7 @@ Acked-by: Prarit Bhargava <prarit@redhat.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index ff5e0731d26d..983e704d720b 100644
index ec2330ce0fc5..33c63014f15a 100644
--- a/Makefile
+++ b/Makefile
@@ -1249,7 +1249,13 @@ endef

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 1
RHEL_RELEASE = 5
#
# Early y+1 numbering

View File

@ -7530,7 +7530,7 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
@ -7913,6 +7913,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6055,6 +6055,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6249,6 +6250,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -7509,7 +7509,7 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
@ -7891,6 +7891,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6034,6 +6034,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6228,6 +6229,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -7801,7 +7801,7 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
@ -8217,6 +8217,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -7781,7 +7781,7 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
@ -8196,6 +8196,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -7541,7 +7541,7 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
@ -7943,6 +7943,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -7521,7 +7521,7 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
@ -7922,6 +7922,7 @@ CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6791,7 +6791,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -7241,6 +7241,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m

View File

@ -6770,7 +6770,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -7219,6 +7219,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m

View File

@ -6366,7 +6366,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -6717,6 +6717,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -5903,6 +5903,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6097,6 +6098,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6344,7 +6344,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -6694,6 +6694,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -5885,6 +5885,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6079,6 +6080,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6305,7 +6305,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -6661,6 +6661,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -5852,6 +5852,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6048,6 +6049,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6283,7 +6283,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -6638,6 +6638,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
CONFIG_XDP_SOCKETS=y
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -5834,6 +5834,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6030,6 +6031,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -5869,6 +5869,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6066,6 +6067,7 @@ CONFIG_XDP_SOCKETS=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
# CONFIG_XEN_SCSI_FRONTEND is not set
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XFRM_INTERFACE=m
CONFIG_XFRM_MIGRATE=y
CONFIG_XFRM_OFFLOAD=y

View File

@ -6845,7 +6845,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -7293,6 +7293,7 @@ CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m

View File

@ -6121,6 +6121,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6381,6 +6382,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_SCRUB_PAGES=y
# CONFIG_XEN_SCSI_FRONTEND is not set
CONFIG_XEN_SYS_HYPERVISOR=y
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m

View File

@ -6824,7 +6824,7 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_PCI_RENESAS=m
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
@ -7271,6 +7271,7 @@ CONFIG_XEN_SCSI_BACKEND=m
CONFIG_XEN_SCSI_FRONTEND=m
CONFIG_XEN_SYMS=y
CONFIG_XEN_SYS_HYPERVISOR=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m

View File

@ -6101,6 +6101,7 @@ CONFIG_VIDEO_HDPVR=m
# CONFIG_VIDEO_HEXIUM_GEMINI is not set
# CONFIG_VIDEO_HEXIUM_ORION is not set
# CONFIG_VIDEO_HI556 is not set
# CONFIG_VIDEO_IMX214 is not set
# CONFIG_VIDEO_IMX219 is not set
# CONFIG_VIDEO_IMX258 is not set
# CONFIG_VIDEO_IMX274 is not set
@ -6361,6 +6362,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_SCRUB_PAGES=y
# CONFIG_XEN_SCSI_FRONTEND is not set
CONFIG_XEN_SYS_HYPERVISOR=y
# CONFIG_XEN_UNPOPULATED_ALLOC is not set
CONFIG_XEN_WDT=m
CONFIG_XEN=y
CONFIG_XFRM_INTERFACE=m

View File

@ -30,7 +30,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
%global distro_build 0.rc3.20200902git9c7d619be5a0.1
%global distro_build 0.rc4.5
%if 0%{?fedora}
%define secure_boot_arch x86_64
@ -69,13 +69,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.9.0
%define pkgrelease 0.rc3.20200902git9c7d619be5a0.1
%define pkgrelease 0.rc4.5
# This is needed to do merge window version magic
%define patchlevel 9
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20200902git9c7d619be5a0.1%{?buildid}%{?dist}
%define specrelease 0.rc4.5%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@ -166,7 +166,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
%define debugbuildsenabled 0
%define debugbuildsenabled 1
# The kernel tarball/base version
%define kversion 5.9
@ -567,7 +567,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-20200902git9c7d619be5a0.tar.xz
Source0: linux-5.9-rc4.tar.xz
Source1: Makefile.rhelver
@ -789,7 +789,6 @@ Patch71: 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
Patch75: media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch
%endif
@ -1285,8 +1284,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-20200902git9c7d619be5a0 -c
mv linux-20200902git9c7d619be5a0 linux-%{KVERREL}
%setup -q -n kernel-5.9-rc4 -c
mv linux-5.9-rc4 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -1366,7 +1365,6 @@ ApplyOptionalPatch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch
ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch
ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
ApplyOptionalPatch media-ti-vpe-cal-Fix-compilation-on-32-bit-ARM.patch
%endif
@ -2795,6 +2793,213 @@ fi
#
#
%changelog
* Mon Sep 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc4.4]
- Merge ark-patches
* Mon Sep 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc4.3.test]
- v5.9-rc4 rebase
- Linux 5.9-rc4 (Linus Torvalds)
- Updated changelog for the release based on dd9fb9bb3340 (Fedora Kernel Team)
- io_uring: fix linked deferred ->files cancellation (Pavel Begunkov)
- io_uring: fix cancel of deferred reqs with ->files (Pavel Begunkov)
- io_uring: fix explicit async read/write mapping for large segments (Jens Axboe)
- x86/entry: Unbreak 32bit fast syscall (Thomas Gleixner)
- x86/debug: Allow a single level of #DB recursion (Andy Lutomirski)
- x86/entry: Fix AC assertion (Peter Zijlstra)
- tracing/kprobes, x86/ptrace: Fix regs argument order for i386 (Vamshi K Sthambamkadi)
- iommu/vt-d: Handle 36bit addressing for x86-32 (Chris Wilson)
- iommu/amd: Do not use IOMMUv2 functionality when SME is active (Joerg Roedel)
- iommu/amd: Do not force direct mapping when SME is active (Joerg Roedel)
- iommu/amd: Use cmpxchg_double() when updating 128-bit IRTE (Suravee Suthikulpanit)
- iommu/amd: Restore IRTE.RemapEn bit after programming IRTE (Suravee Suthikulpanit)
- iommu/vt-d: Fix NULL pointer dereference in dev_iommu_priv_set() (Lu Baolu)
- iommu/vt-d: Serialize IOMMU GCMD register modifications (Lu Baolu)
- MAINTAINERS: Update QUALCOMM IOMMU after Arm SMMU drivers move (Lukas Bulwahn)
- xen: add helpers to allocate unpopulated memory (Roger Pau Monne)
- memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC (Roger Pau Monne)
- xen/balloon: add header guard (Roger Pau Monne)
- x86, fakenuma: Fix invalid starting node ID (Huang Ying)
- x86/mm/32: Bring back vmalloc faulting on x86_32 (Joerg Roedel)
- x86/cmdline: Disable jump tables for cmdline.c (Arvind Sankar)
* Sun Sep 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200906gitdd9fb9bb3340.3]
- Merge ark-patches
* Sun Sep 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200906gitdd9fb9bb3340.2.test]
- dd9fb9bb3340 rebase
- include/linux/log2.h: add missing () around n in roundup_pow_of_two() (Jason Gunthorpe)
- mm/khugepaged.c: fix khugepaged's request size in collapse_file (David Howells)
- mm/hugetlb: fix a race between hugetlb sysctl handlers (Muchun Song)
- mm/hugetlb: try preferred node first when alloc gigantic page from cma (Li Xinhai)
- mm/migrate: preserve soft dirty in remove_migration_pte() (Ralph Campbell)
- mm/migrate: remove unnecessary is_zone_device_page() check (Ralph Campbell)
- mm/rmap: fixup copying of soft dirty and uffd ptes (Alistair Popple)
- mm/migrate: fixup setting UFFD_WP flag (Alistair Popple)
- mm: madvise: fix vma user-after-free (Yang Shi)
- checkpatch: fix the usage of capture group ( ... ) (Mrinal Pandey)
- fork: adjust sysctl_max_threads definition to match prototype (Tobias Klauser)
- ipc: adjust proc_ipc_sem_dointvec definition to match prototype (Tobias Klauser)
- mm: track page table modifications in __apply_to_page_range() (Joerg Roedel)
- MAINTAINERS: IA64: mark Status as Odd Fixes only (Randy Dunlap)
- MAINTAINERS: add LLVM maintainers (Nick Desaulniers)
- MAINTAINERS: update Cavium/Marvell entries (Robert Richter)
- mm: slub: fix conversion of freelist_corrupted() (Eugeniu Rosca)
- mm: memcg: fix memcg reclaim soft lockup (Xunlei Pang)
- memcg: fix use-after-free in uncharge_batch (Michal Hocko)
- xfs: don't update mtime on COW faults (Mikulas Patocka)
- ext2: don't update mtime on COW faults (Mikulas Patocka)
- Updated changelog for the release based on c70672d8d316 (Fedora Kernel Team)
- xfs: fix xfs_bmap_validate_extent_raw when checking attr fork of rt files ("Darrick J. Wong")
- ARC: [plat-hsdk]: Switch ethernet phy-mode to rgmii-id (Evgeniy Didin)
- arc: fix memory initialization for systems with two memory banks (Mike Rapoport)
- clang-format: Update with the latest for_each macro list (Miguel Ojeda)
- sparse: use static inline for __chk_{user,io}_ptr() (Luc Van Oostenryck)
- irqchip/eznps: Fix build error for !ARC700 builds (Vineet Gupta)
- ARC: show_regs: fix r12 printing and simplify (Vineet Gupta)
- Compiler Attributes: fix comment concerning GCC 4.6 (Luc Van Oostenryck)
- Compiler Attributes: remove comment about sparse not supporting __has_attribute (Luc Van Oostenryck)
- ARC: HSDK: wireup perf irq (Vineet Gupta)
- ARC: perf: don't bail setup if pct irq missing in device-tree (Vineet Gupta)
- ARC: pgalloc.h: delete a duplicated word + other fixes (Randy Dunlap)
- auxdisplay: Replace HTTP links with HTTPS ones ("Alexander A. Klimov")
* Sat Sep 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200905gitc70672d8d316.2]
- Merge ark-patches
* Sat Sep 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200905gitc70672d8d316.1.test]
- c70672d8d316 rebase
- Fedora confi gupdate ("Justin M. Forbes")
- net/packet: fix overflow in tpacket_rcv (Or Cohen)
- mm: Add PGREUSE counter (Peter Xu)
- mm/gup: Remove enfornced COW mechanism (Peter Xu)
- mm/ksm: Remove reuse_ksm_page() (Peter Xu)
- mm: do_wp_page() simplification (Linus Torvalds)
- gcov: Disable gcov build with GCC 10 (Leon Romanovsky)
- init: fix error check in clean_path() (Barret Rhoden)
- thermal: core: Fix use-after-free in thermal_zone_device_unregister() (Dmitry Osipenko)
- thermal: qcom-spmi-temp-alarm: Don't suppress negative temp (Veera Vegivada)
- thermal: ti-soc-thermal: Fix bogus thermal shutdowns for omap4430 (Tony Lindgren)
- Updated changelog for the release based on 59126901f200 (Fedora Kernel Team)
- ALSA: hda/realtek - Improved routing for Thinkpad X1 7th/8th Gen (Takashi Iwai)
- MIPS: SNI: Fix SCSI interrupt (Thomas Bogendoerfer)
- MIPS: add missing MSACSR and upper MSA initialization (Huang Pei)
- dmaengine: ti: k3-udma: Update rchan_oes_offset for am654 SYSFW ABI 3.0 (Peter Ujfalusi)
- drm/nouveau/kms/nv50-gp1xx: add WAR for EVO push buffer HW bug (Ben Skeggs)
- drm/nouveau/kms/nv50-gp1xx: disable notifies again after core update (Ben Skeggs)
- drm/nouveau/kms/nv50-: add some whitespace before debug message (Ben Skeggs)
- drm/nouveau/kms/gv100-: Include correct push header in crcc37d.c (Lyude Paul)
- drm/radeon: Prefer lower feedback dividers (Kai-Heng Feng)
- drm/amdgpu: Fix bug in reporting voltage for CIK (Sandeep Raghuraman)
- drm/amdgpu: Specify get_argument function for ci_smu_funcs (Sandeep Raghuraman)
- drm/amd/pm: enable MP0 DPM for sienna_cichlid (Jiansong Chen)
- drm/amd/pm: avoid false alarm due to confusing softwareshutdowntemp setting (Evan Quan)
- drm/amd/pm: fix is_dpm_running() run error on 32bit system (Kevin Wang)
- kconfig: remove redundant assignment prompt = prompt (Denis Efremov)
- kbuild: Documentation: clean up makefiles.rst (Randy Dunlap)
- kconfig: streamline_config.pl: check defined(ENV variable) before using it (Randy Dunlap)
- block: allow for_each_bvec to support zero len bvec (Ming Lei)
- ALSA: hda: use consistent HDAudio spelling in comments/docs (Pierre-Louis Bossart)
- libata: implement ATA_HORKAGE_MAX_TRIM_128M and apply to Sandisks (Tejun Heo)
- ALSA: hda: add dev_dbg log when driver is not selected (Pierre-Louis Bossart)
- ALSA: hda: fix a runtime pm issue in SOF when integrated GPU is disabled (Rander Wang)
- ALSA: hda: hdmi - add Rocketlake support (Rander Wang)
- io_uring: no read/write-retry on -EAGAIN error and O_NONBLOCK marked file (Jens Axboe)
- io_uring: set table->files[i] to NULL when io_sqe_file_register failed (Jiufei Xue)
- ALSA: ua101: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ALSA: usb-audio: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ASoC: txx9: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ASoC: siu: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ASoC: fsl_esai: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ALSA: hdsp: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ALSA: riptide: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ALSA: pci/asihpi: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ALSA: firewire: convert tasklets to use new tasklet_setup() API (Allen Pais)
- ALSA: core: convert tasklets to use new tasklet_setup() API (Allen Pais)
- s390: update defconfigs (Heiko Carstens)
- s390: fix GENERIC_LOCKBREAK dependency typo in Kconfig (Eric Farman)
- drm/i915: Clear the repeater bit on HDCP disable (Sean Paul)
- drm/i915: Fix sha_text population code (Sean Paul)
- drm/i915/display: Ensure that ret is always initialized in icl_combo_phy_verify_state (Nathan Chancellor)
- arm64/module: set trampoline section flags regardless of CONFIG_DYNAMIC_FTRACE (Jessica Yu)
- arm64: Remove exporting cpu_logical_map symbol (Sudeep Holla)
- blk-stat: make q->stats->lock irqsafe (Tejun Heo)
- blk-iocost: ioc_pd_free() shouldn't assume irq disabled (Tejun Heo)
- cpufreq: intel_pstate: Fix intel_pstate_get_hwp_max() for turbo disabled (Francisco Jerez)
- cpufreq: intel_pstate: Free memory only when turning off ("Rafael J. Wysocki")
- cpufreq: intel_pstate: Add ->offline and ->online callbacks ("Rafael J. Wysocki")
- cpufreq: intel_pstate: Tweak the EPP sysfs interface ("Rafael J. Wysocki")
- cpufreq: intel_pstate: Update cached EPP in the active mode ("Rafael J. Wysocki")
- cpufreq: intel_pstate: Refuse to turn off with HWP enabled ("Rafael J. Wysocki")
- block: fix locking in bdev_del_partition (Christoph Hellwig)
- block: release disk reference in hd_struct_free_work (Ming Lei)
- io_uring: fix removing the wrong file in __io_sqe_files_update() (Jiufei Xue)
- block: ensure bdi->io_pages is always initialized (Jens Axboe)
- ALSA: pcm: oss: Remove superfluous WARN_ON() for mulaw sanity check (Takashi Iwai)
- MIPS: perf: Fix wrong check condition of Loongson event IDs (Tiezhu Yang)
- Documentation/llvm: Improve formatting of commands, variables, and arguments (Nathan Chancellor)
- opp: Don't drop reference for an OPP table that was never parsed (Viresh Kumar)
- ALSA: hda - Fix silent audio output and corrupted input on MSI X570-A PRO (Dan Crawford)
- nvme-pci: cancel nvme device request before disabling (Tong Zhang)
- nvme: only use power of two io boundaries (Keith Busch)
- nvme: fix controller instance leak (Keith Busch)
- nvmet-fc: Fix a missed _irqsave version of spin_lock in 'nvmet_fc_fod_op_done()' (Christophe JAILLET)
- nvme: Fix NULL dereference for pci nvme controllers (Sagi Grimberg)
- nvme-rdma: fix reset hang if controller died in the middle of a reset (Sagi Grimberg)
- nvme-rdma: fix timeout handler (Sagi Grimberg)
- nvme-rdma: serialize controller teardown sequences (Sagi Grimberg)
- nvme-tcp: fix reset hang if controller died in the middle of a reset (Sagi Grimberg)
- nvme-tcp: fix timeout handler (Sagi Grimberg)
- nvme-tcp: serialize controller teardown sequences (Sagi Grimberg)
- nvme: have nvme_wait_freeze_timeout return if it timed out (Sagi Grimberg)
- nvme-fabrics: don't check state NVME_CTRL_NEW for request acceptance (Sagi Grimberg)
- nvmet-tcp: Fix NULL dereference when a connect data comes in h2cdata pdu (Ziye Yang)
- ALSA: hda/hdmi: always check pin power status in i915 pin fixup (Kai Vehmanen)
- ALSA: hda/realtek: Add quirk for Samsung Galaxy Book Ion NT950XCJ-X716A (Adrien Crivelli)
- ALSA: usb-audio: Add basic capture support for Pioneer DJ DJM-250MK2 (=?UTF-8?q?Franti=C5=A1ek=20Ku=C4=8Dera?=)
- ALSA: usb-audio: Add implicit feedback quirk for UR22C (Joshua Sivec)
- drivers/dma/dma-jz4780: Fix race condition between probe and irq handler (Madhuparna Bhowmik)
- dmaengine: dw-edma: Fix scatter-gather address calculation (Gustavo Pimentel)
- dmaengine: ti: k3-udma: Fix the TR initialization for prep_slave_sg (Peter Ujfalusi)
- dmaengine: pl330: Fix burst length if burst size is smaller than bus width (Marek Szyprowski)
- Revert "ALSA: hda: Add support for Loongson 7A1000 controller" (Tiezhu Yang)
- ALSA: hda/tegra: Program WAKEEN register for Tegra (Mohan Kumar)
- ALSA: hda: Fix 2 channel swapping for Tegra (Mohan Kumar)
- ALSA: ca0106: fix error code handling (Tong Zhang)
- Documentation: sound/cards: fix heading underline lengths for https: changes (Randy Dunlap)
- ALSA: usb-audio: Disable autosuspend for Lenovo ThinkStation P620 (Kai-Heng Feng)
- ALSA: firewire-digi00x: exclude Avid Adrenaline from detection (Takashi Sakamoto)
- ALSA; firewire-tascam: exclude Tascam FE-8 from detection (Takashi Sakamoto)
- mips/oprofile: Fix fallthrough placement (He Zhe)
- MIPS: Loongson64: Remove unnecessary inclusion of boot_param.h (WANG Xuerui)
- MIPS: BMIPS: Also call bmips_cpu_setup() for secondary cores (Florian Fainelli)
- MIPS: mm: BMIPS5000 has inclusive physical caches (Florian Fainelli)
- dmaengine: at_hdmac: add missing kfree() call in at_dma_xlate() (Yu Kuai)
- dmaengine: at_hdmac: add missing put_device() call in at_dma_xlate() (Yu Kuai)
- dmaengine: at_hdmac: check return value of of_find_device_by_node() in at_dma_xlate() (Yu Kuai)
- MIPS: Loongson64: Do not override watch and ejtag feature (Jiaxun Yang)
- dmaengine: of-dma: Fix of_dma_router_xlate's of_dma_xlate handling (Peter Ujfalusi)
- dmaengine: idxd: reset states after device disable or reset (Dave Jiang)
- dmaengine: acpi: Put the CSRT table after using it (Hanjun Guo)
- ata: ahci: use ata_link_info() instead of ata_link_printk() (Xu Wang)
* Fri Sep 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200904git59126901f200.1]
- Merge ark-patches
* Fri Sep 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200904git59126901f200.0.test]
- 59126901f200 rebase
- Updated changelog for the release based on fc3abb53250a (Fedora Kernel Team)
- Swap how ark-latest is built (Don Zickus)
- Add extra version bump to os-build branch (Don Zickus)
- dist-release: Avoid needless version bump. (Don Zickus)
- Add dist-fedora-release target (Don Zickus)
- Remove redundant code in dist-release (Don Zickus)
- Makefile.common rename TAG to _TAG (Don Zickus)
* Thu Sep 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200903gitfc3abb53250a.1]
- fc3abb53250a rebase
- Fedora config change ("Justin M. Forbes")
- Updated changelog for the release based on 9c7d619be5a0 (Fedora Kernel Team)
* Wed Sep 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200902git9c7d619be5a0.1]
- 9c7d619be5a0 rebase
- Updated changelog for the release based on b51594df17d0 (Fedora Kernel Team)

View File

@ -1,87 +0,0 @@
From patchwork Sun Aug 23 05:02:57 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
X-Patchwork-Id: 11731393
Return-Path: <SRS0=AvQq=CB=vger.kernel.org=linux-media-owner@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
[172.30.200.123])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6A6B8722
for <patchwork-linux-media@patchwork.kernel.org>;
Sun, 23 Aug 2020 05:03:38 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by mail.kernel.org (Postfix) with ESMTP id 4BE052078D
for <patchwork-linux-media@patchwork.kernel.org>;
Sun, 23 Aug 2020 05:03:38 +0000 (UTC)
Authentication-Results: mail.kernel.org;
dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com
header.b="wna3R5am"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1725830AbgHWFDb (ORCPT
<rfc822;patchwork-linux-media@patchwork.kernel.org>);
Sun, 23 Aug 2020 01:03:31 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34518 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1725139AbgHWFDa (ORCPT
<rfc822;linux-media@vger.kernel.org>);
Sun, 23 Aug 2020 01:03:30 -0400
Received: from perceval.ideasonboard.com (perceval.ideasonboard.com
[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 207F3C061573
for <linux-media@vger.kernel.org>;
Sat, 22 Aug 2020 22:03:29 -0700 (PDT)
Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])
by perceval.ideasonboard.com (Postfix) with ESMTPSA id A2664279;
Sun, 23 Aug 2020 07:03:19 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;
s=mail; t=1598158999;
bh=pCzlECsGsGlZ009xXDAzUUxxYRXREdIH2Vxcu2J4NoA=;
h=From:To:Cc:Subject:Date:From;
b=wna3R5amAoR1l5Bmtiiw+v3SgMfm4JGvJoymrg8wCxrgljpMw51vRaGS5lfqlBLAx
SkDqbTJZUQJjKa0GsXajUzf8ZHpISmrWLNVuWuw66UhpZoZGzNy7aGhZEvT6bHCD8a
87cN/DkwIVoRggoROSztWe6nUCcHqFElhdsy6oGA=
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: linux-media@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>,
Benoit Parrot <bparrot@ti.com>
Subject: [PATCH] media: ti-vpe: cal: Fix compilation on 32-bit ARM
Date: Sun, 23 Aug 2020 08:02:57 +0300
Message-Id: <20200823050257.564-1-laurent.pinchart@ideasonboard.com>
X-Mailer: git-send-email 2.27.0
MIME-Version: 1.0
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
When compiled on 32-bit ARM, the CAL driver fails with the FIELD_PREP()
macro complaining that the mask is not constant. While all callers of
the inline cal_write_field() function pass a constant mask, the mask
parameter itself is a variable, which likely doesn't please the
compiler.
Fix it by replacing FIELD_PREP() with a manual implementation.
Fixes: 50797fb30b95 ("media: ti-vpe: cal: Turn reg_(read|write)_field() into inline functions")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reported-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/media/platform/ti-vpe/cal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
index e496083715d2..4123405ee0cf 100644
--- a/drivers/media/platform/ti-vpe/cal.h
+++ b/drivers/media/platform/ti-vpe/cal.h
@@ -226,7 +226,7 @@ static inline void cal_write_field(struct cal_dev *cal, u32 offset, u32 value,
u32 val = cal_read(cal, offset);
val &= ~mask;
- val |= FIELD_PREP(mask, value);
+ val |= (value << __ffs(mask)) & mask;
cal_write(cal, offset, val);
}

View File

@ -1,3 +1,3 @@
SHA512 (linux-20200902git9c7d619be5a0.tar.xz) = e76d90f0139581c573a9e6d58ce35e16481027d485c865057ea451a52b1fe1ddb9c046b23dba7def7ac7dd0aea8fe102c9228a174ce8036ddae3c9d5e61bb61a
SHA512 (kernel-abi-whitelists-5.9.0-0.rc3.20200902git9c7d619be5a0.1.tar.bz2) = 4b9b78c56d2f2a7b4abc86a6ad8cb644703ba835530c4d6debc7ab1f78f5bd994bd91f6082cbe1ac846f42044f7276823353c4419646b4fe0022f3e8a5a0f07a
SHA512 (kernel-kabi-dw-5.9.0-0.rc3.20200902git9c7d619be5a0.1.tar.bz2) = b9a4ff9ec696c1f5abe51bb02697c087f03036d9859013a8f18afa34b56a6fef3a6c36b565c3cc25a459d1573eef81ec53dcf8861f3b8a49d209bcecee39eb90
SHA512 (linux-5.9-rc4.tar.xz) = 2899fd304d48bfe10cd2915fe9c89dacbc9793e0d2b4a06ae0656afc7170cab895c9da6e81975e999958a1d6ae340a43a3a88306330a7f41383580541e33cb26
SHA512 (kernel-abi-whitelists-5.9.0-0.rc4.5.tar.bz2) = f2f65e66fce2c46243687db29f490120e2a432dfba3ba2eb94eac6ceb310412ccbb0d82792c166bdd085a28c2445185b909e40e5db08a717a4c0e6f8d886a9e6
SHA512 (kernel-kabi-dw-5.9.0-0.rc4.5.tar.bz2) = 12afdba6cfc0a2103072482a2a9d736e57e997f6ea44b727ac005a371df2b7da725ba3cd64f551e885dcd6c0d965d58b2905b99a5ccd659baefd648cd3079d05