Browse code

Merge branch 'master' of https://github.com/vmware/photon

archive authored on 2018/01/05 23:30:19
Showing 59 changed files
... ...
@@ -528,7 +528,7 @@ check-docker-service:
528 528
 	@docker ps >/dev/null 2>&1 || { echo "Docker service is not running. Aborting." >&2; exit 1; }
529 529
 
530 530
 check-docker-py:
531
-	@python -c "import docker; assert docker.__version__ == '$(PHOTON_DOCKER_PY_VER)'" >/dev/null 2>&1 || { echo "Error: Python package docker-py 2.3.0 not installed.\nPlease use: pip install docker==2.3.0" >&2; exit 1; }
531
+	@python3 -c "import docker; assert docker.__version__ == '$(PHOTON_DOCKER_PY_VER)'" >/dev/null 2>&1 || { echo "Error: Python3 package docker-py3 2.3.0 not installed.\nPlease use: pip3 install docker==2.3.0" >&2; exit 1; }
532 532
 
533 533
 check-bison:
534 534
 	@command -v bison >/dev/null 2>&1 || { echo "Package bison not installed. Aborting." >&2; exit 1; }
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:	Programs for generating Makefiles
2 2
 Name:		automake
3
-Version:	1.15
4
-Release:	4%{?dist}
3
+Version:	1.15.1
4
+Release:	1%{?dist}
5 5
 License:	GPLv2+
6 6
 URL:		http://www.gnu.org/software/automake/
7 7
 Group:		System Environment/Base
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10
-Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.gz
11
-%define sha1 automake=b5a840c7ec4321e78fdc9472e476263fa6614ca1
10
+Source0:	http://ftp.gnu.org/gnu/automake/%{name}-%{version}.tar.xz
11
+%define sha1 automake=45632d466c16ecf18d9c18dc4be883cde59acb59
12 12
 BuildRequires:	autoconf
13 13
 BuildArch:      noarch
14 14
 
... ...
@@ -42,6 +42,8 @@ make %{?_smp_mflags} check
42 42
 %{_defaultdocdir}/%{name}-%{version}/*
43 43
 %{_mandir}/*/*
44 44
 %changelog
45
+*	Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 1.15.1-1
46
+-	Version update
45 47
 *	Fri Aug 04 2017 Danut Moraru <dmoraru@vmware.com> 1.15-4
46 48
 -	Disable check that fails test case
47 49
 *	Tue Apr 25 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.15-3
... ...
@@ -1,14 +1,14 @@
1 1
 Summary:	Apache Commons Daemon
2 2
 Name:		commons-daemon
3
-Version:	1.0.15
4
-Release:	12%{?dist}
3
+Version:	1.1.0
4
+Release:	1%{?dist}
5 5
 License:	Apache
6 6
 URL:		http://commons.apache.org/proper/commons-daemon
7 7
 Group:		Applications/System
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: 	Photon
10
-Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.0.15-src.tar.gz
11
-%define sha1 commons-daemon=ca6a448d1d214f714e214b35809a2117568970e3
10
+Source0:	http://apache.mesi.com.ar//commons/daemon/source/commons-daemon-1.1.0-src.tar.gz
11
+%define sha1 commons-daemon=5a64221b8020d32c02bf44a115f8a95016d3c76e
12 12
 BuildRequires: openjre8
13 13
 BuildRequires: openjdk8
14 14
 BuildRequires: apache-ant
... ...
@@ -29,8 +29,14 @@ rm -rf %{buildroot}
29 29
 export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA8_VERSION}
30 30
 ant dist
31 31
 
32
+%ifarch x86_64
32 33
 export CFLAGS=-m64
33 34
 export LDFLAGS=-m64
35
+%endif
36
+
37
+%ifarch aarch64
38
+sed -i 's/supported_os="aarch64"/supported_os="linux"/' src/native/unix/configure
39
+%endif
34 40
 
35 41
 CURDIR=`pwd`
36 42
 
