[main] kernel: update to 5.15.2.1 (#1932)

* Update to 5.15

* audit: update to 3.0.6

Current audit 3.0 version fails to build because linux/ipx.h header
is no longer part of 5.15 kernel source. audit 3.0.6 has a change to
handle this 5.15 difference.

Co-authored-by: Chris Co <chrco@microsoft.com>
This commit is contained in:
rlmenge 2022-01-19 16:22:09 -08:00 committed by GitHub
parent c0435a92cb
commit e992d0a3c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
213 changed files with 4652 additions and 2243 deletions

View File

@ -9,8 +9,8 @@
%define uname_r %{version}-%{release}
Summary: Signed Linux Kernel for %{buildarch} systems
Name: kernel-signed-%{buildarch}
Version: 5.10.78.1
Release: 3%{?dist}
Version: 5.15.2.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -151,11 +151,11 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu
%exclude /lib/modules/%{uname_r}/kernel/sound
%exclude /module_info.ld
%ifarch x86_64
%exclude /lib/modules/%{uname_r}/kernel/arch/x86/oprofile/
%endif
%changelog
* Thu Jan 06 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-1
- Update source to 5.15.2.1
* Tue Jan 04 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 5.10.78.1-3
- Bump release number to match kernel release

View File

@ -1,5 +1,5 @@
{
"Signatures": {
"audit-3.0-alpha8.tar.gz": "e0e9189a41a413ed336db1a142a0dc998c8298b965050d06e648f0075761b3a2"
"audit-3.0.6.tar.gz": "c3e44d77513a42401d417dd0ceb203cf23886cb89402dea7b9494faa3f4fcc5e"
}
}

View File

@ -1,13 +1,13 @@
Summary: Kernel Audit Tool
Name: audit
Version: 3.0
Release: 8%{?dist}
Version: 3.0.6
Release: 1%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
Distribution: Mariner
Group: System Environment/Security
URL: https://people.redhat.com/sgrubb/audit/
Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}-alpha8.tar.gz
Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
Patch0: refuse-manual-stop.patch
BuildRequires: e2fsprogs-devel
BuildRequires: golang
@ -133,6 +133,7 @@ echo "disable auditd.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/audisp-remote.conf
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/audit/plugins.d/au-remote.conf
%config(noreplace) %attr(640,root,root) %{_sysconfdir}/libaudit.conf
%{_datadir}/%{name}/sample-rules/*
%files libs
%license COPYING
@ -152,6 +153,9 @@ echo "disable auditd.service" > %{buildroot}%{_libdir}/systemd/system-preset/50-
%{python3_sitelib}/*
%changelog
* Fri Dec 10 2021 Chris Co <chrco@microsoft.com> - 3.0.6-1
- Update to 3.0.6
* Thu Nov 11 2021 Thomas Crain <thcrain@microsoft.com> - 3.0-8
- Remove tcp_wrappers dependency due to package removal
- License verified

View File

@ -1,63 +0,0 @@
From d1921ccf2f197a9e1699f2b35890f06dc4105500 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Thu, 13 May 2021 09:32:46 +0200
Subject: [PATCH] clocksource/drivers/hyper-v: Re-enable VDSO_CLOCKMODE_HVCLOCK
on X86
Mohammed reports (https://bugzilla.kernel.org/show_bug.cgi?id=213029)
the commit e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO
differences inline") broke vDSO on x86. The problem appears to be that
VDSO_CLOCKMODE_HVCLOCK is an enum value in 'enum vdso_clock_mode' and
'#ifdef VDSO_CLOCKMODE_HVCLOCK' branch evaluates to false (it is not
a define).
Use a dedicated HAVE_VDSO_CLOCKMODE_HVCLOCK define instead.
Fixes: e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO differences inline")
Reported-by: Mohammed Gamal <mgamal@redhat.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20210513073246.1715070-1-vkuznets@redhat.com
---
arch/x86/include/asm/vdso/clocksource.h | 2 ++
drivers/clocksource/hyperv_timer.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/vdso/clocksource.h b/arch/x86/include/asm/vdso/clocksource.h
index 119ac8612d89..136e5e57cfe1 100644
--- a/arch/x86/include/asm/vdso/clocksource.h
+++ b/arch/x86/include/asm/vdso/clocksource.h
@@ -7,4 +7,6 @@
VDSO_CLOCKMODE_PVCLOCK, \
VDSO_CLOCKMODE_HVCLOCK
+#define HAVE_VDSO_CLOCKMODE_HVCLOCK
+
#endif /* __ASM_VDSO_CLOCKSOURCE_H */
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
index ba17faa92597..5d08f5f58a6b 100644
--- a/drivers/clocksource/hyperv_timer.c
+++ b/drivers/clocksource/hyperv_timer.c
@@ -419,7 +419,7 @@ static void resume_hv_clock_tsc(struct clocksource *arg)
hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr);
}
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
static int hv_cs_enable(struct clocksource *cs)
{
vclocks_set_used(VDSO_CLOCKMODE_HVCLOCK);
@@ -435,7 +435,7 @@ static struct clocksource hyperv_cs_tsc = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.suspend= suspend_hv_clock_tsc,
.resume = resume_hv_clock_tsc,
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
.enable = hv_cs_enable,
.vdso_clock_mode = VDSO_CLOCKMODE_HVCLOCK,
#else
--
2.17.1

View File

@ -7,6 +7,6 @@
"hypervkvpd.service": "25339871302f7a47e1aecfa9fc2586c78bc37edb98773752f0a5dec30f0ed3a1",
"hypervvss.rules": "94cead44245ef6553ab79c0bbac8419e3ff4b241f01bcec66e6f508098cbedd1",
"hypervvssd.service": "22270d9f0f23af4ea7905f19c1d5d5495e40c1f782cbb87a99f8aec5a011078d",
"kernel-5.10.78.1.tar.gz": "bcdac539bf4a6c5a785406336ee9347f36b9c60024f99c5097096e2ddc61842c"
"kernel-5.15.2.1.tar.gz": "4af6adf37dee2281d56abd55195dd71a975e658eabb884b26c79e40338cdfca6"
}
}