... ...
@@ -56,6 +62,8 @@ chmod -R 755 $DIST_DIR
56 56
 %{_datadir}/java/*.jar
57 57
 
58 58
 %changelog
59
+*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 1.1.0-1
60
+-   Versio update to support aarch64
59 61
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.0.15-12
60 62
 -   Remove BuildArch
61 63
 *   Tue Jun 20 2017 Divya Thaluru <dthaluru@vmware.com> 1.0.15-11
... ...
@@ -1,17 +1,17 @@
1 1
 %global security_hardening none
2 2
 Summary:        The Behavioral Activity Monitor With Container Support
3 3
 Name:           falco
4
-Version:        0.6.0
5
-Release:        3%{?kernelsubrelease}%{?dist}
4
+Version:        0.8.1
5
+Release:        1%{?kernelsubrelease}%{?dist}
6 6
 License:        GPLv2
7 7
 URL:            http://www.sysdig.org/falco/
8 8
 Group:          Applications/System
9 9
 Vendor:         VMware, Inc.
10 10
 Distribution:   Photon
11 11
 Source0:        https://github.com/draios/%{name}/archive/%{name}-%{version}.tar.gz
12
-%define sha1    falco=04dc79c1c4773ba2080c2c49c718305e7920c2f7
13
-Source1:        https://github.com/draios/sysdig/archive/sysdig-0.15.1.tar.gz
14
-%define sha1    sysdig=5b1a7a4978315176412989b5400572d849691917
12
+%define sha1    falco=7873d34769656349678584502296b147aa5445fa
13
+Source1:        https://github.com/draios/sysdig/archive/sysdig-0.19.1.tar.gz
14
+%define sha1    sysdig=425ea9fab8e831274626a9c9e65f0dfb4f9bc019
15 15
 Source2:        http://libvirt.org/sources/libvirt-2.0.0.tar.xz
16 16
 %define sha1    libvirt=9a923b06df23f7a5526e4ec679cdadf4eb35a38f
17 17
 BuildRequires:  cmake
... ...
@@ -50,12 +50,9 @@ Sysdig falco is an open source, behavioral activity monitor designed to detect a
50 50
 tar xf %{SOURCE2} --no-same-owner
51 51
 
52 52
 %build
53
-mv sysdig-0.15.1 ../sysdig
53
+mv sysdig-0.19.1 ../sysdig
54 54
 sed -i 's|../falco/rules|rules|g' userspace/engine/CMakeLists.txt
55 55
 sed -i 's|../falco/userspace|userspace|g' userspace/engine/config_falco_engine.h.in
56
-# fix for linux-4.9
57
-sed -i 's|task_thread_info(current)->status|current->thread.status|g' ../sysdig/driver/main.c
58
-sed -i 's|task_thread_info(task)->status|current->thread.status|g' ../sysdig/driver/ppm_syscall.h
59 56
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} CMakeLists.txt
60 57
 make KERNELDIR="/lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/build"
61 58
 
... ...
@@ -87,6 +84,8 @@ rm -rf %{buildroot}/*
87 87
 /lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/extra/falco-probe.ko
88 88
 
89 89
 %changelog
90
+*   Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 0.8.1-1
91
+-   Version update to build against linux-4.14.y kernel
90 92
 *   Thu Aug 24 2017 Rui Gu <ruig@vmware.com> 0.6.0-3
91 93
 -   Disable check section (Bug 1900272).
92 94
 *   Thu May 11 2017 Chang Lee <changlee@vmware.com> 0.6.0-2
... ...
@@ -1,7 +1,7 @@
1 1
 Summary:        Contains a utility for determining file types
2 2
 Name:           file
3 3
 Version:        5.30
4
-Release:        2%{?dist}
4
+Release:        3%{?dist}
5 5
 License:        BSD
6 6
 URL:            http://www.darwinsys.com/file
7 7
 Group:          Applications/File
... ...
@@ -10,10 +10,17 @@ Distribution:   Photon
10 10
 Source0:        ftp://ftp.astron.com/pub/file/%{name}-%{version}.tar.gz
11 11
 %define sha1    file=276051cd2c438d4e7a321c4422a5b3bc850fd747
12 12
 Patch0:         file-5.30-keep-not-stripped-last.patch
13
+Requires:       %{name}-libs = %{version}-%{release}
14
+Conflicts:      toybox
13 15
 %description
14 16
 The package contains a utility for determining the type of a
15 17
 given file or files
16 18
 
19
+%package        libs
20
+Summary:        Library files for file
21
+%description    libs
22
+It contains the libraries to run the application.
23
+
17 24
 %package        devel
18 25
 Summary:        Header and development files for file
19 26
 Requires:       %{name} = %{version}-%{release}
... ...
@@ -35,14 +42,18 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
35 35
 %check
36 36
 make %{?_smp_mflags} check
37 37
 
38
-%post   -p /sbin/ldconfig
39
-%postun -p /sbin/ldconfig
38
+%post libs -p /sbin/ldconfig
39
+%postun libs -p /sbin/ldconfig
40
+
40 41
 %files
41 42
 %defattr(-,root,root)
42 43
 %{_bindir}/*
43
-%{_libdir}/*.so.*
44 44
 %{_mandir}/*man1/*
45 45
 %{_mandir}/*man4/*
46
+
47
+%files  libs
48
+%defattr(-,root,root)
49
+%{_libdir}/*.so.*
46 50
 %{_datarootdir}/misc/magic.mgc
47 51
 
48 52
 %files  devel
... ...
@@ -51,6 +62,9 @@ make %{?_smp_mflags} check
51 51
 %{_mandir}/*man3/*
52 52
 
53 53
 %changelog
54
+*   Fri Dec 15 2017 Divya Thaluru <dthaluru@vmware.com> 5.30-3
55
+-   Added seperate package for libraries
56
+-   Added toybox as conflict package
54 57
 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 5.30-2
55 58
 -   Add devel package.
56 59
 *   Tue Apr 04 2017 Chang Lee <changlee@vmware.com> 5.30-1
... ...
@@ -4,7 +4,7 @@
4 4
 Name:           gobject-introspection
5 5
 Summary:        Introspection system for GObject-based libraries
6 6
 Version:        1.52.1
7
-Release:        4%{?dist}
7
+Release:        5%{?dist}
8 8
 Group:          Development/Libraries
9 9
 License:        GPLv2+, LGPLv2+, MIT
10 10
 URL:            http://live.gnome.org/GObjectIntrospection
... ...
@@ -69,6 +69,7 @@ Libraries and headers for gobject-introspection.
69 69
 %setup -q
70 70
 %patch0 -p1
71 71
 rm -rf ../p3dir
72
+autoreconf -fiv
72 73
 cp -a . ../p3dir
73 74
 
74 75
 %build
... ...
@@ -135,6 +136,8 @@ make  %{?_smp_mflags} check
135 135
 %doc %{_mandir}/man1/*.gz
136 136
 
137 137
 %changelog
138
+*   Tue Jan 02 2018 Alexey Makhalov <amakhalov@vmware.com> 1.52.1-5
139
+-   Add autoreconf to support automake-1.15.1
138 140
 *   Mon Aug 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.52.1-4
139 141
 -   Disabling make check for Regress-1.0.gir test, bug#1635886
140 142
 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.52.1-3
141 143
new file mode 100644
... ...
@@ -0,0 +1,11 @@
0
+--- a/rc.d/init.d/functions	2017-02-27 06:56:05.000000000 -0800
1
+@@ -60,7 +60,7 @@
2
+ 
3
+ if [ -z "${CONSOLETYPE:-}" ]; then
4
+     if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
5
+-        CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
6
++        CONSOLETYPE="$(/sbin/consoletype stdout < /dev/stderr 2>/dev/null)"
7
+     else
8
+         CONSOLETYPE="serial"
9
+     fi
... ...
@@ -3,21 +3,22 @@ Name:		initscripts
3 3
 Version:	9.70
4 4
 License:	GPLv2
5 5
 Group:		System Environment/Base
6
-Release:	1%{?dist}
6
+Release:	2%{?dist}
7 7
 URL:		https://github.com/fedora-sysv/initscripts
8 8
 Source0:	https://github.com/fedora-sysv/initscripts/archive/%{name}-%{version}.tar.gz
9 9
 %define sha1 initscripts=6e2ba0946fa2f175f576614d9374ad00266aec66
10 10
 Patch0:     service.patch
11
+Patch1:     fix_return_code_during_set_error.patch
11 12
 Vendor:     	VMware, Inc.
12 13
 Distribution:   Photon
13 14
 Requires:	systemd
14 15
 Requires:	iproute2
15
-BuildRequires:	glib-devel 
16
+BuildRequires:	glib-devel
16 17
 BuildRequires:	python2
17 18
 BuildRequires:	python2-libs
18
-BuildRequires:	popt-devel 
19
-BuildRequires:	gettext 
20
-BuildRequires:	pkg-config 
19
+BuildRequires:	popt-devel
20
+BuildRequires:	gettext
21
+BuildRequires:	pkg-config
21 22
 BuildRequires:	systemd
22 23
 Provides:	/sbin/service
23 24
 
... ...
@@ -46,6 +47,7 @@ Binaries of init network
46 46
 %prep
47 47
 %setup -q
48 48
 %patch0 -p1
49
+%patch1 -p1
49 50
 
50 51
 %build
51 52
 make
... ...
@@ -160,16 +162,18 @@ rm -rf %{buildroot}%{_prefix}/lib/systemd
160 160
 %{_sysconfdir}/profile.d/debug*
161 161
 
162 162
 %changelog
163
+*   Tue Dec 26 2017 Divya Thaluru <dthaluru@vmware.com> 9.70-2
164
+-   Fixed return code in /etc/init.d/functions bash script
163 165
 *   Mon Apr 3 2017 Dheeraj Shetty <dheerajs@vmware.com> 9.70-1
164 166
 -   Updated to version 9.70
165
-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.65-2
166
--	GA - Bump release of all rpms
167
-* Fri Feb 12 2016 Divya Thaluru <dthaluru@vmware.com> 9.65-2
168
-- Fixing service script to start services using systemctl by default
167
+*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 9.65-2
168
+-   GA - Bump release of all rpms
169
+*   Fri Feb 12 2016 Divya Thaluru <dthaluru@vmware.com> 9.65-2
170
+-   Fixing service script to start services using systemctl by default
169 171
 *   Tue Jan 26 2016 Xiaolin Li <xiaolinl@vmware.com> 9.65-1
170 172
 -   Updated to version 9.65
171
-* Mon Jul 20 2015 Divya Thaluru <dthaluru@vmware.com> 9.63-1
172
-- Got Spec file from source tar ball and modified it to be compatible to build in Photon 
173
+*   Mon Jul 20 2015 Divya Thaluru <dthaluru@vmware.com> 9.63-1
174
+-   Got Spec file from source tar ball and modified it to be compatible to build in Photon
173 175
 * Mon May 18 2015 Lukáš Nykrýn <lnykryn@redhat.com> - 9.63-1
174 176
 - remove ipcalc, it has its own package now
175 177
 - network: tell NM to reload its configuration during start
... ...
@@ -1166,7 +1170,7 @@ ng
1166 1166
 - run rc.sysinit, /etc/rc in monitor mode (part of #184340)
1167 1167
 - use a better check for 'native' services (#190989, #110761, adapted
1168 1168
   from <matthias@rpmforge.net>)
1169
- 
1169
+
1170 1170
 * Tue Sep 19 2006 Bill Nottingham <notting@redhat.com> 8.41-1
1171 1171
 - fix network ipv6 hang (#207137, others)
1172 1172
 - rc.sysinit: change blkid.tab path to /etc/blkid/blkid.tab
... ...
@@ -1511,7 +1515,7 @@ ng
1511 1511
   for ipv6calc (<pb@bierenger.de>, <pekkas@netcore.fi>)
1512 1512
 - fix quoting in daemon() (#144634)
1513 1513
 - make sysctl be silent (#144483)
1514
- 
1514
+
1515 1515
 * Mon Jan  3 2005 Bill Nottingham <notting@redhat.com> 8.02-1
1516 1516
 - remove initlog, minilogd
1517 1517
 - add a flag to kmodule for use with kudzu's socket mode, use it
... ...
@@ -1695,7 +1699,7 @@ ng
1695 1695
 - rc.sysinit: remove devfs compat and the remaining 2.4 compat
1696 1696
 - ifup-wireless: support multiple keys (#127957)
1697 1697
 - fix firmware loading (#129155, <bnocera@redhat.com>)
1698
- 
1698
+
1699 1699
 * Tue Aug 24 2004 Karsten Hopp <karsten@redhat.de> 7.68-1
1700 1700
 - execute zfcfconf.sh if available (mainframe)
1701 1701
 
... ...
@@ -1715,7 +1719,7 @@ ng
1715 1715
 
1716 1716
 * Fri Aug 20 2004 Bill Nottingham <notting@redhat.com> 7.64-1
1717 1717
 - rc.d/rc.sysinit: check for dev file too (#130350)
1718
- 
1718
+
1719 1719
 * Thu Aug 19 2004 Than Ngo <than@redhat.com> 7.63-1
1720 1720
 - allow CBCP with own number (#125710)
1721 1721
 
... ...
@@ -2276,7 +2280,7 @@ ng
2276 2276
 * Mon Oct 29 2001 Than Ngo <than@redhat.com>
2277 2277
 - fix bug in channel bundling if MSN is missed
2278 2278
 - support DEBUG option
2279
- 
2279
+
2280 2280
 * Wed Sep 19 2001 Than Ngo <than@redhat.com>
2281 2281
 - don't show user name by DSL connection
2282 2282
 
... ...
@@ -2456,7 +2460,7 @@ ng
2456 2456
 * Wed Jun 27 2001 Than Ngo <than@redhat.com>
2457 2457
 - fix pap/chap authentication for syncppp
2458 2458
 - support ippp options
2459
- 
2459
+
2460 2460
 * Mon Jun 25 2001 Bill Nottingham <notting@redhat.com>
2461 2461
 - add ifup-wireless
2462 2462
 
... ...
@@ -3124,7 +3128,7 @@ ng
3124 3124
 - set macaddr before bootp
3125 3125
 - zero in the /var/run/utmpx file (gafton)
3126 3126
 - don't set hostname on ppp/slip (kills X)
3127
- 
3127
+
3128 3128
 * Wed Mar 17 1999 Bill Nottingham <notting@redhat.com>
3129 3129
 - exit ifup if pump fails
3130 3130
 - fix stupid errors in reading commands from subprocess
... ...
@@ -1,7 +1,7 @@
1 1
 Summary: A New Scripting Dynamic Tracing Tool For Linux
2 2
 Name:    ktap
3 3
 Version: 0.4
4
-Release: 7%{?kernelsubrelease}%{?dist}
4
+Release: 8%{?kernelsubrelease}%{?dist}
5 5
 License: GPLv2
6 6
 URL: https://github.com/ktap/ktap
7 7
 Source: %{name}-master.zip
... ...
@@ -9,6 +9,7 @@ Source: %{name}-master.zip
9 9
 Group:      Development/Tools
10 10
 Vendor:     VMware, Inc.
11 11
 Patch0:        linux-4.9-support.patch
12
+Patch1:        linux-4.14-support.patch
12 13
 Distribution:  Photon
13 14
 BuildRequires: elfutils-devel
14 15
 BuildRequires: linux-devel = %{KERNEL_VERSION}-%{KERNEL_RELEASE}
... ...
@@ -23,6 +24,7 @@ ktap is a new scripting dynamic tracing tool for Linux, it uses a scripting lang
23 23
 %prep
24 24
 %setup -q -n ktap-master
25 25
 %patch0 -p1
26
+%patch1 -p1
26 27
 
27 28
 %build
28 29
 make ktap
... ...
@@ -48,6 +50,8 @@ make install DESTDIR=%{buildroot} KVERSION=%{KERNEL_VERSION}-%{KERNEL_RELEASE}
48 48
 /lib/modules/%{KERNEL_VERSION}-%{KERNEL_RELEASE}/extra/ktapvm.ko
49 49
 
50 50
 %changelog
51
+*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 0.4-8
52
+-   Update to linux-4.14.y. Added support patch
51 53
 *   Fri Jun 09 2017 Chang Lee <changlee@vmware.com> 0.4-7
52 54
 -   Remove %check
53 55
 *   Thu Dec 15 2016 Alexey Makhalov <amakhalov@vmware.com> 0.4-6
54 56
new file mode 100644
... ...
@@ -0,0 +1,68 @@
0
+From af5b37cb95ae43815e7399c92596856a1bbacd2a Mon Sep 17 00:00:00 2001
1
+From: Alexey Makhalov <amakhalov@vmware.com>
2
+Date: Tue, 26 Dec 2017 20:43:49 +0000
3
+Subject: [PATCH] Fix building for v4.14 kernel
4
+
5
+---
6
+ runtime/kp_transport.c | 2 +-
7
+ runtime/kp_vm.c        | 3 ++-
8
+ runtime/lib_base.c     | 2 +-
9
+ runtime/lib_kdebug.c   | 2 +-
10
+ 4 files changed, 5 insertions(+), 4 deletions(-)
11
+
12
+diff --git a/runtime/kp_transport.c b/runtime/kp_transport.c
13
+index 4f76bbd..09a6f87 100644
14
+--- a/runtime/kp_transport.c
15
+@@ -119,7 +119,7 @@ static void trace_consume(struct trace_iterator *iter)
16
+ 			    &iter->lost_events);
17
+ }
18
+ 
19
+-unsigned long long ns2usecs(cycle_t nsec)
20
++unsigned long long ns2usecs(u64 nsec)
21
+ {
22
+ 	nsec += 500;
23
+ 	do_div(nsec, 1000);
24
+diff --git a/runtime/kp_vm.c b/runtime/kp_vm.c
25
+index 0b4787c..761b51b 100644
26
+--- a/runtime/kp_vm.c
27
+@@ -1367,7 +1367,8 @@ static int init_arguments(ktap_state_t *ks, int argc, char __user **user_argv)
28
+ 		int len;
29
+ 		int res;
30
+ 
31
+-		len = strlen_user(ustr);
32
++		/* +2 including final NUL */
33
++		len = strnlen_user(ustr, 0x1002);
34
+ 		if (len > 0x1000) {
35
+ 			ret = -EINVAL;
36
+ 			break;
37
+diff --git a/runtime/lib_base.c b/runtime/lib_base.c
38
+index 691f7d4..420b4b4 100644
39
+--- a/runtime/lib_base.c
40
+@@ -151,7 +151,7 @@ static int kplib_stack(ktap_state_t *ks)
41
+ #endif
42
+ 
43
+ 
44
+-extern unsigned long long ns2usecs(cycle_t nsec);
45
++extern unsigned long long ns2usecs(u64 nsec);
46
+ static int kplib_print_trace_clock(ktap_state_t *ks)
47
+ {
48
+ 	unsigned long long t;
49
+diff --git a/runtime/lib_kdebug.c b/runtime/lib_kdebug.c
50
+index ecd7cbe..f7ed11f 100644
51
+--- a/runtime/lib_kdebug.c
52
+@@ -70,7 +70,7 @@ static int kplib_kdebug_trace_by_id(ktap_state_t *ks)
53
+ 	if (eventsdesc.filter) {
54
+ 		int len;
55
+ 
56
+-		len = strlen_user(eventsdesc.filter);
57
++		len = strnlen_user(eventsdesc.filter, 0x1002);
58
+ 		if (len > 0x1000)
59
+ 			return -1;
60
+ 
61
+-- 
62
+2.14.2
63
+
0 64
new file mode 100644
... ...
@@ -0,0 +1,30 @@
0
+diff -Naur lightwave-1.3.1.7_orig/configure.ac lightwave-1.3.1.7/configure.ac
1
+--- lightwave-1.3.1.7_orig/configure.ac	2017-11-07 18:38:24.000000000 +0000
2
+@@ -21,7 +21,7 @@
3
+         PLATFORM_LIB_PREFIX=lib64
4
+         ;;
5
+     linux*:aarch64)
6
+-        PLATFORM_LIB_PREFIX=lib
7
++        PLATFORM_LIB_PREFIX=lib64
8
+         ;;
9
+     darwin*:x86_64)
10
+         PLATFORM_LIB_PREFIX=lib
11
+@@ -224,7 +224,7 @@
12
+     OPEN_SSL_DEFAULT_PATH=/opt/vmware/lib
13
+     ;;
14
+     linux*:aarch64)
15
+-    OPEN_SSL_DEFAULT_PATH=/opt/vmware/lib
16
++    OPEN_SSL_DEFAULT_PATH=/opt/vmware/lib64
17
+     ;;
18
+     *)
19
+     AC_ERROR("Unsupported operating system - ${host_os}:${host_cpu}")
20
+@@ -445,7 +445,7 @@
21
+     LIKEWISE_DEFAULT_PATH=$LW_BASE_PATH/lib
22
+     ;;
23
+     linux*:aarch64)
24
+-    LIKEWISE_DEFAULT_PATH=$LW_BASE_PATH/lib
25
++    LIKEWISE_DEFAULT_PATH=$LW_BASE_PATH/lib64
26
+     ;;
27
+     *)
28
+     AC_ERROR("Unsupported operating system - ${host_os}:${host_cpu}")
... ...
@@ -1,13 +1,14 @@
1 1
 Name:          lightwave