View File

@ -8,7 +8,7 @@
%global udev_prefix 70
Summary: Hyper-V daemons suite
Name: hyperv-daemons
Version: 5.10.78.1
Version: 5.15.2.1
Release: 1%{?dist}
License: GPLv2+
Vendor: Microsoft Corporation
@ -27,8 +27,7 @@ Source102: hypervvss.rules
# HYPERV FCOPY DAEMON
Source201: hypervfcopyd.service
Source202: hypervfcopy.rules
Patch0: 0001-clocksource-drivers-hyper-v-Re-enable-VDSO_CLOCKMODE.patch
Patch1: 0002-add-linux-syscall-license-info.patch
Patch0: 0002-add-linux-syscall-license-info.patch
BuildRequires: gcc
Requires: hypervfcopyd = %{version}-%{release}
Requires: hypervkvpd = %{version}-%{release}
@ -107,7 +106,6 @@ Contains tools and scripts useful for Hyper-V guests.
%prep
%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%patch0 -p1
%patch1 -p1
%build
pushd tools/hv
@ -223,6 +221,9 @@ fi
%{_sbindir}/lsvmbus
%changelog
* Thu Jan 06 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-1
- Update source to 5.15.2.1
* Mon Nov 08 2021 Rachel Menge <rachelmenge@microsoft.com> - 5.10.78.1-1
- Update source to 5.10.78.1
- Add patch to fix SPDX-License-Identifier in headers

View File