2 2
 Summary:       VMware Lightwave
3 3
 Version:       1.3.1.7
4
-Release:       1%{?dist}
4
+Release:       2%{?dist}
5 5
 License:       Apache 2.0
6 6
 Group:         Applications/System
7 7
 Vendor:        VMware, Inc.
8 8
 URL: 	       https://github.com/vmware/lightwave
9 9
 Source0:       lightwave-%{version}.tar.gz
10 10
 Patch0:        lightwave-gssapi-unix-creds-separation.patch
11
+Patch1:        lightwave-aarch64-support.patch
11 12
 %define sha1 lightwave=abe987b67aadab05040ac38c11474b8d93fe8644
12 13
 Distribution:  Photon
13 14
 
... ...
@@ -126,6 +127,7 @@ Lightwave POST service
126 126
 %prep
127 127
 %setup -qn lightwave-%{version}
128 128
 %patch0 -p1
129
+%patch1 -p1
129 130
 sed -i 's|/opt/vmware/bin/certool|/usr/bin/certool|' vmidentity/install/src/main/java/com/vmware/identity/configure/LinuxInstallerHelper.java
130 131
 sed -i 's/VMIDENTITY_LIB_DIR=\/opt\/vmware\/lib64/VMIDENTITY_LIB_DIR=\/usr\/jars/' vmidentity/websso/src/main/resources/sso-config.sh
131 132
 sed -i 's,/opt/vmware/bin/ic-join,/usr/bin/ic-join,' config/scripts/domainjoin.sh
... ...
@@ -1141,6 +1143,8 @@ fi
1141 1141
 # %doc ChangeLog README COPYING
1142 1142
 
1143 1143
 %changelog
1144
+*   Tue Dec 26 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.1.7-2
1145
+-   Aarch64 support
1144 1146
 *   Thu Nov 23 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.3.1.7-1
1145 1147
 -   update to lightwave 1.3.1.7 (release 1.3.1-7 in lightwave repo)
1146 1148
 *   Mon Sep 25 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.1-5
... ...
@@ -1,6 +1,6 @@
1 1
 Summary:	Linux API header files
2 2
 Name:		linux-api-headers
3
-Version:	4.9.66
3
+Version:	4.14.8
4 4
 Release:	1%{?dist}
5 5
 License:	GPLv2
6 6
 URL:		http://www.kernel.org/
... ...
@@ -8,7 +8,7 @@ Group:		System Environment/Kernel
8 8
 Vendor:		VMware, Inc.
9 9
 Distribution: Photon
10 10
 Source0:        http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
11
-%define sha1 linux=ecb5adfa84ab6f06f2cb07b56517883310710a0b
11
+%define sha1 linux=45f140e0eab08428d78d81d4169d531a3e65a297
12 12
 BuildArch:	noarch
13 13
 %description
14 14
 The Linux API Headers expose the kernel's API for use by Glibc.
... ...
@@ -25,6 +25,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de
25 25
 %defattr(-,root,root)
26 26
 %{_includedir}/*
27 27
 %changelog
28
+*   Fri Dec 22 2017 Alexey Makhalov <amakhalov@vmware.com> 4.14.8-1
29
+-   Version update
28 30
 *   Mon Dec 04 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.66-1
29 31
 -   Version update
30 32
 *   Tue Nov 21 2017 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.64-1
31 33
new file mode 100644
... ...
@@ -0,0 +1,96 @@
0
+From 6cf100df51539210b9115fe74f27ff5b139a5cfc Mon Sep 17 00:00:00 2001
1
+From: Alexey Makhalov <amakhalov@vmware.com>
2
+Date: Fri, 22 Dec 2017 15:54:02 -0800
3
+Subject: [PATCH] Allow some algo tests for FIPS
4
+
5
+---
6
+ crypto/testmgr.c | 10 ++++++++++
7
+ 1 file changed, 10 insertions(+)
8
+
9
+diff --git a/crypto/testmgr.c b/crypto/testmgr.c
10
+index 7125ba38..1729c52a 100644
11
+--- a/crypto/testmgr.c
12
+@@ -2357,6 +2357,7 @@ static const struct alg_test_desc alg_test_descs[] = {
13
+ 	}, {
14
+ 		.alg = "authenc(hmac(md5),ecb(cipher_null))",
15
+ 		.test = alg_test_aead,
16
++                .fips_allowed = 1,
17
+ 		.suite = {
18
+ 			.aead = {
19
+ 				.enc = __VECS(hmac_md5_ecb_cipher_null_enc_tv_template),
20
+@@ -2375,6 +2376,7 @@ static const struct alg_test_desc alg_test_descs[] = {
21
+ 	}, {
22
+ 		.alg = "authenc(hmac(sha1),cbc(des))",
23
+ 		.test = alg_test_aead,
24
++                .fips_allowed = 1,
25
+ 		.suite = {
26
+ 			.aead = {
27
+ 				.enc = __VECS(hmac_sha1_des_cbc_enc_tv_temp)
28
+@@ -2396,6 +2398,7 @@ static const struct alg_test_desc alg_test_descs[] = {
29
+ 	}, {
30
+ 		.alg = "authenc(hmac(sha1),ecb(cipher_null))",
31
+ 		.test = alg_test_aead,
32
++                .fips_allowed = 1,
33
+ 		.suite = {
34
+ 			.aead = {
35
+ 				.enc = __VECS(hmac_sha1_ecb_cipher_null_enc_tv_temp),
36
+@@ -2435,6 +2438,7 @@ static const struct alg_test_desc alg_test_descs[] = {
37
+ 	}, {
38
+ 		.alg = "authenc(hmac(sha256),cbc(des))",
39
+ 		.test = alg_test_aead,
40
++                .fips_allowed = 1,
41
+ 		.suite = {
42
+ 			.aead = {
43
+ 				.enc = __VECS(hmac_sha256_des_cbc_enc_tv_temp)
44
+@@ -2460,6 +2464,7 @@ static const struct alg_test_desc alg_test_descs[] = {
45
+ 	}, {
46
+ 		.alg = "authenc(hmac(sha384),cbc(des))",
47
+ 		.test = alg_test_aead,
48
++                .fips_allowed = 1,
49
+ 		.suite = {
50
+ 			.aead = {
51
+ 				.enc = __VECS(hmac_sha384_des_cbc_enc_tv_temp)
52
+@@ -2494,6 +2499,7 @@ static const struct alg_test_desc alg_test_descs[] = {
53
+ 	}, {
54
+ 		.alg = "authenc(hmac(sha512),cbc(des))",
55
+ 		.test = alg_test_aead,
56
++                .fips_allowed = 1,
57
+ 		.suite = {
58
+ 			.aead = {
59
+ 				.enc = __VECS(hmac_sha512_des_cbc_enc_tv_temp)
60
+@@ -3193,6 +3199,7 @@ static const struct alg_test_desc alg_test_descs[] = {
61
+ 		.alg = "jitterentropy_rng",
62
+ 		.fips_allowed = 1,
63
+ 		.test = alg_test_null,
64
++                .fips_allowed = 1,
65
+ 	}, {
66
+ 		.alg = "kw(aes)",
67
+ 		.test = alg_test_skcipher,
68
+@@ -3373,6 +3380,7 @@ static const struct alg_test_desc alg_test_descs[] = {
69
+ 	}, {
70
+ 		.alg = "rfc4543(gcm(aes))",
71
+ 		.test = alg_test_aead,
72
++                .fips_allowed = 1,
73
+ 		.suite = {
74
+ 			.aead = {
75
+ 				.enc = __VECS(aes_gcm_rfc4543_enc_tv_template),
76
+@@ -3391,6 +3399,7 @@ static const struct alg_test_desc alg_test_descs[] = {
77
+ 	}, {
78
+ 		.alg = "rfc7539esp(chacha20,poly1305)",
79
+ 		.test = alg_test_aead,
80
++                .fips_allowed = 1,
81
+ 		.suite = {
82
+ 			.aead = {
83
+ 				.enc = __VECS(rfc7539esp_enc_tv_template),
84
+@@ -3587,6 +3596,7 @@ static const struct alg_test_desc alg_test_descs[] = {
85
+ 	}, {
86
+ 		.alg = "xts(twofish)",
87
+ 		.test = alg_test_skcipher,
88
++                .fips_allowed = 1,
89
+ 		.suite = {
90
+ 			.cipher = {
91
+ 				.enc = __VECS(tf_xts_enc_tv_template),
92
+-- 
93
+2.11.0
94
+
... ...
@@ -1,6 +1,6 @@
1 1
 #
2 2
 # Automatically generated file; DO NOT EDIT.
3
-# Linux/x86 4.9.64 Kernel Configuration
3
+# Linux/x86 4.14.8 Kernel Configuration
4 4
 #
5 5
 CONFIG_64BIT=y
6 6
 CONFIG_X86_64=y
... ...
@@ -41,7 +41,6 @@ CONFIG_HAVE_INTEL_TXT=y
41 41
 CONFIG_X86_64_SMP=y
42 42
 CONFIG_ARCH_SUPPORTS_UPROBES=y
43 43
 CONFIG_FIX_EARLYCON_MEM=y
44
-CONFIG_DEBUG_RODATA=y
45 44
 CONFIG_PGTABLE_LEVELS=4
46 45
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
47 46
 CONFIG_IRQ_WORK=y
... ...
@@ -88,7 +87,9 @@ CONFIG_AUDIT_TREE=y
88 88
 #
89 89
 CONFIG_GENERIC_IRQ_PROBE=y
90 90
 CONFIG_GENERIC_IRQ_SHOW=y
91
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
91 92
 CONFIG_GENERIC_PENDING_IRQ=y
93
+CONFIG_GENERIC_IRQ_MIGRATION=y
92 94
 CONFIG_IRQ_DOMAIN=y
93 95
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
94 96
 CONFIG_GENERIC_MSI_IRQ=y
... ...
@@ -96,6 +97,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
96 96
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
97 97
 CONFIG_IRQ_FORCED_THREADING=y
98 98
 CONFIG_SPARSE_IRQ=y
99
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
99 100
 CONFIG_CLOCKSOURCE_WATCHDOG=y
100 101
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
101 102
 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
... ...
@@ -135,16 +137,16 @@ CONFIG_TASK_IO_ACCOUNTING=y
135 135
 CONFIG_TREE_RCU=y
136 136
 # CONFIG_RCU_EXPERT is not set
137 137
 CONFIG_SRCU=y
138
+CONFIG_TREE_SRCU=y
138 139
 # CONFIG_TASKS_RCU is not set
139 140
 CONFIG_RCU_STALL_COMMON=y
140
-# CONFIG_TREE_RCU_TRACE is not set
141
-# CONFIG_RCU_EXPEDITE_BOOT is not set
141
+CONFIG_RCU_NEED_SEGCBLIST=y
142 142
 CONFIG_BUILD_BIN2C=y
143 143
 CONFIG_IKCONFIG=y
144 144
 CONFIG_IKCONFIG_PROC=y
145 145
 CONFIG_LOG_BUF_SHIFT=18
146 146
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
147
-CONFIG_NMI_LOG_BUF_SHIFT=13
147
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
148 148
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
149 149
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
150 150
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
... ...
@@ -163,6 +165,7 @@ CONFIG_FAIR_GROUP_SCHED=y
163 163
 CONFIG_CFS_BANDWIDTH=y
164 164
 # CONFIG_RT_GROUP_SCHED is not set
165 165
 CONFIG_CGROUP_PIDS=y
166
+CONFIG_CGROUP_RDMA=y
166 167
 CONFIG_CGROUP_FREEZER=y
167 168
 CONFIG_CGROUP_HUGETLB=y
168 169
 CONFIG_CPUSETS=y
... ...
@@ -171,6 +174,7 @@ CONFIG_CGROUP_DEVICE=y
171 171
 CONFIG_CGROUP_CPUACCT=y
172 172
 CONFIG_CGROUP_PERF=y
173 173
 # CONFIG_CGROUP_DEBUG is not set
174
+CONFIG_SOCK_CGROUP_DATA=y
174 175
 # CONFIG_CHECKPOINT_RESTORE is not set
175 176
 CONFIG_NAMESPACES=y
176 177
 CONFIG_UTS_NS=y
... ...
@@ -203,6 +207,7 @@ CONFIG_MULTIUSER=y
203 203
 CONFIG_SGETMASK_SYSCALL=y
204 204
 CONFIG_SYSFS_SYSCALL=y
205 205
 # CONFIG_SYSCTL_SYSCALL is not set
206
+CONFIG_POSIX_TIMERS=y
206 207
 CONFIG_KALLSYMS=y
207 208
 CONFIG_KALLSYMS_ALL=y
208 209
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
... ...
@@ -214,6 +219,7 @@ CONFIG_ELF_CORE=y
214 214
 # CONFIG_PCSPKR_PLATFORM is not set
215 215
 CONFIG_BASE_FULL=y
216 216
 CONFIG_FUTEX=y
217
+CONFIG_FUTEX_PI=y
217 218
 CONFIG_EPOLL=y
218 219
 CONFIG_SIGNALFD=y
219 220
 CONFIG_TIMERFD=y
... ...
@@ -227,6 +233,7 @@ CONFIG_PCI_QUIRKS=y
227 227
 CONFIG_MEMBARRIER=y
228 228
 # CONFIG_EMBEDDED is not set
229 229
 CONFIG_HAVE_PERF_EVENTS=y
230
+# CONFIG_PC104 is not set
230 231
 
231 232
 #
232 233
 # Kernel Performance Events And Counters
... ...
@@ -238,10 +245,12 @@ CONFIG_COMPAT_BRK=y
238 238
 CONFIG_SLAB=y
239 239
 # CONFIG_SLUB is not set
240 240
 # CONFIG_SLOB is not set
241
+CONFIG_SLAB_MERGE_DEFAULT=y
241 242
 # CONFIG_SLAB_FREELIST_RANDOM is not set
242 243
 CONFIG_SYSTEM_DATA_VERIFICATION=y
243 244
 CONFIG_PROFILING=y
244 245
 CONFIG_TRACEPOINTS=y
246
+CONFIG_CRASH_CORE=y
245 247
 CONFIG_KEXEC_CORE=y
246 248
 CONFIG_OPROFILE=m
247 249
 CONFIG_OPROFILE_EVENT_MULTIPLEX=y
... ...
@@ -266,16 +275,21 @@ CONFIG_HAVE_NMI=y
266 266
 CONFIG_HAVE_ARCH_TRACEHOOK=y
267 267
 CONFIG_HAVE_DMA_CONTIGUOUS=y
268 268
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
269
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
270
+CONFIG_ARCH_HAS_SET_MEMORY=y
269 271
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
270 272
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
273
+CONFIG_HAVE_CLK=y
271 274
 CONFIG_HAVE_DMA_API_DEBUG=y
272 275
 CONFIG_HAVE_HW_BREAKPOINT=y
273 276
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
274 277
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
275 278
 CONFIG_HAVE_PERF_EVENTS_NMI=y
279
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
276 280
 CONFIG_HAVE_PERF_REGS=y
277 281
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
278 282
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
283
+CONFIG_HAVE_RCU_TABLE_FREE=y
279 284
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
280 285
 CONFIG_HAVE_CMPXCHG_LOCAL=y
281 286
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
... ...
@@ -287,18 +301,23 @@ CONFIG_HAVE_GCC_PLUGINS=y
287 287
 CONFIG_GCC_PLUGINS=y
288 288
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
289 289
 # CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
290
+# CONFIG_GCC_PLUGIN_STRUCTLEAK is not set
291
+# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
290 292
 CONFIG_HAVE_CC_STACKPROTECTOR=y
291 293
 CONFIG_CC_STACKPROTECTOR=y
292 294
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
293 295
 CONFIG_CC_STACKPROTECTOR_REGULAR=y
294 296
 # CONFIG_CC_STACKPROTECTOR_STRONG is not set
297
+CONFIG_THIN_ARCHIVES=y
295 298
 CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
296 299
 CONFIG_HAVE_CONTEXT_TRACKING=y
297 300
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
298 301
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
299 302
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
303
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
300 304
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
301 305
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
306
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
302 307
 CONFIG_MODULES_USE_ELF_RELA=y
303 308
 CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
304 309
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
... ...
@@ -307,8 +326,10 @@ CONFIG_HAVE_EXIT_THREAD=y
307 307
 CONFIG_ARCH_MMAP_RND_BITS=28
308 308
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
309 309
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
310
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
310 311
 CONFIG_HAVE_COPY_THREAD_TLS=y
311 312
 CONFIG_HAVE_STACK_VALIDATION=y
313
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
312 314
 # CONFIG_HAVE_ARCH_HASH is not set
313 315
 # CONFIG_ISA_BUS_API is not set
314 316
 CONFIG_OLD_SIGSUSPEND3=y
... ...
@@ -316,6 +337,14 @@ CONFIG_COMPAT_OLD_SIGACTION=y
316 316
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
317 317
 CONFIG_HAVE_ARCH_VMAP_STACK=y
318 318
 CONFIG_VMAP_STACK=y
319
+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
320
+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
321
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
322
+CONFIG_STRICT_KERNEL_RWX=y
323
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
324
+CONFIG_STRICT_MODULE_RWX=y
325
+CONFIG_ARCH_HAS_REFCOUNT=y
326
+# CONFIG_REFCOUNT_FULL is not set
319 327
 
320 328
 #
321 329
 # GCOV-based kernel profiling
... ...
@@ -344,11 +373,17 @@ CONFIG_MODULE_SIG_HASH="sha512"
344 344
 # CONFIG_MODULE_COMPRESS is not set
345 345
 CONFIG_MODULES_TREE_LOOKUP=y
346 346
 CONFIG_BLOCK=y
347
+CONFIG_BLK_SCSI_REQUEST=y
347 348
 CONFIG_BLK_DEV_BSG=y
348 349
 CONFIG_BLK_DEV_BSGLIB=y
349 350
 CONFIG_BLK_DEV_INTEGRITY=y
351
+# CONFIG_BLK_DEV_ZONED is not set
350 352
 CONFIG_BLK_DEV_THROTTLING=y
353
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
351 354
 # CONFIG_BLK_CMDLINE_PARSER is not set
355
+# CONFIG_BLK_WBT is not set
356
+CONFIG_BLK_DEBUG_FS=y
357
+# CONFIG_BLK_SED_OPAL is not set
352 358
 
353 359
 #
354 360
 # Partition Types
... ...
@@ -375,6 +410,7 @@ CONFIG_EFI_PARTITION=y
375 375
 # CONFIG_CMDLINE_PARTITION is not set
376 376
 CONFIG_BLOCK_COMPAT=y
377 377
 CONFIG_BLK_MQ_PCI=y
378
+CONFIG_BLK_MQ_VIRTIO=y
378 379
 
379 380
 #
380 381
 # IO Schedulers
... ...
@@ -387,6 +423,9 @@ CONFIG_CFQ_GROUP_IOSCHED=y
387 387
 CONFIG_DEFAULT_CFQ=y
388 388
 # CONFIG_DEFAULT_NOOP is not set
389 389
 CONFIG_DEFAULT_IOSCHED="cfq"
390
+CONFIG_MQ_IOSCHED_DEADLINE=y
391
+CONFIG_MQ_IOSCHED_KYBER=y
392
+# CONFIG_IOSCHED_BFQ is not set
390 393
 CONFIG_PREEMPT_NOTIFIERS=y
391 394
 CONFIG_ASN1=y
392 395
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
... ...
@@ -414,6 +453,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
414 414
 CONFIG_X86_X2APIC=y
415 415
 # CONFIG_X86_MPPARSE is not set
416 416
 # CONFIG_GOLDFISH is not set
417
+# CONFIG_INTEL_RDT is not set
417 418
 # CONFIG_X86_EXTENDED_PLATFORM is not set
418 419
 # CONFIG_X86_INTEL_LPSS is not set
419 420
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
... ...
@@ -426,8 +466,11 @@ CONFIG_PARAVIRT=y
426 426
 # CONFIG_PARAVIRT_DEBUG is not set
427 427
 # CONFIG_PARAVIRT_SPINLOCKS is not set
428 428
 CONFIG_XEN=y
429
+CONFIG_XEN_PV=y
430
+CONFIG_XEN_PV_SMP=y
429 431
 CONFIG_XEN_DOM0=y
430 432
 CONFIG_XEN_PVHVM=y
433
+CONFIG_XEN_PVHVM_SMP=y
431 434
 CONFIG_XEN_512GB=y
432 435
 CONFIG_XEN_SAVE_RESTORE=y
433 436
 CONFIG_XEN_DEBUG_FS=y
... ...
@@ -464,6 +507,7 @@ CONFIG_MAXSMP=y
464 464
 CONFIG_NR_CPUS=8192
465 465
 CONFIG_SCHED_SMT=y
466 466
 CONFIG_SCHED_MC=y
467
+CONFIG_SCHED_MC_PRIO=y
467 468
 CONFIG_PREEMPT_NONE=y
468 469
 # CONFIG_PREEMPT_VOLUNTARY is not set
469 470
 # CONFIG_PREEMPT is not set
... ...
@@ -471,6 +515,7 @@ CONFIG_X86_LOCAL_APIC=y
471 471
 CONFIG_X86_IO_APIC=y
472 472
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
473 473
 CONFIG_X86_MCE=y
474
+# CONFIG_X86_MCELOG_LEGACY is not set
474 475
 CONFIG_X86_MCE_INTEL=y
475 476
 CONFIG_X86_MCE_AMD=y
476 477
 CONFIG_X86_MCE_THRESHOLD=y
... ...
@@ -495,9 +540,12 @@ CONFIG_MICROCODE_AMD=y
495 495
 CONFIG_MICROCODE_OLD_INTERFACE=y
496 496
 CONFIG_X86_MSR=m
497 497
 CONFIG_X86_CPUID=m
498
+# CONFIG_X86_5LEVEL is not set
498 499
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
499 500
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
500 501
 CONFIG_X86_DIRECT_GBPAGES=y
502
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
503
+# CONFIG_AMD_MEM_ENCRYPT is not set
501 504
 CONFIG_NUMA=y
502 505
 CONFIG_AMD_NUMA=y
503 506
 CONFIG_X86_64_ACPI_NUMA=y
... ...
@@ -521,9 +569,9 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
521 521
 CONFIG_SPARSEMEM_VMEMMAP=y
522 522
 CONFIG_HAVE_MEMBLOCK=y
523 523
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
524
+CONFIG_HAVE_GENERIC_GUP=y
524 525
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
525 526
 CONFIG_MEMORY_ISOLATION=y
526
-# CONFIG_MOVABLE_NODE is not set
527 527
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
528 528
 CONFIG_MEMORY_HOTPLUG=y
529 529
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
... ...
@@ -536,6 +584,7 @@ CONFIG_BALLOON_COMPACTION=y
536 536
 CONFIG_COMPACTION=y
537 537
 CONFIG_MIGRATION=y
538 538
 CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
539
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
539 540
 CONFIG_PHYS_ADDR_T_64BIT=y
540 541
 CONFIG_VIRT_TO_BUS=y
541 542
 CONFIG_MMU_NOTIFIER=y
... ...
@@ -547,6 +596,8 @@ CONFIG_MEMORY_FAILURE=y
547 547
 CONFIG_TRANSPARENT_HUGEPAGE=y
548 548
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
549 549
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
550
+CONFIG_ARCH_WANTS_THP_SWAP=y
551
+CONFIG_THP_SWAP=y
550 552
 CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
551 553
 CONFIG_CLEANCACHE=y
552 554
 # CONFIG_FRONTSWAP is not set
... ...
@@ -558,9 +609,15 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
558 558
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
559 559
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
560 560
 # CONFIG_IDLE_PAGE_TRACKING is not set
561
+CONFIG_ARCH_HAS_ZONE_DEVICE=y
561 562
 CONFIG_ZONE_DEVICE=y
563
+CONFIG_ARCH_HAS_HMM=y
564
+# CONFIG_HMM_MIRROR is not set
565
+# CONFIG_DEVICE_PRIVATE is not set
566
+# CONFIG_DEVICE_PUBLIC is not set
562 567
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
563 568
 CONFIG_ARCH_HAS_PKEYS=y
569
+# CONFIG_PERCPU_STATS is not set
564 570
 CONFIG_X86_PMEM_LEGACY_DEVICE=y
565 571
 CONFIG_X86_PMEM_LEGACY=y
566 572
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
... ...
@@ -603,6 +660,7 @@ CONFIG_LEGACY_VSYSCALL_EMULATE=y
603 603
 # CONFIG_CMDLINE_BOOL is not set
604 604
 CONFIG_MODIFY_LDT_SYSCALL=y
605 605
 CONFIG_HAVE_LIVEPATCH=y
606
+CONFIG_ARCH_HAS_ADD_PAGES=y
606 607
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
607 608
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
608 609
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
... ...
@@ -623,6 +681,8 @@ CONFIG_PM_SLEEP_SMP=y
623 623
 # CONFIG_PM_WAKELOCKS is not set
624 624
 CONFIG_PM=y
625 625
 # CONFIG_PM_DEBUG is not set
626
+CONFIG_PM_OPP=y
627
+CONFIG_PM_CLK=y
626 628
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
627 629
 CONFIG_ACPI=y
628 630
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
... ...
@@ -642,6 +702,7 @@ CONFIG_ACPI_FAN=m
642 642
 CONFIG_ACPI_CPU_FREQ_PSS=y
643 643
 CONFIG_ACPI_PROCESSOR_CSTATE=y
644 644
 CONFIG_ACPI_PROCESSOR_IDLE=y
645
+CONFIG_ACPI_CPPC_LIB=y
645 646
 CONFIG_ACPI_PROCESSOR=y
646 647
 CONFIG_ACPI_IPMI=m
647 648
 CONFIG_ACPI_HOTPLUG_CPU=y
... ...
@@ -663,7 +724,6 @@ CONFIG_ACPI_HED=y
663 663
 # CONFIG_ACPI_BGRT is not set
664 664
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
665 665
 CONFIG_ACPI_NFIT=m
666
-# CONFIG_ACPI_NFIT_DEBUG is not set
667 666
 CONFIG_HAVE_ACPI_APEI=y
668 667
 CONFIG_HAVE_ACPI_APEI_NMI=y
669 668
 CONFIG_ACPI_APEI=y
... ...
@@ -685,7 +745,6 @@ CONFIG_CPU_FREQ=y
685 685
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
686 686
 CONFIG_CPU_FREQ_GOV_COMMON=y
687 687
 CONFIG_CPU_FREQ_STAT=y
688
-CONFIG_CPU_FREQ_STAT_DETAILS=y
689 688
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
690 689
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
691 690
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
... ...
@@ -726,12 +785,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
726 726
 CONFIG_INTEL_IDLE=y
727 727
 
728 728
 #
729
-# Memory power savings
730
-#
731
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
732
-CONFIG_I7300_IDLE=m
733
-
734
-#
735 729
 # Bus options (PCI etc.)
736 730
 #
737 731
 CONFIG_PCI=y
... ...
@@ -749,6 +802,7 @@ CONFIG_PCIEASPM=y
749 749
 # CONFIG_PCIEASPM_DEBUG is not set
750 750
 CONFIG_PCIEASPM_DEFAULT=y
751 751
 # CONFIG_PCIEASPM_POWERSAVE is not set
752
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
752 753
 # CONFIG_PCIEASPM_PERFORMANCE is not set
753 754
 CONFIG_PCIE_PME=y
754 755
 # CONFIG_PCIE_DPC is not set
... ...
@@ -762,6 +816,7 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
762 762
 CONFIG_XEN_PCIDEV_FRONTEND=m
763 763
 CONFIG_HT_IRQ=y
764 764
 CONFIG_PCI_ATS=y
765
+CONFIG_PCI_LOCKLESS_CONFIG=y
765 766
 CONFIG_PCI_IOV=y
766 767
 CONFIG_PCI_PRI=y
767 768
 CONFIG_PCI_PASID=y
... ...
@@ -774,10 +829,24 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
774 774
 # CONFIG_HOTPLUG_PCI_SHPC is not set
775 775
 
776 776
 #
777
-# PCI host controller drivers
777
+# DesignWare PCI Core Support
778 778
 #
779 779
 # CONFIG_PCIE_DW_PLAT is not set
780
+
781
+#
782
+# PCI host controller drivers
783
+#
780 784
 CONFIG_VMD=y
785
+
786
+#
787
+# PCI Endpoint
788
+#
789
+# CONFIG_PCI_ENDPOINT is not set
790
+
791
+#
792
+# PCI switch controller drivers
793
+#
794
+# CONFIG_PCI_SW_SWITCHTEC is not set
781 795
 # CONFIG_ISA_BUS is not set
782 796
 CONFIG_ISA_DMA_API=y
783 797
 CONFIG_AMD_NB=y
... ...
@@ -799,11 +868,11 @@ CONFIG_COREDUMP=y
799 799
 CONFIG_IA32_EMULATION=y
800 800
 # CONFIG_IA32_AOUT is not set
801 801
 # CONFIG_X86_X32 is not set
802
+CONFIG_COMPAT_32=y
802 803
 CONFIG_COMPAT=y
803 804
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
804 805
 CONFIG_SYSVIPC_COMPAT=y
805 806
 CONFIG_X86_DEV_DMA_OPS=y
806
-CONFIG_PMC_ATOM=y
807 807
 CONFIG_NET=y
808 808
 CONFIG_NET_INGRESS=y
809 809
 CONFIG_NET_EGRESS=y
... ...
@@ -815,6 +884,7 @@ CONFIG_PACKET=y
815 815
 CONFIG_PACKET_DIAG=m
816 816
 CONFIG_UNIX=y
817 817
 CONFIG_UNIX_DIAG=m
818
+# CONFIG_TLS is not set
818 819
 CONFIG_XFRM=y
819 820
 CONFIG_XFRM_ALGO=m
820 821
 CONFIG_XFRM_USER=m
... ...
@@ -849,6 +919,7 @@ CONFIG_NET_UDP_TUNNEL=m
849 849
 # CONFIG_NET_FOU_IP_TUNNELS is not set
850 850
 CONFIG_INET_AH=m
851 851
 CONFIG_INET_ESP=m
852
+# CONFIG_INET_ESP_OFFLOAD is not set
852 853
 CONFIG_INET_IPCOMP=m
853 854
 CONFIG_INET_XFRM_TUNNEL=m
854 855
 CONFIG_INET_TUNNEL=m
... ...
@@ -858,6 +929,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
858 858
 CONFIG_INET_DIAG=m
859 859
 CONFIG_INET_TCP_DIAG=m
860 860
 CONFIG_INET_UDP_DIAG=m
861
+# CONFIG_INET_RAW_DIAG is not set
861 862
 # CONFIG_INET_DIAG_DESTROY is not set
862 863
 CONFIG_TCP_CONG_ADVANCED=y
863 864
 # CONFIG_TCP_CONG_BIC is not set
... ...
@@ -886,6 +958,7 @@ CONFIG_IPV6_ROUTE_INFO=y
886 886
 CONFIG_IPV6_OPTIMISTIC_DAD=y
887 887
 CONFIG_INET6_AH=m
888 888
 CONFIG_INET6_ESP=m
889
+# CONFIG_INET6_ESP_OFFLOAD is not set
889 890
 CONFIG_INET6_IPCOMP=m
890 891
 CONFIG_IPV6_MIP6=m
891 892
 # CONFIG_IPV6_ILA is not set
... ...
@@ -908,12 +981,13 @@ CONFIG_IPV6_SUBTREES=y
908 908
 CONFIG_IPV6_MROUTE=y
909 909
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
910 910
 CONFIG_IPV6_PIMSM_V2=y
911
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
912
+# CONFIG_IPV6_SEG6_HMAC is not set
911 913
 CONFIG_NETLABEL=y
912 914
 CONFIG_NETWORK_SECMARK=y
913 915
 CONFIG_NET_PTP_CLASSIFY=y
914 916
 CONFIG_NETWORK_PHY_TIMESTAMPING=y
915 917
 CONFIG_NETFILTER=y
916
-# CONFIG_NETFILTER_DEBUG is not set
917 918
 CONFIG_NETFILTER_ADVANCED=y
918 919
 CONFIG_BRIDGE_NETFILTER=m
919 920
 
... ...
@@ -927,6 +1001,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
927 927
 CONFIG_NETFILTER_NETLINK_LOG=m
928 928
 CONFIG_NF_CONNTRACK=m
929 929
 CONFIG_NF_LOG_COMMON=m
930
+# CONFIG_NF_LOG_NETDEV is not set
930 931
 CONFIG_NF_CONNTRACK_MARK=y
931 932
 CONFIG_NF_CONNTRACK_SECMARK=y
932 933
 CONFIG_NF_CONNTRACK_ZONES=y
... ...
@@ -935,10 +1010,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y
935 935
 CONFIG_NF_CONNTRACK_TIMEOUT=y
936 936
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
937 937
 CONFIG_NF_CONNTRACK_LABELS=y
938
-CONFIG_NF_CT_PROTO_DCCP=m
938
+CONFIG_NF_CT_PROTO_DCCP=y
939 939
 CONFIG_NF_CT_PROTO_GRE=m
940
-CONFIG_NF_CT_PROTO_SCTP=m
941
-CONFIG_NF_CT_PROTO_UDPLITE=m
940
+CONFIG_NF_CT_PROTO_SCTP=y
941
+CONFIG_NF_CT_PROTO_UDPLITE=y
942 942
 CONFIG_NF_CONNTRACK_AMANDA=m
943 943
 CONFIG_NF_CONNTRACK_FTP=m
944 944
 CONFIG_NF_CONNTRACK_H323=m
... ...
@@ -955,9 +1030,9 @@ CONFIG_NF_CT_NETLINK_TIMEOUT=m
955 955
 # CONFIG_NETFILTER_NETLINK_GLUE_CT is not set
956 956
 CONFIG_NF_NAT=m
957 957
 CONFIG_NF_NAT_NEEDED=y
958
-CONFIG_NF_NAT_PROTO_DCCP=m
959
-CONFIG_NF_NAT_PROTO_UDPLITE=m
960
-CONFIG_NF_NAT_PROTO_SCTP=m
958
+CONFIG_NF_NAT_PROTO_DCCP=y
959
+CONFIG_NF_NAT_PROTO_UDPLITE=y
960
+CONFIG_NF_NAT_PROTO_SCTP=y
961 961
 CONFIG_NF_NAT_AMANDA=m
962 962
 CONFIG_NF_NAT_FTP=m
963 963
 CONFIG_NF_NAT_IRC=m
... ...
@@ -970,16 +1045,19 @@ CONFIG_NF_TABLES_INET=m
970 970
 CONFIG_NF_TABLES_NETDEV=m
971 971
 CONFIG_NFT_EXTHDR=m
972 972
 CONFIG_NFT_META=m
973
+CONFIG_NFT_RT=m
973 974
 CONFIG_NFT_NUMGEN=m
974 975
 CONFIG_NFT_CT=m
975 976
 CONFIG_NFT_SET_RBTREE=m
976 977
 CONFIG_NFT_SET_HASH=m
978
+CONFIG_NFT_SET_BITMAP=m
977 979
 CONFIG_NFT_COUNTER=m
978 980
 CONFIG_NFT_LOG=m
979 981
 CONFIG_NFT_LIMIT=m
980 982
 CONFIG_NFT_MASQ=m
981 983
 CONFIG_NFT_REDIR=m
982 984
 CONFIG_NFT_NAT=m
985
+# CONFIG_NFT_OBJREF is not set
983 986
 CONFIG_NFT_QUEUE=m
984 987
 CONFIG_NFT_QUOTA=m
985 988
 CONFIG_NFT_REJECT=m
... ...
@@ -1069,7 +1147,6 @@ CONFIG_NETFILTER_XT_MATCH_RATEEST=m
1069 1069
 CONFIG_NETFILTER_XT_MATCH_REALM=m
1070 1070
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
1071 1071
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
1072
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
1073 1072
 CONFIG_NETFILTER_XT_MATCH_STATE=m
1074 1073
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
1075 1074
 CONFIG_NETFILTER_XT_MATCH_STRING=m
... ...
@@ -1086,6 +1163,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
1086 1086
 CONFIG_IP_SET_HASH_IPPORT=m
1087 1087
 CONFIG_IP_SET_HASH_IPPORTIP=m
1088 1088
 CONFIG_IP_SET_HASH_IPPORTNET=m
1089
+CONFIG_IP_SET_HASH_IPMAC=m
1089 1090
 CONFIG_IP_SET_HASH_MAC=m
1090 1091
 CONFIG_IP_SET_HASH_NETPORTNET=m
1091 1092
 CONFIG_IP_SET_HASH_NET=m
... ...
@@ -1141,10 +1219,12 @@ CONFIG_IP_VS_PE_SIP=m
1141 1141
 #
1142 1142
 CONFIG_NF_DEFRAG_IPV4=m
1143 1143
 CONFIG_NF_CONNTRACK_IPV4=m
1144
+# CONFIG_NF_SOCKET_IPV4 is not set
1144 1145
 CONFIG_NF_TABLES_IPV4=m
1145 1146
 # CONFIG_NFT_CHAIN_ROUTE_IPV4 is not set
1146 1147
 CONFIG_NFT_REJECT_IPV4=m
1147 1148
 # CONFIG_NFT_DUP_IPV4 is not set
1149
+# CONFIG_NFT_FIB_IPV4 is not set
1148 1150
 # CONFIG_NF_TABLES_ARP is not set
1149 1151
 CONFIG_NF_DUP_IPV4=m
1150 1152
 # CONFIG_NF_LOG_ARP is not set
... ...
@@ -1186,10 +1266,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
1186 1186
 #
1187 1187
 CONFIG_NF_DEFRAG_IPV6=m
1188 1188
 CONFIG_NF_CONNTRACK_IPV6=m
1189
+# CONFIG_NF_SOCKET_IPV6 is not set
1189 1190
 CONFIG_NF_TABLES_IPV6=m
1190 1191
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
1191 1192
 CONFIG_NFT_REJECT_IPV6=m
1192 1193
 CONFIG_NFT_DUP_IPV6=m
1194
+# CONFIG_NFT_FIB_IPV6 is not set
1193 1195
 CONFIG_NF_DUP_IPV6=m
1194 1196
 CONFIG_NF_REJECT_IPV6=m
1195 1197
 CONFIG_NF_LOG_IPV6=m
... ...
@@ -1321,6 +1403,7 @@ CONFIG_NET_SCH_FQ=m
1321 1321
 # CONFIG_NET_SCH_PIE is not set
1322 1322
 CONFIG_NET_SCH_INGRESS=m
1323 1323
 CONFIG_NET_SCH_PLUG=m
1324
+# CONFIG_NET_SCH_DEFAULT is not set
1324 1325
 
1325 1326
 #
1326 1327
 # Classification
... ...
@@ -1353,6 +1436,7 @@ CONFIG_NET_ACT_POLICE=m
1353 1353
 CONFIG_NET_ACT_GACT=m
1354 1354
 CONFIG_GACT_PROB=y
1355 1355
 CONFIG_NET_ACT_MIRRED=m
1356
+# CONFIG_NET_ACT_SAMPLE is not set
1356 1357
 CONFIG_NET_ACT_IPT=m
1357 1358
 CONFIG_NET_ACT_NAT=m
1358 1359
 CONFIG_NET_ACT_PEDIT=m
... ...
@@ -1378,11 +1462,12 @@ CONFIG_VSOCKETS=m
1378 1378
 CONFIG_VMWARE_VMCI_VSOCKETS=m
1379 1379
 CONFIG_VIRTIO_VSOCKETS=m
1380 1380
 CONFIG_VIRTIO_VSOCKETS_COMMON=m
1381
-CONFIG_HYPERV_SOCK=m
1381
+CONFIG_HYPERV_VSOCKETS=m
1382 1382
 CONFIG_NETLINK_DIAG=m
1383 1383
 CONFIG_MPLS=y
1384 1384
 CONFIG_NET_MPLS_GSO=m
1385 1385
 # CONFIG_MPLS_ROUTING is not set
1386
+# CONFIG_NET_NSH is not set
1386 1387
 # CONFIG_HSR is not set
1387 1388
 # CONFIG_NET_SWITCHDEV is not set
1388 1389
 CONFIG_NET_L3_MASTER_DEV=y
... ...
@@ -1390,7 +1475,6 @@ CONFIG_NET_L3_MASTER_DEV=y
1390 1390
 CONFIG_RPS=y
1391 1391
 CONFIG_RFS_ACCEL=y
1392 1392
 CONFIG_XPS=y
1393
-CONFIG_SOCK_CGROUP_DATA=y
1394 1393
 CONFIG_CGROUP_NET_PRIO=y
1395 1394
 CONFIG_CGROUP_NET_CLASSID=y
1396 1395
 CONFIG_NET_RX_BUSY_POLL=y
... ...
@@ -1406,7 +1490,6 @@ CONFIG_NET_FLOW_LIMIT=y
1406 1406
 CONFIG_NET_DROP_MONITOR=m
1407 1407
 # CONFIG_HAMRADIO is not set
1408 1408
 # CONFIG_CAN is not set
1409
-# CONFIG_IRDA is not set
1410 1409
 # CONFIG_BT is not set
1411 1410
 # CONFIG_AF_RXRPC is not set
1412 1411
 # CONFIG_AF_KCM is not set
... ...
@@ -1417,14 +1500,18 @@ CONFIG_FIB_RULES=y
1417 1417
 # CONFIG_RFKILL is not set
1418 1418
 CONFIG_NET_9P=m
1419 1419
 CONFIG_NET_9P_VIRTIO=m
1420
+CONFIG_NET_9P_XEN=m
1420 1421
 # CONFIG_NET_9P_DEBUG is not set
1421 1422
 # CONFIG_CAIF is not set
1422 1423
 CONFIG_CEPH_LIB=m
1423 1424
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
1424 1425
 # CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
1425 1426
 # CONFIG_NFC is not set
1427
+# CONFIG_PSAMPLE is not set
1428
+# CONFIG_NET_IFE is not set
1426 1429
 # CONFIG_LWTUNNEL is not set
1427 1430
 CONFIG_DST_CACHE=y
1431
+CONFIG_GRO_CELLS=y
1428 1432
 # CONFIG_NET_DEVLINK is not set
1429 1433
 CONFIG_MAY_USE_DEVLINK=y
1430 1434
 CONFIG_HAVE_EBPF_JIT=y
... ...
@@ -1450,13 +1537,14 @@ CONFIG_ALLOW_DEV_COREDUMP=y
1450 1450
 # CONFIG_DEBUG_DRIVER is not set
1451 1451
 # CONFIG_DEBUG_DEVRES is not set
1452 1452
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
1453
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
1453 1454
 CONFIG_SYS_HYPERVISOR=y
1454 1455
 # CONFIG_GENERIC_CPU_DEVICES is not set
1455 1456
 CONFIG_GENERIC_CPU_AUTOPROBE=y
1456 1457
 CONFIG_REGMAP=y
1457 1458
 CONFIG_REGMAP_I2C=y
1458 1459
 CONFIG_DMA_SHARED_BUFFER=y
1459
-# CONFIG_FENCE_TRACE is not set
1460
+# CONFIG_DMA_FENCE_TRACE is not set
1460 1461
 
1461 1462
 #
1462 1463
 # Bus devices
... ...
@@ -1477,7 +1565,6 @@ CONFIG_BLK_DEV=y
1477 1477
 # CONFIG_BLK_DEV_NULL_BLK is not set
1478 1478
 # CONFIG_BLK_DEV_FD is not set
1479 1479
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
1480
-# CONFIG_BLK_CPQ_CISS_DA is not set
1481 1480
 # CONFIG_BLK_DEV_DAC960 is not set
1482 1481
 # CONFIG_BLK_DEV_UMEM is not set
1483 1482
 # CONFIG_BLK_DEV_COW_COMMON is not set
... ...
@@ -1487,7 +1574,6 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
1487 1487
 # CONFIG_BLK_DEV_DRBD is not set
1488 1488
 # CONFIG_BLK_DEV_NBD is not set
1489 1489
 # CONFIG_BLK_DEV_SKD is not set
1490
-# CONFIG_BLK_DEV_OSD is not set
1491 1490
 # CONFIG_BLK_DEV_SX8 is not set
1492 1491
 CONFIG_BLK_DEV_RAM=y
1493 1492
 CONFIG_BLK_DEV_RAM_COUNT=16
... ...
@@ -1498,15 +1584,16 @@ CONFIG_BLK_DEV_RAM_DAX=y
1498 1498
 CONFIG_XEN_BLKDEV_FRONTEND=m
1499 1499
 # CONFIG_XEN_BLKDEV_BACKEND is not set
1500 1500
 CONFIG_VIRTIO_BLK=m
1501
-# CONFIG_BLK_DEV_HD is not set
1501
+# CONFIG_VIRTIO_BLK_SCSI is not set
1502 1502
 CONFIG_BLK_DEV_RBD=m
1503 1503
 # CONFIG_BLK_DEV_RSXX is not set
1504 1504
 CONFIG_NVME_CORE=y
1505 1505
 CONFIG_BLK_DEV_NVME=y
1506
-# CONFIG_BLK_DEV_NVME_SCSI is not set
1507 1506
 CONFIG_NVME_FABRICS=m
1507
+# CONFIG_NVME_FC is not set
1508 1508
 CONFIG_NVME_TARGET=m
1509 1509
 CONFIG_NVME_TARGET_LOOP=m
1510
+# CONFIG_NVME_TARGET_FC is not set
1510 1511
 
1511 1512
 #
1512 1513
 # Misc devices
... ...
@@ -1532,6 +1619,7 @@ CONFIG_NVME_TARGET_LOOP=m
1532 1532
 CONFIG_VMWARE_BALLOON=m
1533 1533
 # CONFIG_USB_SWITCH_FSA9480 is not set
1534 1534
 # CONFIG_SRAM is not set
1535
+# CONFIG_PCI_ENDPOINT_TEST is not set
1535 1536
 # CONFIG_C2PORT is not set
1536 1537
 
1537 1538
 #
... ...
@@ -1541,6 +1629,7 @@ CONFIG_VMWARE_BALLOON=m
1541 1541
 # CONFIG_EEPROM_LEGACY is not set
1542 1542
 # CONFIG_EEPROM_MAX6875 is not set
1543 1543
 CONFIG_EEPROM_93CX6=m
1544
+# CONFIG_EEPROM_IDT_89HPESX is not set
1544 1545
 # CONFIG_CB710_CORE is not set
1545 1546
 
1546 1547
 #
... ...
@@ -1595,6 +1684,7 @@ CONFIG_VMWARE_VMCI=m
1595 1595
 # CONFIG_ECHO is not set
1596 1596
 # CONFIG_CXL_BASE is not set
1597 1597
 # CONFIG_CXL_AFU_DRIVER_OPS is not set
1598
+# CONFIG_CXL_LIB is not set
1598 1599
 CONFIG_HAVE_IDE=y
1599 1600
 CONFIG_IDE=y
1600 1601
 
... ...
@@ -1905,7 +1995,7 @@ CONFIG_BLK_DEV_DM=m
1905 1905
 # CONFIG_DM_MQ_DEFAULT is not set
1906 1906
 # CONFIG_DM_DEBUG is not set
1907 1907
 CONFIG_DM_BUFIO=m
1908
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
1908
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
1909 1909
 CONFIG_DM_BIO_PRISON=m
1910 1910
 CONFIG_DM_PERSISTENT_DATA=m
1911 1911
 CONFIG_DM_CRYPT=m
... ...
@@ -1927,6 +2017,7 @@ CONFIG_DM_VERITY=m
1927 1927
 # CONFIG_DM_VERITY_FEC is not set
1928 1928
 # CONFIG_DM_SWITCH is not set
1929 1929
 # CONFIG_DM_LOG_WRITES is not set
1930
+# CONFIG_DM_INTEGRITY is not set
1930 1931
 # CONFIG_TARGET_CORE is not set
1931 1932
 CONFIG_FUSION=y
1932 1933
 CONFIG_FUSION_SPI=y
... ...
@@ -1954,6 +2045,7 @@ CONFIG_DUMMY=m
1954 1954
 CONFIG_MACVLAN=m
1955 1955
 CONFIG_MACVTAP=m
1956 1956
 CONFIG_IPVLAN=m
1957
+# CONFIG_IPVTAP is not set
1957 1958
 CONFIG_VXLAN=m
1958 1959
 CONFIG_GENEVE=m
1959 1960
 # CONFIG_GTP is not set
... ...
@@ -1963,11 +2055,13 @@ CONFIG_NETCONSOLE_DYNAMIC=y
1963 1963
 CONFIG_NETPOLL=y
1964 1964
 CONFIG_NET_POLL_CONTROLLER=y
1965 1965
 CONFIG_TUN=m
1966
+CONFIG_TAP=m
1966 1967
 # CONFIG_TUN_VNET_CROSS_LE is not set
1967 1968
 CONFIG_VETH=y
1968 1969
 CONFIG_VIRTIO_NET=y
1969 1970
 # CONFIG_NLMON is not set
1970 1971
 # CONFIG_NET_VRF is not set
1972
+CONFIG_VSOCKMON=m
1971 1973
 # CONFIG_ARCNET is not set
1972 1974
 
1973 1975
 #
... ...
@@ -1983,6 +2077,8 @@ CONFIG_MDIO=m
1983 1983
 # CONFIG_NET_VENDOR_ADAPTEC is not set
1984 1984
 CONFIG_NET_VENDOR_AGERE=y
1985 1985
 # CONFIG_ET131X is not set
1986
+CONFIG_NET_VENDOR_ALACRITECH=y
1987
+# CONFIG_SLICOSS is not set
1986 1988
 CONFIG_NET_VENDOR_ALTEON=y
1987 1989
 CONFIG_ACENIC=m
1988 1990
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
... ...
@@ -1991,6 +2087,9 @@ CONFIG_ACENIC=m
1991 1991
 CONFIG_NET_VENDOR_AMD=y
1992 1992
 CONFIG_AMD8111_ETH=m
1993 1993
 CONFIG_PCNET32=m
1994
+# CONFIG_AMD_XGBE is not set
1995
+# CONFIG_AMD_XGBE_HAVE_ECC is not set
1996
+# CONFIG_NET_VENDOR_AQUANTIA is not set
1994 1997
 # CONFIG_NET_VENDOR_ARC is not set
1995 1998
 CONFIG_NET_VENDOR_ATHEROS=y
1996 1999
 CONFIG_ATL2=m
... ...
@@ -2006,10 +2105,10 @@ CONFIG_B44=m
2006 2006
 CONFIG_B44_PCI_AUTOSELECT=y
2007 2007
 CONFIG_B44_PCICORE_AUTOSELECT=y
2008 2008
 CONFIG_B44_PCI=y
2009
-# CONFIG_BCMGENET is not set
2010 2009
 CONFIG_BNX2=m
2011 2010
 CONFIG_CNIC=m
2012 2011
 CONFIG_TIGON3=m
2012
+CONFIG_TIGON3_HWMON=y
2013 2013
 CONFIG_BNX2X=m
2014 2014
 CONFIG_BNX2X_SRIOV=y
2015 2015
 # CONFIG_BNXT is not set
... ...
@@ -2021,6 +2120,7 @@ CONFIG_NET_VENDOR_CAVIUM=y
2021 2021
 # CONFIG_THUNDER_NIC_BGX is not set
2022 2022
 # CONFIG_THUNDER_NIC_RGX is not set
2023 2023
 # CONFIG_LIQUIDIO is not set
2024
+# CONFIG_LIQUIDIO_VF is not set
2024 2025
 CONFIG_NET_VENDOR_CHELSIO=y
2025 2026
 CONFIG_CHELSIO_T1=m
2026 2027
 CONFIG_CHELSIO_T1_1G=y
... ...
@@ -2059,6 +2159,7 @@ CONFIG_VXGE=m
2059 2059
 # CONFIG_VXGE_DEBUG_TRACE_ALL is not set
2060 2060
 CONFIG_NET_VENDOR_HP=y
2061 2061
 CONFIG_HP100=m
2062
+# CONFIG_NET_VENDOR_HUAWEI is not set
2062 2063
 CONFIG_NET_VENDOR_INTEL=y
2063 2064
 CONFIG_E100=m
2064 2065
 CONFIG_E1000=y
... ...
@@ -2076,14 +2177,12 @@ CONFIG_IXGBE_DCB=y
2076 2076
 CONFIG_IXGBEVF=m
2077 2077
 CONFIG_I40E=m
2078 2078
 CONFIG_I40E_DCB=y
2079
-# CONFIG_I40E_FCOE is not set
2080 2079
 CONFIG_I40EVF=m
2081 2080
 CONFIG_FM10K=m
2082 2081
 CONFIG_NET_VENDOR_I825XX=y
2083 2082
 CONFIG_JME=m
2084 2083
 CONFIG_NET_VENDOR_MARVELL=y
2085 2084
 # CONFIG_MVMDIO is not set
2086
-# CONFIG_MVNETA_BM is not set
2087 2085
 CONFIG_SKGE=m
2088 2086
 # CONFIG_SKGE_DEBUG is not set
2089 2087
 # CONFIG_SKGE_GENESIS is not set
... ...
@@ -2096,6 +2195,7 @@ CONFIG_MLX4_CORE=m
2096 2096
 CONFIG_MLX4_DEBUG=y
2097 2097
 # CONFIG_MLX5_CORE is not set
2098 2098
 # CONFIG_MLXSW_CORE is not set