@ -1,63 +0,0 @@
From d1921ccf2f197a9e1699f2b35890f06dc4105500 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Thu, 13 May 2021 09:32:46 +0200
Subject: [PATCH] clocksource/drivers/hyper-v: Re-enable VDSO_CLOCKMODE_HVCLOCK
on X86
Mohammed reports (https://bugzilla.kernel.org/show_bug.cgi?id=213029)
the commit e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO
differences inline") broke vDSO on x86. The problem appears to be that
VDSO_CLOCKMODE_HVCLOCK is an enum value in 'enum vdso_clock_mode' and
'#ifdef VDSO_CLOCKMODE_HVCLOCK' branch evaluates to false (it is not
a define).
Use a dedicated HAVE_VDSO_CLOCKMODE_HVCLOCK define instead.
Fixes: e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO differences inline")
Reported-by: Mohammed Gamal <mgamal@redhat.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20210513073246.1715070-1-vkuznets@redhat.com
---
arch/x86/include/asm/vdso/clocksource.h | 2 ++
drivers/clocksource/hyperv_timer.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/vdso/clocksource.h b/arch/x86/include/asm/vdso/clocksource.h
index 119ac8612d89..136e5e57cfe1 100644
--- a/arch/x86/include/asm/vdso/clocksource.h
+++ b/arch/x86/include/asm/vdso/clocksource.h
@@ -7,4 +7,6 @@
VDSO_CLOCKMODE_PVCLOCK, \
VDSO_CLOCKMODE_HVCLOCK
+#define HAVE_VDSO_CLOCKMODE_HVCLOCK
+
#endif /* __ASM_VDSO_CLOCKSOURCE_H */
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
index ba17faa92597..5d08f5f58a6b 100644
--- a/drivers/clocksource/hyperv_timer.c
+++ b/drivers/clocksource/hyperv_timer.c
@@ -419,7 +419,7 @@ static void resume_hv_clock_tsc(struct clocksource *arg)
hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr);
}
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
static int hv_cs_enable(struct clocksource *cs)
{
vclocks_set_used(VDSO_CLOCKMODE_HVCLOCK);
@@ -435,7 +435,7 @@ static struct clocksource hyperv_cs_tsc = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.suspend= suspend_hv_clock_tsc,
.resume = resume_hv_clock_tsc,
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
.enable = hv_cs_enable,
.vdso_clock_mode = VDSO_CLOCKMODE_HVCLOCK,
#else
--
2.17.1

View File

@ -1,5 +1,5 @@
{
"Signatures": {
"kernel-5.10.78.1.tar.gz": "bcdac539bf4a6c5a785406336ee9347f36b9c60024f99c5097096e2ddc61842c"
"kernel-5.15.2.1.tar.gz": "4af6adf37dee2281d56abd55195dd71a975e658eabb884b26c79e40338cdfca6"
}
}

View File

@ -1,7 +1,7 @@
Summary: Linux API header files
Name: kernel-headers
Version: 5.10.78.1
Release: 3%{?dist}
Version: 5.15.2.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -9,8 +9,7 @@ Group: System Environment/Kernel
URL: https://github.com/microsoft/CBL-Mariner-Linux-Kernel
#Source0: https://github.com/microsoft/CBL-Mariner-Linux-Kernel/archive/rolling-lts/mariner/%%{version}.tar.gz
Source0: kernel-%{version}.tar.gz
Patch0: 0001-clocksource-drivers-hyper-v-Re-enable-VDSO_CLOCKMODE.patch
Patch1: 0002-add-linux-syscall-license-info.patch
Patch0: 0002-add-linux-syscall-license-info.patch
# Historical name shipped by other distros
Provides: glibc-kernheaders = %{version}-%{release}
BuildArch: noarch
@ -21,7 +20,6 @@ The Linux API Headers expose the kernel's API for use by Glibc.
%prep
%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%patch0 -p1
%patch1 -p1
%build
make mrproper
@ -41,6 +39,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
%{_includedir}/*
%changelog
* Thu Jan 06 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-1
- Update source to 5.15.2.1
* Tue Jan 04 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 5.10.78.1-3
- Update to kernel release 5.10.78.1-3

View File

@ -1,63 +0,0 @@
From d1921ccf2f197a9e1699f2b35890f06dc4105500 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Thu, 13 May 2021 09:32:46 +0200
Subject: [PATCH] clocksource/drivers/hyper-v: Re-enable VDSO_CLOCKMODE_HVCLOCK
on X86
Mohammed reports (https://bugzilla.kernel.org/show_bug.cgi?id=213029)
the commit e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO
differences inline") broke vDSO on x86. The problem appears to be that
VDSO_CLOCKMODE_HVCLOCK is an enum value in 'enum vdso_clock_mode' and
'#ifdef VDSO_CLOCKMODE_HVCLOCK' branch evaluates to false (it is not
a define).
Use a dedicated HAVE_VDSO_CLOCKMODE_HVCLOCK define instead.
Fixes: e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO differences inline")
Reported-by: Mohammed Gamal <mgamal@redhat.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20210513073246.1715070-1-vkuznets@redhat.com
---
arch/x86/include/asm/vdso/clocksource.h | 2 ++
drivers/clocksource/hyperv_timer.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/vdso/clocksource.h b/arch/x86/include/asm/vdso/clocksource.h
index 119ac8612d89..136e5e57cfe1 100644
--- a/arch/x86/include/asm/vdso/clocksource.h
+++ b/arch/x86/include/asm/vdso/clocksource.h
@@ -7,4 +7,6 @@
VDSO_CLOCKMODE_PVCLOCK, \
VDSO_CLOCKMODE_HVCLOCK
+#define HAVE_VDSO_CLOCKMODE_HVCLOCK
+
#endif /* __ASM_VDSO_CLOCKSOURCE_H */
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
index ba17faa92597..5d08f5f58a6b 100644
--- a/drivers/clocksource/hyperv_timer.c
+++ b/drivers/clocksource/hyperv_timer.c
@@ -419,7 +419,7 @@ static void resume_hv_clock_tsc(struct clocksource *arg)
hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr);
}
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
static int hv_cs_enable(struct clocksource *cs)
{
vclocks_set_used(VDSO_CLOCKMODE_HVCLOCK);
@@ -435,7 +435,7 @@ static struct clocksource hyperv_cs_tsc = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.suspend= suspend_hv_clock_tsc,
.resume = resume_hv_clock_tsc,
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
.enable = hv_cs_enable,
.vdso_clock_mode = VDSO_CLOCKMODE_HVCLOCK,
#else
--
2.17.1

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
{
"Signatures": {
"cbl-mariner-ca-20210127.pem": "82363cb44e786353936abc2e2d62d9325cacf2d9e9a8ebaf4221ea30a9e0cd7b",
"config": "5c9cb509368cc241ceb4e6946335483ee74c6b317a5ecc3d2e046ee66cc210a7",
"kernel-5.10.78.1.tar.gz": "bcdac539bf4a6c5a785406336ee9347f36b9c60024f99c5097096e2ddc61842c",
"config": "b175e8277bebfe10679d8efda24256746bfb34e7c414c943b14c600969c8a3ce",
"kernel-5.15.2.1.tar.gz": "4af6adf37dee2281d56abd55195dd71a975e658eabb884b26c79e40338cdfca6",
"sha512hmac-openssl.sh": "02ab91329c4be09ee66d759e4d23ac875037c3b56e5a598e32fd1206da06a27f"
}
}

View File

@ -3,8 +3,8 @@
%define uname_r %{version}-%{release}
Summary: Linux Kernel optimized for Hyper-V
Name: kernel-hyperv
Version: 5.10.78.1
Release: 3%{?dist}
Version: 5.15.2.1
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Mariner
@ -15,13 +15,13 @@ Source0: kernel-%{version}.tar.gz
Source1: config
Source2: sha512hmac-openssl.sh
Source3: cbl-mariner-ca-20210127.pem
Patch0: 0001-clocksource-drivers-hyper-v-Re-enable-VDSO_CLOCKMODE.patch
Patch1: pthread_stack_min_int_cast.patch
Patch2: 0002-add-linux-syscall-license-info.patch
Patch0: 0002-add-linux-syscall-license-info.patch
BuildRequires: audit-devel
BuildRequires: bash
BuildRequires: bc
BuildRequires: diffutils
BuildRequires: dwarves
BuildRequires: elfutils-libelf-devel
BuildRequires: glib-devel
BuildRequires: kbd
BuildRequires: kmod-devel
@ -31,7 +31,7 @@ BuildRequires: openssl
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: procps-ng-devel
BuildRequires: python3
BuildRequires: python3-devel
BuildRequires: sed
BuildRequires: xerces-c-devel
Requires: filesystem
@ -74,14 +74,6 @@ Requires: python3
%description docs
This package contains the Linux kernel doc files
%package oprofile
Summary: Kernel driver for oprofile, a statistical profiler for Linux systems
Group: System Environment/Kernel
Requires: %{name} = %{version}-%{release}
%description oprofile
Kernel driver for oprofile, a statistical profiler for Linux systems
%package tools
Summary: This package contains the 'perf' performance analysis tools for Linux kernel
Group: System/Tools
@ -94,8 +86,6 @@ This package contains the 'perf' performance analysis tools for Linux kernel.
%prep
%setup -q -n CBL-Mariner-Linux-Kernel-rolling-lts-mariner-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
make mrproper
@ -226,9 +216,6 @@ fi
/sbin/depmod -a %{uname_r}
ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%post oprofile
/sbin/depmod -a %{uname_r}
%files
%defattr(-,root,root)
%license COPYING
@ -244,7 +231,6 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%exclude /lib/modules/%{uname_r}/build
%exclude /lib/modules/%{uname_r}/kernel/drivers/gpu
%exclude /lib/modules/%{uname_r}/kernel/sound
%exclude /lib/modules/%{uname_r}/kernel/arch/x86/oprofile/
%files docs
%defattr(-,root,root)
@ -255,14 +241,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
/lib/modules/%{uname_r}/build
%{_prefix}/src/linux-headers-%{uname_r}
%files oprofile
%defattr(-,root,root)
/lib/modules/%{uname_r}/kernel/arch/x86/oprofile/
%files tools
%defattr(-,root,root)
%{_libexecdir}
%exclude %{_libdir}/debug
%{_lib64dir}/traceevent
%{_bindir}
%{_sysconfdir}/bash_completion.d/*
@ -271,8 +252,12 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
%{_docdir}/*
%{_libdir}/perf/examples/bpf/*
%{_libdir}/perf/include/bpf/*
%{_includedir}/perf/perf_dlfilter.h
%changelog
* Thu Jan 06 2022 Rachel Menge <rachelmenge@microsoft.com> - 5.15.2.1-1
- Update source to 5.15.2.1
* Tue Jan 04 2022 Suresh Babu Chalamalasetty <schalam@microsoft.com> - 5.10.78.1-3
- Bump release number to match kernel release

View File

@ -1,63 +0,0 @@
From d1921ccf2f197a9e1699f2b35890f06dc4105500 Mon Sep 17 00:00:00 2001
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: Thu, 13 May 2021 09:32:46 +0200
Subject: [PATCH] clocksource/drivers/hyper-v: Re-enable VDSO_CLOCKMODE_HVCLOCK
on X86
Mohammed reports (https://bugzilla.kernel.org/show_bug.cgi?id=213029)
the commit e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO
differences inline") broke vDSO on x86. The problem appears to be that
VDSO_CLOCKMODE_HVCLOCK is an enum value in 'enum vdso_clock_mode' and
'#ifdef VDSO_CLOCKMODE_HVCLOCK' branch evaluates to false (it is not
a define).
Use a dedicated HAVE_VDSO_CLOCKMODE_HVCLOCK define instead.
Fixes: e4ab4658f1cf ("clocksource/drivers/hyper-v: Handle vDSO differences inline")
Reported-by: Mohammed Gamal <mgamal@redhat.com>
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20210513073246.1715070-1-vkuznets@redhat.com
---
arch/x86/include/asm/vdso/clocksource.h | 2 ++
drivers/clocksource/hyperv_timer.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/vdso/clocksource.h b/arch/x86/include/asm/vdso/clocksource.h
index 119ac8612d89..136e5e57cfe1 100644
--- a/arch/x86/include/asm/vdso/clocksource.h
+++ b/arch/x86/include/asm/vdso/clocksource.h
@@ -7,4 +7,6 @@
VDSO_CLOCKMODE_PVCLOCK, \
VDSO_CLOCKMODE_HVCLOCK
+#define HAVE_VDSO_CLOCKMODE_HVCLOCK
+
#endif /* __ASM_VDSO_CLOCKSOURCE_H */
diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
index ba17faa92597..5d08f5f58a6b 100644
--- a/drivers/clocksource/hyperv_timer.c
+++ b/drivers/clocksource/hyperv_timer.c
@@ -419,7 +419,7 @@ static void resume_hv_clock_tsc(struct clocksource *arg)
hv_set_register(HV_REGISTER_REFERENCE_TSC, tsc_msr);
}
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
static int hv_cs_enable(struct clocksource *cs)
{
vclocks_set_used(VDSO_CLOCKMODE_HVCLOCK);
@@ -435,7 +435,7 @@ static struct clocksource hyperv_cs_tsc = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
.suspend= suspend_hv_clock_tsc,
.resume = resume_hv_clock_tsc,
-#ifdef VDSO_CLOCKMODE_HVCLOCK
+#ifdef HAVE_VDSO_CLOCKMODE_HVCLOCK
.enable = hv_cs_enable,
.vdso_clock_mode = VDSO_CLOCKMODE_HVCLOCK,
#else
--
2.17.1

View File

@ -1,3 +0,0 @@
CVE-1999-0524 - No upstream fix. Vulnerability is low severity.
Users can mitigate the vulnerability by configuring their system firewall to
not respond to certain ICMP requests.

View File

@ -1,2 +0,0 @@
CVE-1999-0656 - Not a kernel vulnerability. It is a vulnerability in the
rpc.ugidd daemon, which is not provided by the kernel package.

View File

@ -1,2 +0,0 @@
CVE-2007-4998 - Not a kernel vulnerability. It is a vulnerability in the cp binary
which can be supplied from multiple packages (coreutils, busybox, etc.)

View File

@ -1,2 +0,0 @@
CVE-2008-4609 - No upstream fix. Vulnerability exploits design limitations in TCP protocol.
Recommend using iptables mitigation - https://bugzilla.redhat.com/show_bug.cgi?id=465932

View File

@ -1,2 +0,0 @@
CVE-2009-4484 - Not a kernel vulnerability. It is a vulnerability in mysql when
using the specific yaSSL implementation. We use openssl.

View File

@ -1,3 +0,0 @@
CVE-2010-0298 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 1871c6020d7308afb99127bba51f04548e7ca84e
Stable commit - 1871c6020d7308afb99127bba51f04548e7ca84e

View File

@ -1,3 +0,0 @@
CVE-2010-0309 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - ee73f656a604d5aa9df86a97102e4e462dd79924
Stable commit - ee73f656a604d5aa9df86a97102e4e462dd79924

View File

@ -1,3 +0,0 @@
CVE-2010-3865 - Already patched in 5.4.51 stable kernel
Upstream commit - 1b1f693d7ad6d193862dcb1118540a030c5e761f
Same commit id in stable branch

View File

@ -1 +0,0 @@
CVE-2010-4563 - No upstream fix. Low security impact. No plans to fix.

View File

@ -1,4 +0,0 @@
CVE-2011-0640 - Vulnerability disputed. No fix upstream.
Vulnerability concerns arbitrary code execution when a malicious USB device is
plugged in. The malicious USB device poses as a HID device and sends keystrokes
to control the host system.

View File

@ -1,2 +0,0 @@
CVE-2011-2519 - Not a kernel vulnerability. It is a vulnerability in the Xen
hypervisor project when the guest executes the SAHF instruction.

View File

@ -1,2 +0,0 @@
CVE-2015-5738 - Not a kernel vulnerability. It is a vulnerability in the RSA-CRT
implementation within the Cavium SDK.

View File

@ -1,2 +0,0 @@
CVE-2017-8244 - Only applicable to Android kernel tree.
Not a vulnerability in our kernel source as our tree does not host the affected component (drivers/media/platform/msm)

View File

@ -1,2 +0,0 @@
CVE-2017-8245 - Only applicable to Android kernel tree.
Not a vulnerability in our kernel source as our tree does not host the affected component (drivers/soc/qcom/qdsp6v2)

View File

@ -1,2 +0,0 @@
CVE-2017-8246 - Only applicable to Android kernel tree.
Not a vulnerability in our kernel source as our tree does not host the affected component (sound/soc/msm/qdsp6v2)

View File

@ -1,3 +0,0 @@
CVE-2018-1000026 - Already patched in 5.4.51 stable kernel
Upstream commit - 8914a595110a6eca69a5e275b323f5d09e18f4f9
Stable tree commit id same as upstream commit id.

View File

@ -1,3 +0,0 @@
CVE-2018-16880 - Already patched in 5.4.51 stable kernel
Upstream commit - b46a0bf78ad7b150ef5910da83859f7f5a514ffd
Stable tree commit id same as upstream commit id.

View File

@ -1,10 +0,0 @@
CVE-2019-19338 - already patched in linux-msft-5.4.72 stable kernel
Patch 1
Upstream commit - cbbaa2727aa3ae9e0a844803da7cef7fd3b94f2b
Stable commit - cbbaa2727aa3ae9e0a844803da7cef7fd3b94f2b
Patch 2
Upstream commit - c11f83e0626bdc2b6c550fc8b9b6eeefbd8cefaa
Stable commit - c11f83e0626bdc2b6c550fc8b9b6eeefbd8cefaa
Patch 3
Upstream commit - b07a5c53d42a8c87b208614129e947dd2338ff9c
Stable commit - b07a5c53d42a8c87b208614129e947dd2338ff9c

View File

@ -1,4 +0,0 @@
CVE-2019-20794 - No upstream fix. Mitigation available.
Mitigated by clearing the tasks stuck in Uninterruptible sleep state after the
user namespace is gone and inflight operations are still in progress:
# echo 1 > /sys/fs/fuse/connections/$NUM/abort

View File

@ -1,3 +0,0 @@
CVE-2019-20810 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 9453264ef58638ce8976121ac44c07a3ef375983
Stable commit - 47f7b553434000750f9f918df8ca8c137b7fc50b

View File

@ -1,16 +0,0 @@
CVE-2019-3016 - already patched in linux-msft-5.4.72 stable kernel
Patch 1
Upstream commit - 1eff70a9abd46f175defafd29bc17ad456f398a7
Stable commit - a3db2949904b81ae53a840d99f71021f02a01fd3
Patch 2
Upstream commit - 8c6de56a42e0c657955e12b882a81ef07d1d073e
Stable commit - 68460ceba319a46ea14b36129bfd0a152e0f00c3
Patch 3
Upstream commit - 917248144db5d7320655dbb41d3af0b8a0f3d589
Stable commit - f7c1a6c67ff36532f1b0b339e3aae7701a2c0b1e
Patch 4
Upstream commit - a6bd811f1209fe1c64c9f6fd578101d6436c6b6e
Stable commit - 2aebc6ed84efeb1e255fd6417f9230388f2206cd
Patch 5
Upstream commit - b043138246a41064527cf019a3d51d9f015e9796
Stable commit - d71eef9fcc0b81fd56e59afd305a215d81239894

View File

@ -1,3 +0,0 @@
CVE-2019-3819 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 13054abbaa4f1fd4e6f3b4b63439ec033b4c8035
Stable commit - 13054abbaa4f1fd4e6f3b4b63439ec033b4c8035

View File

@ -1,7 +0,0 @@
CVE-2019-3887 - already patched in linux-msft-5.4.72 stable kernel
Patch 1
Upstream commit - acff78477b9b4f26ecdf65733a4ed77fe837e9dc
Stable commit - acff78477b9b4f26ecdf65733a4ed77fe837e9dc
Patch 2
Upstream commit - c73f4c998e1fd4249b9edfa39e23f4fda2b9b041
Stable commit - c73f4c998e1fd4249b9edfa39e23f4fda2b9b041

View File

@ -1,3 +0,0 @@
CVE-2020-10690 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - a33121e5487b424339636b25c35d3a180eaa5f5e
Stable commit - bfa2e0cd3dfda64fde43c3dca3aeba298d2fe7ad

View File

@ -1,3 +0,0 @@
CVE-2020-10711 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - eead1c2ea2509fd754c6da893a94f0e69e83ebe4
Stable commit - 1c9dfc2d05d5edde2f8617e3087d9c7dfd55f3c7

View File

@ -1,3 +0,0 @@
CVE-2020-10757 - Already patched in 5.4.51 stable kernel
Upstream commit - 5bfea2d9b17f1034a68147a8b03b9789af5700f9
Stable commit - 5a047df0b5fce377df37de75380321d1c8ca07a0

View File

@ -1,3 +0,0 @@
CVE-2020-10766 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - dbbe2ad02e9df26e372f38cc3e70dab9222c832e
Stable commit - 209a76a5d46438011eab2eee2a17c8a93b6df8a5

View File

@ -1,3 +0,0 @@
CVE-2020-10767 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 21998a351512eba4ed5969006f0c55882d995ada
Stable commit - 3e49da23913dc18ee4193dd6cdfd27efa1e58563

View File

@ -1,3 +0,0 @@
CVE-2020-10768 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 4d8df8cbb9156b0a0ab3f802b80cb5db57acc0bf
Stable commit - 3027b9fecd11a63ed51804f982978c41c556537a

View File

@ -1,3 +0,0 @@
CVE-2020-10781 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 853eab68afc80f59f36bbdeb715e5c88c501e680
Stable commit - edda9fd73f6269354ed945ed67e75eca0d116672

View File

@ -1,3 +0,0 @@
CVE-2020-10942 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 42d84c8490f9f0931786f1623191fcab397c3d64
Stable commit - f09fbb1175cffdbbb36b28e2ff7db96dcc90de08

View File

@ -1 +0,0 @@
Already patched in 5.4.51 stable kernel

View File

@ -1 +0,0 @@
Already patched in 5.4.51 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-11608 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 998912346c0da53a6dbb71fab3a138586b596b30
Stable commit - 0e01661c14e1e9b254aa550eb08adf582cb3b81f

View File

@ -1,3 +0,0 @@
CVE-2020-11609 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 485b06aadb933190f4bc44e006076bc27a23f205
Stable commit - c06050a34b9c09fe3a367409892b31f77fc64168

View File

@ -1,3 +0,0 @@
CVE-2020-11668 - Already patched in 5.4.51 stable kernel
Upstream commit - a246b4d547708f33ff4d4b9a7a5dbac741dc89d8
Stable commit - cb595cb0a1e8e07213337f063cd39a3e80fc43a0

View File

@ -1 +0,0 @@
Disputed upstream.

View File

@ -1 +0,0 @@
Already patched in 5.4.42 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-12464 - Already fixed in 5.4.51 stable kernel
Upstream commit - 056ad39ee9253873522f6469c3364964a322912b
Stable commit - 4ea6153fc7f4deeb4b26b66f42c4d050b33df7f9

View File

@ -1,3 +0,0 @@
CVE-2020-12465 - Already fixed in 5.4.51 stable kernel
Upstream commit - b102f0c522cf668c8382c56a4f771b37d011cda2
Stable commit - 9980ae64ee8954e191a9f58663481dd584c2dc8a

View File

@ -1,3 +0,0 @@
CVE-2020-12653 - Already patched in 5.4.51 stable kernel
Upstream commit - b70261a288ea4d2f4ac7cd04be08a9f0f2de4f4d
Stable commit - 3c822e1f31186767d6b7261c3c066f01907ecfca

View File

@ -1,3 +0,0 @@
CVE-2020-12654 - Already patched in 5.4.51 stable kernel
Upstream commit - 3a9b153c5591548612c3955c9600a98150c81875
Stable commit - c5b071e3f44d1125694ad4dcf1234fb9a78d0be6

View File

@ -1 +0,0 @@
Already patched in 5.4.51 stable kernel

View File

@ -1,2 +0,0 @@
CVE-2020-12656 - Disputed. Memory leak vulnerability occurs on module unload,
which is already considered a privileged operation.

View File

@ -1,3 +0,0 @@
CVE-2020-12657 - Already patched in 5.4.51 stable kernel
Upstream commit - 2f95fa5c955d0a9987ffdc3a095e2f4e62c5f2a9
Stable commit - b2ae36d220eddd88f9a1264176e3104d988f72fe

View File

@ -1,3 +0,0 @@
CVE-2020-12659 - Already patched in 5.4.51 stable kernel
Upstream commit - 99e3a236dd43d06c65af0a2ef9cb44306aef6e02
Stable commit - 25de13b0ad039f81f5f1fe3f7f439ac8c489c96f

View File

@ -1,3 +0,0 @@
CVE-2020-12768 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - d80b64ff297e40c2b6f7d7abc1b3eba70d22a068
Stable commit - 6c4587c0d1d9d5a182ce5cf72dff52b7b00c73b7

View File

@ -1 +0,0 @@
Already patched in 5.4.42 stable kernel

View File

@ -1 +0,0 @@
Already patched in 5.4.51 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-12826 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - d1e7fd6462ca9fc76650fbe6ca800e35b24267da
Stable commit - 5a4734362d07ea0ae10dc738f9f03f87f4f09e2d

View File

@ -1,3 +0,0 @@
CVE-2020-12888 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - abafbc551fddede3e0a08dee1dcde08fc0eb8476
Stable commit - baa21d56a0aa3d29a9354c0dca3179713c1f3e82

View File

@ -1 +0,0 @@
Already patched in 5.4.42 stable kernel

View File

@ -1 +0,0 @@
Already patched in 5.4.51 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-14314 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 5872331b3d91820e14716632ebb56b1399b34fe1
Stable commit - 96a56b5433b3e633c02eea283a4433d623b40d33

View File

@ -1,3 +0,0 @@
CVE-2020-14331 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - ebfdfeeae8c01fcb2b3b74ffaf03876e20835d2d
Stable commit - 76b10c757e8554060f27f820f8f0079b9177fcea

View File

@ -1 +0,0 @@
CVE-2020-14351 - already patched in linux-msft-5.4.78 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-14356 - Already patched in 5.4.72 stable kernel
Upstream commit - ad0f75e5f57ccbceec13274e1e242f2b5a6397ed
Stable commit - 4eaeb927a3230427c5b414030f4b838616d65b29

View File

@ -1 +0,0 @@
CVE-2020-14381 - already patched in linux-msft-5.4.81 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-14385 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - f4020438fab05364018c91f7e02ebdd192085933
Stable commit - 23f6872d1a9c3bf544cfa43cba1302e20de640bc

View File

@ -1,3 +0,0 @@
CVE-2020-14386 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - acf69c946233259ab4d64f8869d4037a198c7f06
Stable commit - 65f546d6c6586d0cc3dfc9ca65c9eee80c1abb80

View File

@ -1,3 +0,0 @@
CVE-2020-14390 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 50145474f6ef4a9c19205b173da6264a644c7489
Stable commit - f80b9009eee1e33de597245d9e09e27e76709673

View File

@ -1 +0,0 @@
Already patched in 5.4.51 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-15436 - already patched in linux-msft-5.4.81 stable kernel
Upstream commit - 2d3a8e2deddea6c89961c422ec0c5b851e648c14
Stable commit - 7a802b0a46c0cf4a7ffb63d2340b1ec3af65cbbe

View File

@ -1,3 +0,0 @@
CVE-2020-15437 - already patched in linux-msft-5.4.81 stable kernel
Upstream commit - f4c23a140d80ef5e6d3d1f8f57007649014b60fa
Stable commit - 6a57ffb49f13f766c7452d0490329fb6f8d7e227

View File

@ -1,3 +0,0 @@
CVE-2020-15780 - Already fixed in 5.4.51 stable kernel
Upstream commit - 75b0cea7bf307f362057cc778efe89af4c615354
Stable commit - 67fb5a8aedd12e8adb1dddd324e90f904a4e1e00

View File

@ -1,3 +0,0 @@
CVE-2020-16120 - already patched in 5.10.28.1 stable kernel
Upstream: 05acefb4872dae89e772729efb194af754c877e8
Stable: 48bd024b8a40d73ad6b086de2615738da0c7004f

View File

@ -1,3 +0,0 @@
CVE-2020-16166 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - f227e3ec3b5cad859ad15666874405e8c1bbc1d4
Stable commit - 2b9faf229ed2741644e418cf81697cd3aa81ceb7

View File

@ -1,3 +0,0 @@
CVE-2020-24394 - Already patched in 5.4.51 stable kernel
Upstream commit - 22cf8419f1319ff87ec759d0ebdff4cbafaee832
Stable commit - c506f985d8d151383559c0760bb1ef7466e218d4

View File

@ -1,3 +0,0 @@
CVE-2020-25211 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 1cc5ef91d2ff94d2bf2de3b3585423e8a1051cb6
Stable commit - 8d479c9e2a1c8fdd1b18a2f657ec917c79b9f430

View File

@ -1,3 +0,0 @@
CVE-2020-25212 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - b4487b93545214a9db8cbf32e86411677b0cca21
Stable commit - 4052ab9094b6efecb6dc7ed854b3579148ad4a09

View File

@ -1,3 +0,0 @@
CVE-2020-25284 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - f44d04e696feaf13d192d942c4f14ad2e117065a
Stable commit - ac9737182fff4387cc133369767e9e68772fc3cd

View File

@ -1,3 +0,0 @@
CVE-2020-25285 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 17743798d81238ab13050e8e2833699b54e15467
Stable commit - 5fc45104613466d95955a9aedef83d36e58fd276

View File

@ -1,3 +0,0 @@
CVE-2020-25639 - already patched in 5.10.57.1 stable kernel
Upstream: eaba3b28401f50e22d64351caa8afe8d29509f27
Stable: e3fcff9f45aa82dacad26e5828598340d2742f47

View File

@ -1,3 +0,0 @@
CVE-2020-25641 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 7e24969022cbd61ddc586f14824fc205661bb124
Stable commit - adc61d4e217f0ad6d75a1aaed80f3259ec2cd7c2

View File

@ -1,3 +0,0 @@
CVE-2020-25643 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 66d42ed8b25b64eb63111a2b8582c5afc8bf1105
Stable commit - 4215ee9dcf0a05080206c392a14d624a09171db3

View File

@ -1,3 +0,0 @@
CVE-2020-25645 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 34beb21594519ce64a55a498c2fe7d567bc1ca20
Stable commit - 700cfadb04a4f26008f882a2e945aa5a6884530f

View File

@ -1 +0,0 @@
CVE-2020-25656 - already patched in linux-msft-5.4.81 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-25672 - already patched in 5.10.37.1 stable kernel
Upstream commit: 7574fcdbdcb335763b6b322f6928dc0fd5730451
Stable commit: 568ac94df580b1a65837dc299e8758635e7b1423

View File

@ -1 +0,0 @@
CVE-2020-25704 - already patched in linux-msft-5.4.81 stable kernel

View File

@ -1,3 +0,0 @@
CVE-2020-25705 - already patched in linux-msft-5.4.81 stable kernel
Upstream commit - b38e7819cae946e2edf869e604af1e65a5d241c5
Stable commit - 1b973e8b419dc07ff17e66661ee2ea7668de0fa9

View File

@ -1,3 +0,0 @@
CVE-2020-26088 - already patched in linux-msft-5.4.72 stable kernel
Upstream commit - 26896f01467a28651f7a536143fe5ac8449d4041
Stable commit - 04d588bb1dcda5418cbe3a903b97eea43f0865b0

View File

@ -1,3 +0,0 @@
CVE-2020-27152 - Introducing commit not in stable tree. No fix necessary at this time.
Upstream introducing commit - f458d039db7e8518041db4169d657407e3217008
Upstream fix commit - 77377064c3a94911339f13ce113b3abf265e06da

View File

@ -1,3 +0,0 @@
CVE-2020-27170 - already patched in 5.10.28.1 stable kernel
Upstream: f232326f6966cf2a1d1db7bc917a4ce5f9f55f76
Stable: c4d37eea1c641a9319baf34253cc373abb39d3e1

View File

@ -1,3 +0,0 @@
CVE-2020-27171 - already patched in 5.10.28.1 stable kernel
Upstream: 10d2bb2e6b1d8c4576c56a748f697dbeb8388899
Stable: ac1b87a18c1ffbe3d093000b762121b5aae0a3f9

View File

@ -1,3 +0,0 @@
CVE-2020-27194 - Introducing commit not in stable tree. No fix necessary at this time.
Upstream introducing commit - 3f50f132d8400e129fc9eb68b5020167ef80a244
Upstream fix commit - 5b9fbeb75b6a98955f628e205ac26689bcb1383e

View File

@ -1,3 +0,0 @@
CVE-2020-27675 - already patched in linux-msft-5.4.81 stable kernel
Upstream commit - 073d0552ead5bfc7a3a9c01de590e924f11b5dd2
Stable commit - 8c3c87f675b18d6e853d963343c2a8042aafa4be

Some files were not shown because too many files have changed in this diff Show More