[gentoo-commits] proj/grs:desktop-amd64-musl-hardened commit in: core/var/lib/portage/, /, scripts/, core/etc/grs/

[Anthony G. Basile]

commit:     543dae1fa6a71cc461f10a6b90624af042cceb3d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 22:53:04 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 22:53:04 2017 +0000
URL:        https://gitweb.gentoo.org/proj/grs.git/commit/?id=543dae1f

Drop to just cycle 3

 build                              |   12 +-
 core/etc/grs/world.conf            |  693 +++++++++--------
 core/var/lib/portage/world.CYCLE.2 |    3 +-
 core/var/lib/portage/world.CYCLE.3 |    3 +-
 scripts/kernel-config              | 1507 +++++++++++++++++++++++++-----------
 5 files changed, 1422 insertions(+), 796 deletions(-)

diff --git a/build b/build
index 3303986..5ca3387 100644
--- a/build
+++ b/build
@@ -38,15 +38,5 @@ log stamp
 tarit
 hashit
 
-+log stamp
-+log Extras
-+log stamp
-+
-+mount
-+populate 4
-+runscript cycle.3.sh
-+unmount
-+kernel
-+
-+log stamp
+log stamp
 +log END

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 4ec7bb7..6f51c0c 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -95,7 +95,7 @@ package.use : app-admin/supervisor:0 -doc -test
 package.use : app-admin/syslog-ng:0 -amqp -json -libressl -mongodb -pacct -python -redis -smtp -spoof-source -systemd caps dbi geoip ipv6 tcpd
 
 [app-admin/sysstat:0]
-package.use : app-admin/sysstat:0 -debug -isag -lm_sensors -nls -selinux -static
+package.use : app-admin/sysstat:0 -debug -isag -lm_sensors -nls -selinux -static doc
 
 [app-admin/testdisk:0]
 package.use : app-admin/testdisk:0 -ewf -ntfs -reiserfs -static jpeg qt4
@@ -127,12 +127,12 @@ package.use : app-antivirus/clamav:0 -clamdtop -libressl -metadata-analysis-api
 [app-arch/bzip2:0]
 package.use : app-arch/bzip2:0 -static static-libs
 
-[app-arch/cfv:0]
-package.use : app-arch/cfv:0 -bittorrent
-
 [app-arch/cpio:0]
 package.use : app-arch/cpio:0 -nls
 
+[app-arch/dpkg:0]
+package.use : app-arch/dpkg:0 -nls -selinux -test bzip2 lzma unicode update-alternatives zlib
+
 [app-arch/file-roller:0]
 package.use : app-arch/file-roller:0 -nautilus -packagekit
 
@@ -146,7 +146,7 @@ package.use : app-arch/gtk-splitter:0 crypt
 package.use : app-arch/gzip:0 -static pic
 
 [app-arch/libarchive:0]
-package.use : app-arch/libarchive:0 -expat -libressl -lz4 -nettle acl bzip2 e2fsprogs iconv lzma lzo static-libs xattr zlib
+package.use : app-arch/libarchive:0 -expat -libressl -nettle acl bzip2 e2fsprogs iconv lzma lzo static-libs xattr zlib
 
 [app-arch/p7zip:0]
 package.use : app-arch/p7zip:0 -doc -kde -pch -rar -static -wxwidgets
@@ -154,9 +154,6 @@ package.use : app-arch/p7zip:0 -doc -kde -pch -rar -static -wxwidgets
 [app-arch/sharutils:0]
 package.use : app-arch/sharutils:0 -nls
 
-[app-arch/snappy:0]
-package.use : app-arch/snappy:0 -static-libs
-
 [app-arch/star:0]
 package.use : app-arch/star:0 acl xattr
 
@@ -185,7 +182,7 @@ package.use : app-backup/backintime:0 -qt4
 package.use : app-backup/backup-manager:0 -doc
 
 [app-backup/bacula:0]
-package.use : app-backup/bacula:0 -bacula-clientonly -bacula-nodir -bacula-nosd -examples -libressl -logwatch -mysql -postgres -static X acl ipv6 qt4 readline sqlite ssl tcpd vim-syntax
+package.use : app-backup/bacula:0 -bacula-clientonly -bacula-nodir -bacula-nosd -examples -logwatch -mysql -postgres -static X acl ipv6 qt4 readline sqlite ssl tcpd vim-syntax
 
 [app-backup/boxbackup:0]
 package.use : app-backup/boxbackup:0 -client-only -libressl
@@ -243,7 +240,7 @@ package.use : app-benchmarks/sysbench:0 -aio -mysql
 package.use : app-cdr/cdrtools:0 -acl -caps -nls filecaps unicode
 
 [app-cdr/dvdisaster:0]
-package.use : app-cdr/dvdisaster:0 -debug -l10n_cs -l10n_de -l10n_it -l10n_pt-BR -l10n_ru -l10n_sv -nls
+package.use : app-cdr/dvdisaster:0 -debug -nls
 
 [app-cdr/gaffitter:0]
 package.use : app-cdr/gaffitter:0 -scripts
@@ -262,6 +259,7 @@ package.use : app-crypt/gcr:0 -debug -test gtk introspection vala
 
 [app-crypt/gnupg:0]
 package.use : app-crypt/gnupg:0 -doc -nls -selinux -tofu -tools -usb bzip2 gnutls ldap readline smartcard
+package.accept_keywords : =app-crypt/gnupg-2.1.12 ~amd64
 
 [app-crypt/gpa:0]
 package.use : app-crypt/gpa:0 -nls
@@ -272,7 +270,7 @@ package.env : app-crypt/gpgme:1 app-crypt_gpgme_1
 env : LDFLAGS=-largp
 
 [app-crypt/keynote:0]
-package.use : app-crypt/keynote:0 -libressl ssl
+package.use : app-crypt/keynote:0 ssl
 
 [app-crypt/libsecret:0]
 package.use : app-crypt/libsecret:0 -debug -test crypt introspection vala
@@ -295,12 +293,6 @@ package.use : app-crypt/pinentry:0 -clipboard -emacs -static caps gnome-keyring
 [app-crypt/rainbowcrack:0]
 package.accept_keywords : =app-crypt/rainbowcrack-1.6.1 ~amd64
 
-[app-crypt/sbsigntool:0]
-package.use : app-crypt/sbsigntool:0 -libressl
-
-[app-crypt/sign:0]
-package.use : app-crypt/sign:0 -libressl
-
 [app-crypt/ssh-multiadd:0]
 package.use : app-crypt/ssh-multiadd:0 X
 
@@ -316,8 +308,8 @@ package.use : app-dicts/mecab-ipadic:0 unicode
 [app-dicts/migemo-dict:0]
 package.use : app-dicts/migemo-dict:0 unicode
 
-[app-dicts/prime-dict:0]
-package.use : app-dicts/prime-dict:0
+[app-dicts/myspell-pt:0]
+package.use : app-dicts/myspell-pt:0 preao
 
 [app-dicts/stardict-freedict-eng-deu:0]
 package.use : app-dicts/stardict-freedict-eng-deu:0 -gzip
@@ -358,9 +350,6 @@ package.use : app-dicts/ydpdict:0 -ao
 [app-doc/autobook:0]
 package.use : app-doc/autobook:0 -examples
 
-[app-doc/gimp-help:2]
-package.use : app-doc/gimp-help:2 -l10n_de -l10n_en -l10n_es -l10n_fr -l10n_it -l10n_ja -l10n_ko -l10n_nl -l10n_nn -l10n_pl -l10n_ru -l10n_sv -l10n_zh-CN
-
 [app-doc/gnucash-docs:0]
 package.use : app-doc/gnucash-docs:0 -test
 
@@ -370,9 +359,6 @@ package.use : app-doc/linkers-and-loaders:0 -doc
 [app-doc/linuxfromscratch:0]
 package.use : app-doc/linuxfromscratch:0 -htmlsingle pdf
 
-[app-doc/php-docs:0]
-package.use : app-doc/php-docs:0 -l10n_de -l10n_es -l10n_fa -l10n_fr -l10n_ja -l10n_pl -l10n_pt-BR -l10n_ro -l10n_tr l10n_en
-
 [app-doc/tldp-howto:0]
 package.use : app-doc/tldp-howto:0 -htmlsingle -text html pdf
 
@@ -397,6 +383,9 @@ package.use : app-editors/gedit-plugins:0 -charmap -terminal -vala -zeitgeist gi
 [app-editors/gedit:0]
 package.use : app-editors/gedit:0 -test introspection python spell vala
 
+[app-editors/gobby:0]
+package.use : app-editors/gobby:0 -gnome -zeroconf
+
 [app-editors/gvim:0]
 package.use : app-editors/gvim:0 -aqua -debug -gnome -luajit -motif -neXt -netbeans -nls -racket -selinux acl cscope gtk lua perl python ruby session tcl
 
@@ -419,7 +408,7 @@ package.use : app-editors/mousepad:0 -debug -gtk3 dbus
 package.use : app-editors/nano:0 -debug -justify -minimal -nls -static magic ncurses slang spell unicode
 
 [app-editors/qxmledit:0]
-package.use : app-editors/qxmledit:0 -qt5
+package.use : app-editors/qxmledit:0 -debug
 
 [app-editors/retext:0]
 package.use : app-editors/retext:0 spell
@@ -442,27 +431,18 @@ package.use : app-editors/xvile:0 perl
 [app-editors/zoinks:0]
 package.use : app-editors/zoinks:0 -nls
 
-[app-emacs/cmail:0]
-package.use : app-emacs/cmail:0 -l10n_ja
-
 [app-emacs/ecb:0]
 package.use : app-emacs/ecb:0 -java
 
 [app-emacs/emacs-common-gentoo:0]
 package.use : app-emacs/emacs-common-gentoo:0 -games X
 
-[app-emacs/emacs-wget:0]
-package.use : app-emacs/emacs-wget:0 -l10n_ja
-
 [app-emacs/gnuplot-mode:0]
 package.use : app-emacs/gnuplot-mode:0 -doc
 
 [app-emacs/gnuserv:0]
 package.use : app-emacs/gnuserv:0 X
 
-[app-emacs/lyskom-elisp-client:0]
-package.use : app-emacs/lyskom-elisp-client:0 -l10n_sv
-
 [app-emacs/magit:0]
 package.use : app-emacs/magit:0 -contrib
 
@@ -475,14 +455,8 @@ package.use : app-emacs/muse:0 -test
 [app-emacs/org-mode:0]
 package.use : app-emacs/org-mode:0 -contrib -doc -odt-schema
 
-[app-emacs/riece:0]
-package.use : app-emacs/riece:0 -l10n_ja
-
-[app-emacs/semi:0]
-package.use : app-emacs/semi:0 -l10n_ja
-
 [app-emacs/wanderlust:0]
-package.use : app-emacs/wanderlust:0 -bbdb -l10n_ja ssl
+package.use : app-emacs/wanderlust:0 -bbdb ssl
 
 [app-emacs/wikipedia-mode:0]
 package.use : app-emacs/wikipedia-mode:0 -outline-magic
@@ -560,10 +534,10 @@ package.use : app-i18n/libhangul:0 -nls -test static-libs
 package.use : app-i18n/libtabe:0 -debug
 
 [app-i18n/libtomoe-gtk:0]
-package.use : app-i18n/libtomoe-gtk:0 python static-libs
+package.use : app-i18n/libtomoe-gtk:0 -doc gucharmap python static-libs
 
 [app-i18n/nkf:0]
-package.use : app-i18n/nkf:0 -l10n_ja perl python
+package.use : app-i18n/nkf:0 perl python
 
 [app-i18n/poedit:0]
 package.use : app-i18n/poedit:0 spell
@@ -581,7 +555,7 @@ package.use : app-i18n/scim:0 -doc gtk3
 package.use : app-i18n/tomoe:0 -doc -hyperestraier -mysql python ruby static-libs subversion
 
 [app-i18n/uim:0]
-package.use : app-i18n/uim:0 -canna -eb -emacs -expat -kde -l10n_ja -l10n_ko -l10n_zh-CN -l10n_zh-TW -libedit -m17n-lib -nls -skk -test -xft X anthy curl gtk gtk3 libffi libnotify ncurses qt4 sqlite ssl static-libs unicode
+package.use : app-i18n/uim:0 -canna -eb -emacs -expat -kde -libedit -m17n-lib -nls -skk -test -xft X anthy curl gtk gtk3 libffi libnotify ncurses qt4 sqlite ssl static-libs unicode
 
 [app-i18n/xvnkb:0]
 package.use : app-i18n/xvnkb:0 -xft spell
@@ -625,9 +599,6 @@ package.use : app-leechcraft/lc-summary:0 -debug
 [app-misc/anki:0]
 package.use : app-misc/anki:0 latex recording sound
 
-[app-misc/asciinema:0]
-package.use : app-misc/asciinema:0 -test
-
 [app-misc/astrolog:0]
 package.use : app-misc/astrolog:0 X
 
@@ -695,7 +666,7 @@ package.use : app-misc/ignuit:0 -examples
 package.use : app-misc/joy2key:0 X
 
 [app-misc/jq:0]
-package.use : app-misc/jq:0 -oniguruma -static-libs -test
+package.use : app-misc/jq:0 -test
 
 [app-misc/klavaro:0]
 package.use : app-misc/klavaro:0 static-libs
@@ -713,7 +684,7 @@ package.use : app-misc/note:0 -dbm -general -mysql -text crypt
 package.use : app-misc/pal:0 -nls
 
 [app-misc/pax-utils:0]
-package.use : app-misc/pax-utils:0 -debug caps python seccomp
+package.use : app-misc/pax-utils:0 caps python
 
 [app-misc/pwsafe:0]
 package.use : app-misc/pwsafe:0 X readline
@@ -743,7 +714,7 @@ package.use : app-misc/socnetv:0 -doc
 package.use : app-misc/solaar:0 -doc
 
 [app-misc/sphinx:0]
-package.use : app-misc/sphinx:0 -debug -id64 -mysql -postgres -re2 -stemmer odbc syslog xml
+package.use : app-misc/sphinx:0 -debug -id64 -mysql -postgres -stemmer -test odbc syslog xml
 
 [app-misc/srm:0]
 package.use : app-misc/srm:0 -debug
@@ -788,7 +759,7 @@ package.use : app-misc/worker:0 -avfs -debug -examples -xft dbus libnotify magic
 package.use : app-misc/workrave:0 -ayatana -doc -gnome -gstreamer -introspection -mate -nls -pulseaudio -test -xfce
 
 [app-mobilephone/gammu:0]
-package.use : app-mobilephone/gammu:0 -debug -irda -mysql -nls -postgres -usb bluetooth curl dbi python
+package.use : app-mobilephone/gammu:0 -debug -irda -mysql -nls -postgres -usb bash-completion bluetooth curl dbi python
 
 [app-mobilephone/gnokii:0]
 package.use : app-mobilephone/gnokii:0 -debug -ical -irda -mysql -nls -postgres -sms -usb X bluetooth pcsc-lite
@@ -799,6 +770,9 @@ package.use : app-mobilephone/gnome-phone-manager:0 -debug
 [app-mobilephone/lightblue:0]
 package.use : app-mobilephone/lightblue:0 -examples
 
+[app-mobilephone/obexftp:0]
+package.use : app-mobilephone/obexftp:0 -debug -ruby bluetooth perl python tcl
+
 [app-mobilephone/wammu:0]
 package.use : app-mobilephone/wammu:0 -gnome bluetooth
 
@@ -824,7 +798,7 @@ package.use : app-office/homebank:0 ofx
 package.use : app-office/ical:0 -test
 
 [app-office/ledger:0]
-package.use : app-office/ledger:0 -doc -emacs -python
+package.use : app-office/ledger:0 -debug -emacs -gnuplot -ofx static-libs vim-syntax xml
 
 [app-office/orage:0]
 package.use : app-office/orage:0 -debug -xfce_plugins_clock berkdb dbus libnotify
@@ -850,6 +824,9 @@ package.use : app-office/texmaker:0 -qt5 qt4
 [app-office/texstudio:0]
 package.use : app-office/texstudio:0 -qt5 -video qt4
 
+[app-pda/coldsync:0]
+package.use : app-pda/coldsync:0 -nls perl
+
 [app-pda/gnupod:0]
 package.use : app-pda/gnupod:0 aac ffmpeg flac mp3 ogg
 
@@ -910,6 +887,9 @@ package.use : app-shells/mksh:0 -static
 [app-shells/pdsh:0]
 package.use : app-shells/pdsh:0 -rsh crypt readline
 
+[app-shells/psh:0]
+package.use : app-shells/psh:0 readline
+
 [app-shells/rrs:0]
 package.use : app-shells/rrs:0 ssl
 
@@ -929,13 +909,13 @@ package.use : app-shells/zsh:0 -debug -doc -examples -maildir -static caps gdbm
 package.use : app-text/aiksaurus:0 gtk
 
 [app-text/apvlv:0]
-package.use : app-text/apvlv:0 -debug -djvu
+package.use : app-text/apvlv:0 -debug -djvu -html
 
 [app-text/asciidoc:0]
 package.use : app-text/asciidoc:0 -examples -graphviz -highlight -test
 
 [app-text/aspell:0]
-package.use : app-text/aspell:0 -l10n_af -l10n_be -l10n_bg -l10n_br -l10n_ca -l10n_cs -l10n_cy -l10n_da -l10n_de -l10n_de-1901 -l10n_el -l10n_en -l10n_eo -l10n_es -l10n_et -l10n_fi -l10n_fo -l10n_fr -l10n_ga -l10n_gl -l10n_he -l10n_hr -l10n_is -l10n_it -l10n_la -l10n_lt -l10n_nl -l10n_no -l10n_pl -l10n_pt -l10n_pt-BR -l10n_ro -l10n_ru -l10n_sk -l10n_sl -l10n_sr -l10n_sv -l10n_uk -l10n_vi -nls
+package.use : app-text/aspell:0 -nls
 
 [app-text/bibletime:0]
 package.use : app-text/bibletime:0 -debug
@@ -977,16 +957,16 @@ package.use : app-text/dvipsk:0 -doc -source
 package.use : app-text/enchant:0 -aspell -zemberek hunspell static-libs
 
 [app-text/evince:0]
-package.use : app-text/evince:0 -djvu -dvi -gnome -gnome-keyring -gstreamer -nautilus -nsplugin -t1lib -xps introspection postscript tiff
+package.use : app-text/evince:0 -debug -djvu -dvi -gnome -gnome-keyring -gstreamer -nautilus -nsplugin -t1lib -xps introspection postscript tiff
 
 [app-text/ghostscript-gpl:0]
-package.use : app-text/ghostscript-gpl:0 -djvu -l10n_de -l10n_ja -l10n_ko -l10n_zh-CN -l10n_zh-TW -tiff X cups dbus gtk idn static-libs
+package.use : app-text/ghostscript-gpl:0 -djvu -tiff X cups dbus gtk idn static-libs
 
 [app-text/glark:0]
 package.use : app-text/glark:0 -doc -test -zip
 
 [app-text/gspell:0]
-package.use : app-text/gspell:0 -test -vala introspection
+package.use : app-text/gspell:0 -vala introspection
 
 [app-text/gtkspell:3]
 package.use : app-text/gtkspell:3 introspection vala
@@ -1001,7 +981,7 @@ package.use : app-text/htmldoc:0 -fltk ssl
 package.use : app-text/htmltidy:0 -debug -doc static-libs
 
 [app-text/hunspell:0]
-package.use : app-text/hunspell:0 -l10n_af -l10n_bg -l10n_ca -l10n_cs -l10n_cy -l10n_da -l10n_de -l10n_de-1901 -l10n_el -l10n_en -l10n_eo -l10n_es -l10n_et -l10n_fo -l10n_fr -l10n_ga -l10n_gl -l10n_he -l10n_hr -l10n_hu -l10n_ia -l10n_id -l10n_is -l10n_it -l10n_km -l10n_ku -l10n_lt -l10n_lv -l10n_mk -l10n_ms -l10n_nb -l10n_nl -l10n_nn -l10n_pl -l10n_pt -l10n_pt-BR -l10n_ro -l10n_ru -l10n_sk -l10n_sl -l10n_sq -l10n_sv -l10n_sw -l10n_tn -l10n_uk -l10n_zu -nls ncurses readline static-libs
+package.use : app-text/hunspell:0 -nls ncurses readline static-libs
 
 [app-text/info2html:2.0]
 package.use : app-text/info2html:2.0 -vhosts
@@ -1024,6 +1004,9 @@ package.use : app-text/libwpd:0.9 -doc -test tools
 [app-text/libwpg:0.2]
 package.use : app-text/libwpg:0.2 -doc static-libs
 
+[app-text/lodgeit:0]
+package.use : app-text/lodgeit:0 -vim
+
 [app-text/mathtex:0]
 package.use : app-text/mathtex:0 png
 
@@ -1037,7 +1020,7 @@ package.use : app-text/mftrace:1 -test -truetype
 package.use : app-text/multitail:0 -debug -examples unicode
 
 [app-text/namazu:0]
-package.use : app-text/namazu:0 -emacs -l10n_ja -nls tk
+package.use : app-text/namazu:0 -emacs -nls tk
 
 [app-text/openjade:0]
 package.use : app-text/openjade:0 static-libs
@@ -1049,7 +1032,7 @@ package.use : app-text/opensp:0 -doc -nls -test static-libs
 package.use : app-text/pastebinit:0 crypt
 
 [app-text/pdfgrep:0]
-package.use : app-text/pdfgrep:0 -test -unac pcre
+package.use : app-text/pdfgrep:0 -unac
 
 [app-text/pdfminer:0]
 package.use : app-text/pdfminer:0 -doc -examples
@@ -1073,7 +1056,7 @@ package.use : app-text/pylize:0 -doc
 package.use : app-text/qpdf:0 -doc -examples -test static-libs
 
 [app-text/qpdfview:0]
-package.use : app-text/qpdfview:0 -djvu -fitz -qt5 -synctex cups dbus pdf postscript sqlite svg
+package.use : app-text/qpdfview:0 -djvu -fitz -qt5 -synctex cups dbus pdf postscript qt4 sqlite svg
 
 [app-text/rarian:0]
 package.use : app-text/rarian:0 static-libs
@@ -1100,7 +1083,7 @@ package.use : app-text/stardict:0 -espeak -pronounce -qqwry -tools spell
 package.use : app-text/sword:0 -debug -doc curl icu static-libs
 
 [app-text/tesseract:0]
-package.use : app-text/tesseract:0 -doc -examples -l10n_ar -l10n_bg -l10n_ca -l10n_chr -l10n_cs -l10n_da -l10n_de -l10n_el -l10n_es -l10n_fi -l10n_fr -l10n_he -l10n_hi -l10n_hu -l10n_id -l10n_it -l10n_ja -l10n_ko -l10n_lt -l10n_lv -l10n_nl -l10n_no -l10n_pl -l10n_pt -l10n_ro -l10n_ru -l10n_sk -l10n_sl -l10n_sr -l10n_sv -l10n_th -l10n_tl -l10n_tr -l10n_uk -l10n_vi -l10n_zh-CN -l10n_zh-TW -opencl -osd -training jpeg png scrollview static-libs tiff webp
+package.use : app-text/tesseract:0 -doc -examples -opencl -osd -training jpeg png scrollview static-libs tiff webp
 
 [app-text/texi2html:0]
 package.use : app-text/texi2html:0 unicode
@@ -1109,7 +1092,7 @@ package.use : app-text/texi2html:0 unicode
 package.use : app-text/texlive-core:0 -doc -source X cjk tk xetex
 
 [app-text/texlive:0]
-package.use : app-text/texlive:0 -cjk -context -detex -dvi2tty -epspdf -extra -games -graphics -humanities -jadetex -l10n_af -l10n_ar -l10n_as -l10n_bg -l10n_bn -l10n_br -l10n_ca -l10n_cs -l10n_cy -l10n_da -l10n_de -l10n_el -l10n_en -l10n_en-GB -l10n_eo -l10n_es -l10n_et -l10n_eu -l10n_fa -l10n_fi -l10n_fr -l10n_ga -l10n_gl -l10n_gu -l10n_he -l10n_hi -l10n_hr -l10n_hsb -l10n_hu -l10n_hy -l10n_ia -l10n_id -l10n_is -l10n_it -l10n_ja -l10n_kn -l10n_ko -l10n_la -l10n_lo -l10n_lt -l10n_lv -l10n_ml -l10n_mn -l10n_mr -l10n_nb -l10n_nl -l10n_nn -l10n_no -l10n_or -l10n_pa -l10n_pl -l10n_pt -l10n_rm -l10n_ro -l10n_ru -l10n_sa -l10n_sco -l10n_sk -l10n_sl -l10n_sq -l10n_sr -l10n_sv -l10n_ta -l10n_te -l10n_th -l10n_tk -l10n_tr -l10n_uk -l10n_vi -l10n_zh -luatex -metapost -music -omega -pdfannotextractor -pstricks -publishers -science -tex4ht -texi2html -truetype -xetex -xindy X png xml
+package.use : app-text/texlive:0 -cjk -context -detex -dvi2tty -epspdf -extra -games -graphics -humanities -jadetex -luatex -metapost -music -omega -pdfannotextractor -pstricks -publishers -science -tex4ht -texi2html -truetype -xetex -xindy X png xml
 
 [app-text/wdiff:0]
 package.use : app-text/wdiff:0 -experimental -test
@@ -1138,9 +1121,6 @@ package.use : app-text/zathura-meta:0 -cb -djvu pdf postscript
 [app-text/zathura:0]
 package.use : app-text/zathura:0 -test magic sqlite
 
-[app-vim/cream:0]
-package.use : app-vim/cream:0 -l10n_de -l10n_en -l10n_es -l10n_fr
-
 [app-vim/gentoo-syntax:0]
 package.use : app-vim/gentoo-syntax:0 -ignore-glep31
 
@@ -1195,11 +1175,14 @@ package.use : dev-cpp/muParser:0 -doc -test
 [dev-cpp/pangomm:1.4]
 package.use : dev-cpp/pangomm:1.4 -doc
 
+[dev-cpp/tbb:0]
+package.use : dev-cpp/tbb:0 -debug -doc -examples
+
 [dev-cpp/tree:0]
 package.use : dev-cpp/tree:0 -doc
 
 [dev-db/couchdb:0]
-package.use : dev-db/couchdb:0 -libressl -selinux -test
+package.use : dev-db/couchdb:0 -selinux -test
 
 [dev-db/dbmodel:0]
 package.use : dev-db/dbmodel:0 -debug
@@ -1220,7 +1203,7 @@ package.use : dev-db/libzdb:0 -debug -doc -mysql -postgres sqlite ssl static-lib
 package.use : dev-db/maatkit:0 -udf
 
 [dev-db/mariadb:0]
-package.use : dev-db/mariadb:0 -debug -embedded -extraengine -jdbc -jemalloc -latin1 -libressl -oqgraph -pam -profiling -selinux -sphinx -static -systemtap -tcmalloc -test -tokudb -yassl bindist odbc openssl perl server static-libs xml
+package.use : dev-db/mariadb:0 -debug -embedded -extraengine -jemalloc -latin1 -libressl -oqgraph -pam -profiling -selinux -sphinx -static -systemtap -tcmalloc -test -tokudb -yassl bindist odbc openssl perl server static-libs xml
 
 [dev-db/mysql-super-smack:0]
 package.use : dev-db/mysql-super-smack:0 -postgres mysql
@@ -1267,9 +1250,6 @@ package.use : dev-embedded/gnusim8085:0 -examples -nls
 [dev-embedded/gpsim:0]
 package.use : dev-embedded/gpsim:0 -doc gtk static-libs
 
-[dev-embedded/libftdi:0]
-package.use : dev-embedded/libftdi:0 -doc -examples -python -static-libs cxx
-
 [dev-embedded/tigcc:0]
 package.use : dev-embedded/tigcc:0 -doc
 
@@ -1280,7 +1260,7 @@ package.use : dev-embedded/urjtag:0 -ftdi readline
 package.use : dev-games/KXL:0 static-libs
 
 [dev-games/aseprite:0]
-package.use : dev-games/aseprite:0 -debug -gtk3 -kde -test -webp
+package.use : dev-games/aseprite:0 -debug -memleak -static -test
 
 [dev-games/clanlib:0.8]
 package.use : dev-games/clanlib:0.8 -doc -mikmod ipv6 opengl sdl static-libs vorbis
@@ -1307,7 +1287,7 @@ package.use : dev-java/java-config:2 -test
 package.use : dev-lang/bff:0 -test
 
 [dev-lang/erlang:0]
-package.use : dev-lang/erlang:0 -compat-ethread -doc -emacs -halfword -hipe -java -kpoll -libressl -sctp -systemd -wxwidgets odbc smp ssl tk
+package.use : dev-lang/erlang:0 -compat-ethread -doc -emacs -halfword -hipe -java -kpoll -sctp -systemd -wxwidgets odbc smp ssl tk
 
 [dev-lang/go:0]
 package.use : dev-lang/go:0 -gccgo
@@ -1363,8 +1343,8 @@ package.use : dev-lang/tcl:0 -debug threads
 [dev-lang/tk:0]
 package.use : dev-lang/tk:0 -aqua -debug -test -truetype threads xscreensaver
 
-[dev-lang/vala:0.32]
-package.use : dev-lang/vala:0.32 -test
+[dev-lang/vala:0.30]
+package.use : dev-lang/vala:0.30 -test
 
 [dev-lang/xsb:0]
 package.use : dev-lang/xsb:0 -debug -examples -java -mysql curl iodbc odbc pcre threads xml
@@ -1382,7 +1362,7 @@ package.use : dev-libs/DirectFB:0 -X -debug -doc -gif -input_devices_dynapro -in
 package.use : dev-libs/ace:0 -ciao -tao X ipv6
 
 [dev-libs/appstream-glib:0]
-package.use : dev-libs/appstream-glib:0 -nls -stemmer introspection
+package.use : dev-libs/appstream-glib:0 -nls introspection
 
 [dev-libs/apr-util:1]
 package.use : dev-libs/apr-util:1 -doc -freetds -mysql -nss -openssl -postgres berkdb gdbm ldap odbc sqlite static-libs
@@ -1463,19 +1443,25 @@ package.use : dev-libs/girara:3 libnotify static-libs
 package.use : dev-libs/glib:2 -debug -fam -selinux -systemtap -test dbus mime static-libs utils xattr
 
 [dev-libs/gmime:2.6]
-package.use : dev-libs/gmime:2.6 -doc -mono -smime static-libs vala
+package.use : dev-libs/gmime:2.6 -doc -mono static-libs vala
 
 [dev-libs/gmp:0]
-package.use : dev-libs/gmp:0 -doc -pgo asm cxx static-libs
+package.use : dev-libs/gmp:0 -doc -pgo cxx static-libs
 
 [dev-libs/gobject-introspection:0]
 package.use : dev-libs/gobject-introspection:0 -doctool -test cairo
 
+[dev-libs/guiloader-c++:0]
+package.use : dev-libs/guiloader-c++:0 -nls
+
+[dev-libs/guiloader:0]
+package.use : dev-libs/guiloader:0 -nls
+
 [dev-libs/hashit:0]
 package.use : dev-libs/hashit:0 -debug
 
 [dev-libs/hiredis:0]
-package.use : dev-libs/hiredis:0 -examples -test static-libs
+package.use : dev-libs/hiredis:0 static-libs
 
 [dev-libs/hyphen:0]
 package.use : dev-libs/hyphen:0 -static-libs
@@ -1492,9 +1478,6 @@ package.use : dev-libs/json-c:0 -doc static-libs
 [dev-libs/json-glib:0]
 package.use : dev-libs/json-glib:0 -debug introspection
 
-[dev-libs/jsoncpp:0]
-package.use : dev-libs/jsoncpp:0 -doc -test
-
 [dev-libs/jthread:0]
 package.use : dev-libs/jthread:0 static-libs
 
@@ -1510,9 +1493,6 @@ package.use : dev-libs/klibc:0 -debug
 [dev-libs/kpathsea:0]
 package.use : dev-libs/kpathsea:0 -doc -source static-libs
 
-[dev-libs/leveldb:0]
-package.use : dev-libs/leveldb:0 -static-libs snappy tcmalloc
-
 [dev-libs/libRocket:0]
 package.use : dev-libs/libRocket:0 -samples python
 
@@ -1521,6 +1501,10 @@ package.use : dev-libs/libaio:0 -test static-libs
 
 [dev-libs/libassuan:0]
 package.use : dev-libs/libassuan:0 static-libs
+package.accept_keywords : =dev-libs/libassuan-2.4.2 ~amd64
+
+[dev-libs/libax25:0]
+package.use : dev-libs/libax25:0 static-libs
 
 [dev-libs/libbrahe:0]
 package.use : dev-libs/libbrahe:0 static-libs
@@ -1538,7 +1522,7 @@ package.use : dev-libs/libcdio-paranoia:0 -test cxx static-libs
 package.use : dev-libs/libcdio:0 -minimal -test cddb cxx static-libs
 
 [dev-libs/libcgroup:0]
-package.use : dev-libs/libcgroup:0 -pam daemon static-libs tools
+package.use : dev-libs/libcgroup:0 -debug -pam daemon static-libs tools
 
 [dev-libs/libconfig:0]
 package.use : dev-libs/libconfig:0 -examples cxx static-libs
@@ -1583,10 +1567,10 @@ package.use : dev-libs/libg15render:0 -truetype
 package.use : dev-libs/libgamin:0 -debug python static-libs
 
 [dev-libs/libgcrypt:0]
-package.use : dev-libs/libgcrypt:0 -doc static-libs
+package.use : dev-libs/libgcrypt:0 -doc static-libs threads
 
 [dev-libs/libgdata:0]
-package.use : dev-libs/libgdata:0 -gnome-online-accounts -test crypt introspection static-libs vala
+package.use : dev-libs/libgdata:0 -debug -gnome-online-accounts -test crypt introspection static-libs vala
 
 [dev-libs/libgee:0]
 package.use : dev-libs/libgee:0 introspection
@@ -1602,9 +1586,10 @@ package.use : dev-libs/libgit2:0 -examples -gssapi -libressl -test -trace ssh th
 
 [dev-libs/libgpg-error:0]
 package.use : dev-libs/libgpg-error:0 -common-lisp -nls static-libs
+package.accept_keywords : =dev-libs/libgpg-error-1.22 ~amd64
 
 [dev-libs/libgudev:0]
-package.use : dev-libs/libgudev:0 -introspection static-libs
+package.use : dev-libs/libgudev:0 -debug -introspection static-libs
 
 [dev-libs/libgweather:2]
 package.use : dev-libs/libgweather:2 -glade introspection vala
@@ -1635,7 +1620,7 @@ package.use : dev-libs/libmail:0 -apop -debug -profile gnutls sasl static-libs
 
 [dev-libs/libmateweather:0]
 package.use : dev-libs/libmateweather:0 -debug python
-package.accept_keywords : =dev-libs/libmateweather-1.10.0 ??
+package.accept_keywords : =dev-libs/libmateweather-1.10.0 ~amd64
 
 [dev-libs/libmba:0]
 package.use : dev-libs/libmba:0 static-libs
@@ -1762,7 +1747,7 @@ package.use : dev-libs/nettle:0 -cpu_flags_x86_aes -doc -neon -test gmp static-l
 
 [dev-libs/npth:0]
 package.use : dev-libs/npth:0 static-libs
-package.accept_keywords : =dev-libs/npth-1.2 ??
+package.accept_keywords : =dev-libs/npth-1.2 ~amd64
 
 [dev-libs/nspr:0]
 package.use : dev-libs/nspr:0 -debug
@@ -1777,10 +1762,10 @@ package.use : dev-libs/openobex:0 -debug -irda -usb bluetooth syslog
 package.use : dev-libs/opensc:0 -doc -libtool -openct pcsc-lite readline ssl zlib
 
 [dev-libs/openssl:0]
-package.use : dev-libs/openssl:0 -bindist -kerberos -rfc3779 -sctp -sslv2 -test -vanilla asm cpu_flags_x86_sse2 gmp sslv3 static-libs tls-heartbeat zlib
+package.use : dev-libs/openssl:0 -bindist -kerberos -rfc3779 -sctp -test -vanilla asm cpu_flags_x86_sse2 gmp static-libs tls-heartbeat zlib
 
 [dev-libs/ossp-uuid:0]
-package.use : dev-libs/ossp-uuid:0 -php -php_targets_php5-4 -php_targets_php5-5 cxx perl static-libs
+package.use : dev-libs/ossp-uuid:0 -php -php_targets_php5-4 cxx perl php_targets_php5-5 static-libs
 
 [dev-libs/pakchois:0]
 package.use : dev-libs/pakchois:0 -nls
@@ -1806,6 +1791,9 @@ package.use : dev-libs/ptexenc:0 iconv static-libs
 [dev-libs/qjson:0]
 package.use : dev-libs/qjson:0 -debug -doc -test
 
+[dev-libs/qtkeychain:0]
+package.use : dev-libs/qtkeychain:0 -qt5 qt4
+
 [dev-libs/quazip:0]
 package.use : dev-libs/quazip:0 -qt5 -test qt4
 
@@ -1849,7 +1837,7 @@ package.use : dev-libs/xmlwrapp:0 static-libs
 package.use : dev-libs/zziplib:0 -doc -test sdl static-libs
 
 [dev-lisp/asdf:0]
-package.use : dev-lisp/asdf:0 -doc
+package.use : dev-lisp/asdf:0 -doc -test
 
 [dev-lua/lpeg:0]
 package.use : dev-lua/lpeg:0 -debug -doc
@@ -1896,6 +1884,9 @@ package.use : dev-perl/Authen-NTLM:0 -test
 [dev-perl/Authen-SASL:0]
 package.use : dev-perl/Authen-SASL:0 -kerberos
 
+[dev-perl/BerkeleyDB:0]
+package.use : dev-perl/BerkeleyDB:0 -test
+
 [dev-perl/CGI:0]
 package.use : dev-perl/CGI:0 -test
 
@@ -2464,9 +2455,6 @@ package.use : dev-perl/Sub-Override:0 -test
 [dev-perl/Sys-Statistics-Linux:0]
 package.use : dev-perl/Sys-Statistics-Linux:0 -test
 
-[dev-perl/TAP-Parser-SourceHandler-pgTAP:0]
-package.use : dev-perl/TAP-Parser-SourceHandler-pgTAP:0 -test
-
 [dev-perl/Template-DBI:0]
 package.use : dev-perl/Template-DBI:0 -test
 
@@ -2476,9 +2464,6 @@ package.use : dev-perl/Template-Plugin-Latex:0 -test
 [dev-perl/Template-Toolkit:0]
 package.use : dev-perl/Template-Toolkit:0 -gd -mysql -postgres latex vim-syntax xml
 
-[dev-perl/Term-ReadLine-Gnu:0]
-package.use : dev-perl/Term-ReadLine-Gnu:0 -examples
-
 [dev-perl/Test-Class:0]
 package.use : dev-perl/Test-Class:0 -test
 
@@ -2497,23 +2482,17 @@ package.use : dev-perl/Test-Inline:0 -test
 [dev-perl/Test-Pod-Coverage:0]
 package.use : dev-perl/Test-Pod-Coverage:0 -test
 
-[dev-perl/Test-Pod:0]
-package.use : dev-perl/Test-Pod:0 -test
-
 [dev-perl/Test-Trap:0]
 package.use : dev-perl/Test-Trap:0 -test
 
 [dev-perl/Test-Warn:0]
 package.use : dev-perl/Test-Warn:0 -test
 
-[dev-perl/Text-Autoformat:0]
-package.use : dev-perl/Text-Autoformat:0 -examples -test
-
 [dev-perl/Text-CSV-Simple:0]
 package.use : dev-perl/Text-CSV-Simple:0 -test
 
 [dev-perl/Text-CSV_XS:0]
-package.use : dev-perl/Text-CSV_XS:0 -examples -test
+package.use : dev-perl/Text-CSV_XS:0 -test
 
 [dev-perl/Text-Format:0]
 package.use : dev-perl/Text-Format:0 -test
@@ -2521,36 +2500,21 @@ package.use : dev-perl/Text-Format:0 -test
 [dev-perl/Text-Reform:0]
 package.use : dev-perl/Text-Reform:0 -test
 
-[dev-perl/Text-Wrapper:0]
-package.use : dev-perl/Text-Wrapper:0 -examples -minimal -test
-
-[dev-perl/Throwable:0]
-package.use : dev-perl/Throwable:0 -test
-
 [dev-perl/Tie-Array-Sorted:0]
 package.use : dev-perl/Tie-Array-Sorted:0 -test
 
 [dev-perl/Tie-IxHash:0]
 package.use : dev-perl/Tie-IxHash:0 -test
 
-[dev-perl/Tie-Simple:0]
-package.use : dev-perl/Tie-Simple:0 -test
-
-[dev-perl/Time-ParseDate:0]
-package.use : dev-perl/Time-ParseDate:0 -test
-
 [dev-perl/Tree-Simple:0]
-package.use : dev-perl/Tree-Simple:0 -minimal -test
+package.use : dev-perl/Tree-Simple:0 -test
 
 [dev-perl/Try-Tiny:0]
-package.use : dev-perl/Try-Tiny:0 -minimal -test
+package.use : dev-perl/Try-Tiny:0 -test
 
 [dev-perl/UNIVERSAL-moniker:0]
 package.use : dev-perl/UNIVERSAL-moniker:0 -test
 
-[dev-perl/URI:0]
-package.use : dev-perl/URI:0 -test
-
 [dev-perl/Unicode-UTF8:0]
 package.use : dev-perl/Unicode-UTF8:0 -test
 
@@ -2558,19 +2522,10 @@ package.use : dev-perl/Unicode-UTF8:0 -test
 package.use : dev-perl/Validate-Net:0 -test
 
 [dev-perl/Variable-Magic:0]
-package.use : dev-perl/Variable-Magic:0 -examples -test
-
-[dev-perl/XML-DOM:0]
-package.use : dev-perl/XML-DOM:0 -test
+package.use : dev-perl/Variable-Magic:0 -test
 
 [dev-perl/XML-DT:0]
-package.use : dev-perl/XML-DT:0 -examples -test
-
-[dev-perl/XML-Encoding:0]
-package.use : dev-perl/XML-Encoding:0 -test
-
-[dev-perl/XML-Filter-DOMFilter-LibXML:0]
-package.use : dev-perl/XML-Filter-DOMFilter-LibXML:0 -test
+package.use : dev-perl/XML-DT:0 -test
 
 [dev-perl/XML-LibXML:0]
 package.use : dev-perl/XML-LibXML:0 -test
@@ -2587,6 +2542,12 @@ package.use : dev-perl/XML-Stream:0 ssl
 [dev-perl/XML-Twig:0]
 package.use : dev-perl/XML-Twig:0 -nls
 
+[dev-perl/cache-mmap:0]
+package.use : dev-perl/cache-mmap:0 -test
+
+[dev-perl/dbix-searchbuilder:0]
+package.use : dev-perl/dbix-searchbuilder:0 -test
+
 [dev-perl/libwww-perl:0]
 package.use : dev-perl/libwww-perl:0 ssl
 
@@ -2597,7 +2558,7 @@ package.use : dev-perl/strictures:0 -test
 package.use : dev-python/Babel:0 -doc -test
 
 [dev-python/PyQt4:0]
-package.use : dev-python/PyQt4:0 -debug -declarative -designer -doc -examples -help -kde -multimedia -phonon -script -scripttools -sql -testlib -xmlpatterns X compat dbus opengl svg webkit
+package.use : dev-python/PyQt4:0 -debug -declarative -designer -doc -examples -help -kde -multimedia -phonon -script -scripttools -sql -xmlpatterns X dbus opengl svg webkit
 
 [dev-python/adodb-py:0]
 package.use : dev-python/adodb-py:0 -mysql -postgres sqlite
@@ -2689,9 +2650,6 @@ package.use : dev-python/columnize:0 -test
 [dev-python/contextlib2:0]
 package.use : dev-python/contextlib2:0 -test
 
-[dev-python/coverage:0]
-package.use : dev-python/coverage:0 -test
-
 [dev-python/crumbs:0]
 package.use : dev-python/crumbs:0 -inotify -test
 
@@ -2770,9 +2728,6 @@ package.use : dev-python/django:0 -doc -test sqlite
 [dev-python/dnspython:py2]
 package.use : dev-python/dnspython:py2 -examples -test
 
-[dev-python/dnspython:py3]
-package.use : dev-python/dnspython:py3 -examples -test
-
 [dev-python/docker-py:0]
 package.use : dev-python/docker-py:0 -doc -test
 
@@ -2902,9 +2857,6 @@ package.use : dev-python/gnome-python-extras-base:0 -debug
 [dev-python/gnome-vfs-python:2]
 package.use : dev-python/gnome-vfs-python:2 -doc -examples
 
-[dev-python/google-api-python-client:0]
-package.use : dev-python/google-api-python-client:0 -test
-
 [dev-python/graphy:0]
 package.use : dev-python/graphy:0 -examples
 
@@ -2978,7 +2930,7 @@ package.use : dev-python/json-tools:0 -test
 package.use : dev-python/jsonschema:0 -test
 
 [dev-python/kaa-base:0]
-package.use : dev-python/kaa-base:0 -lirc -tls -zeroconf sqlite
+package.use : dev-python/kaa-base:0 -lirc -tls avahi sqlite
 
 [dev-python/kaa-metadata:0]
 package.use : dev-python/kaa-metadata:0 -css dvd
@@ -3088,6 +3040,9 @@ package.use : dev-python/oauthlib:0 -test
 [dev-python/optcomplete:0]
 package.use : dev-python/optcomplete:0 -doc -examples
 
+[dev-python/packaging:0]
+package.use : dev-python/packaging:0 -test
+
 [dev-python/paisley:0]
 package.use : dev-python/paisley:0 -test
 
@@ -3274,6 +3229,9 @@ package.use : dev-python/pytest:0 -doc -test
 [dev-python/python-daemon:0]
 package.use : dev-python/python-daemon:0 -test
 
+[dev-python/python-dateutil:0]
+package.use : dev-python/python-dateutil:0 -examples
+
 [dev-python/python-gtkmvc:0]
 package.use : dev-python/python-gtkmvc:0 -doc -examples
 
@@ -3361,9 +3319,6 @@ package.use : dev-python/requests:0 -test
 [dev-python/roman:0]
 package.use : dev-python/roman:0 -test
 
-[dev-python/rope:0]
-package.use : dev-python/rope:0 -doc
-
 [dev-python/routes:0]
 package.use : dev-python/routes:0 -doc
 
@@ -3386,7 +3341,7 @@ package.use : dev-python/setuptools:0 -test
 package.use : dev-python/setuptools_scm:0 -test
 
 [dev-python/simpleparse:0]
-package.use : dev-python/simpleparse:0 -doc -examples -test
+package.use : dev-python/simpleparse:0 -doc -examples
 
 [dev-python/sip:0]
 package.use : dev-python/sip:0 -debug -doc
@@ -3530,14 +3485,11 @@ package.use : dev-qt/qtconcurrent:5 -debug -test
 package.use : dev-qt/qtcore:4 -aqua -debug -pch exceptions glib iconv icu qt3support ssl
 
 [dev-qt/qtcore:5]
-package.use : dev-qt/qtcore:5 -debug -systemd -test icu
+package.use : dev-qt/qtcore:5 -debug -icu -systemd -test
 
 [dev-qt/qtdbus:4]
 package.use : dev-qt/qtdbus:4 -aqua -debug -pch exceptions
 
-[dev-qt/qtdbus:5]
-package.use : dev-qt/qtdbus:5 -debug -test
-
 [dev-qt/qtdeclarative:4]
 package.use : dev-qt/qtdeclarative:4 -aqua -debug -pch accessibility exceptions qt3support webkit
 
@@ -3580,6 +3532,9 @@ package.use : dev-qt/qtphonon:4 -aqua -debug -pch dbus exceptions qt3support
 [dev-qt/qtprintsupport:5]
 package.use : dev-qt/qtprintsupport:5 -cups -debug -gles2 -test
 
+[dev-qt/qtquick1:5]
+package.use : dev-qt/qtquick1:5 -debug -designer -gles2 -opengl -test -webkit -xml
+
 [dev-qt/qtquickcontrols:5]
 package.use : dev-qt/qtquickcontrols:5 -debug -test widgets
 
@@ -3613,18 +3568,9 @@ package.use : dev-qt/qttest:5 -debug -test
 [dev-qt/qttranslations:5]
 package.use : dev-qt/qttranslations:5 -debug -test
 
-[dev-qt/qtwebchannel:5]
-package.use : dev-qt/qtwebchannel:5 -debug -test qml
-
-[dev-qt/qtwebengine:5]
-package.use : dev-qt/qtwebengine:5 -bindist -debug -geolocation -test system-ffmpeg system-icu widgets
-
 [dev-qt/qtwebkit:4]
 package.use : dev-qt/qtwebkit:4 -aqua -debug -jit -pch exceptions gstreamer icu
 
-[dev-qt/qtwebkit:5]
-package.use : dev-qt/qtwebkit:5 -debug -geolocation -gstreamer -gstreamer010 -jit -multimedia -opengl -orientation -printsupport -qml -test -webchannel -webp
-
 [dev-qt/qtwidgets:5]
 package.use : dev-qt/qtwidgets:5 -debug -gles2 -gtkstyle -test png xcb
 
@@ -3667,9 +3613,6 @@ package.use : dev-ruby/domain_name:0 -test
 [dev-ruby/eventmachine:0]
 package.use : dev-ruby/eventmachine:0 -doc -test
 
-[dev-ruby/ffi:0]
-package.use : dev-ruby/ffi:0 -doc -test
-
 [dev-ruby/hoe:0]
 package.use : dev-ruby/hoe:0 -doc -test
 
@@ -3691,14 +3634,11 @@ package.use : dev-ruby/kirbybase:0 -test
 [dev-ruby/libxml:0]
 package.use : dev-ruby/libxml:0 -doc -test
 
-[dev-ruby/listen:1]
-package.use : dev-ruby/listen:1 -test
-
 [dev-ruby/logue:0]
 package.use : dev-ruby/logue:0 -doc -test
 
-[dev-ruby/mecab-ruby:0]
-package.use : dev-ruby/mecab-ruby:0
+[dev-ruby/matchy:0]
+package.use : dev-ruby/matchy:0 -doc -test
 
 [dev-ruby/mechanize:0]
 package.use : dev-ruby/mechanize:0 -doc -test
@@ -3748,9 +3688,6 @@ package.use : dev-ruby/rake-compiler:0 -test
 [dev-ruby/rake:0]
 package.use : dev-ruby/rake:0 -doc -test
 
-[dev-ruby/rb-inotify:0]
-package.use : dev-ruby/rb-inotify:0 -doc -test
-
 [dev-ruby/rcairo:0]
 package.use : dev-ruby/rcairo:0 -doc -test
 
@@ -3787,9 +3724,6 @@ package.use : dev-ruby/ruby-clutter-gtk:0 -test
 [dev-ruby/ruby-clutter:0]
 package.use : dev-ruby/ruby-clutter:0 -test
 
-[dev-ruby/ruby-dict:0]
-package.use : dev-ruby/ruby-dict:0
-
 [dev-ruby/ruby-gdk3:0]
 package.use : dev-ruby/ruby-gdk3:0 -test
 
@@ -3842,13 +3776,7 @@ package.use : dev-ruby/ruby-progressbar:0 -test
 package.use : dev-ruby/ruby-rsvg:0 -cairo -test
 
 [dev-ruby/ruby-sdl:0]
-package.use : dev-ruby/ruby-sdl:0 -image -mixer -mpeg -sge -truetype
-
-[dev-ruby/ruby-tcpwrap:0]
-package.use : dev-ruby/ruby-tcpwrap:0
-
-[dev-ruby/ruby-termios:0]
-package.use : dev-ruby/ruby-termios:0
+package.use : dev-ruby/ruby-sdl:0 -image -mixer -sge -truetype mpeg
 
 [dev-ruby/ruby-vte3:0]
 package.use : dev-ruby/ruby-vte3:0 -test
@@ -3871,9 +3799,6 @@ package.use : dev-ruby/rubygems:0 -server -test
 [dev-ruby/rubypants:0]
 package.use : dev-ruby/rubypants:0 -test
 
-[dev-ruby/sass:3.4]
-package.use : dev-ruby/sass:3.4 -doc -test
-
 [dev-ruby/serialport:0]
 package.use : dev-ruby/serialport:0 -test
 
@@ -3917,7 +3842,7 @@ package.use : dev-ruby/webrobots:0 -doc -test
 package.use : dev-ruby/wirble:0 -doc -test
 
 [dev-ruby/xml-simple:0]
-package.use : dev-ruby/xml-simple:0 -doc -test
+package.use : dev-ruby/xml-simple:0 -test
 
 [dev-ruby/zentest:0]
 package.use : dev-ruby/zentest:0 -doc -test
@@ -3997,9 +3922,6 @@ package.use : dev-tex/lgrind:0 -examples
 [dev-tex/pgf:0]
 package.use : dev-tex/pgf:0 -doc -source
 
-[dev-tex/revtex:0]
-package.use : dev-tex/revtex:0 -doc
-
 [dev-tex/style-check:0]
 package.use : dev-tex/style-check:0 -test
 
@@ -4009,9 +3931,6 @@ package.use : dev-tex/xcolor:0 -doc
 [dev-texlive/texlive-basic:0]
 package.use : dev-texlive/texlive-basic:0 -doc -source
 
-[dev-texlive/texlive-fontsextra:0]
-package.use : dev-texlive/texlive-fontsextra:0 -doc -source
-
 [dev-texlive/texlive-fontsrecommended:0]
 package.use : dev-texlive/texlive-fontsrecommended:0 -doc -source
 
@@ -4021,6 +3940,63 @@ package.use : dev-texlive/texlive-fontutils:0 -doc -source
 [dev-texlive/texlive-genericrecommended:0]
 package.use : dev-texlive/texlive-genericrecommended:0 -doc -source
 
+[dev-texlive/texlive-langafrican:0]
+package.use : dev-texlive/texlive-langafrican:0 -doc -source
+
+[dev-texlive/texlive-langarabic:0]
+package.use : dev-texlive/texlive-langarabic:0 -doc -source
+
+[dev-texlive/texlive-langchinese:0]
+package.use : dev-texlive/texlive-langchinese:0 -doc -source
+
+[dev-texlive/texlive-langcjk:0]
+package.use : dev-texlive/texlive-langcjk:0 -doc -source
+
+[dev-texlive/texlive-langcyrillic:0]
+package.use : dev-texlive/texlive-langcyrillic:0 -doc -source
+
+[dev-texlive/texlive-langczechslovak:0]
+package.use : dev-texlive/texlive-langczechslovak:0 -doc -source
+
+[dev-texlive/texlive-langenglish:0]
+package.use : dev-texlive/texlive-langenglish:0 -doc -source
+
+[dev-texlive/texlive-langeuropean:0]
+package.use : dev-texlive/texlive-langeuropean:0 -doc -source
+
+[dev-texlive/texlive-langfrench:0]
+package.use : dev-texlive/texlive-langfrench:0 -doc -source
+
+[dev-texlive/texlive-langgerman:0]
+package.use : dev-texlive/texlive-langgerman:0 -doc -source
+
+[dev-texlive/texlive-langgreek:0]
+package.use : dev-texlive/texlive-langgreek:0 -doc -source
+
+[dev-texlive/texlive-langindic:0]
+package.use : dev-texlive/texlive-langindic:0 -doc -source
+
+[dev-texlive/texlive-langitalian:0]
+package.use : dev-texlive/texlive-langitalian:0 -doc -source
+
+[dev-texlive/texlive-langjapanese:0]
+package.use : dev-texlive/texlive-langjapanese:0 -doc -source
+
+[dev-texlive/texlive-langkorean:0]
+package.use : dev-texlive/texlive-langkorean:0 -doc -source
+
+[dev-texlive/texlive-langother:0]
+package.use : dev-texlive/texlive-langother:0 -doc -source
+
+[dev-texlive/texlive-langpolish:0]
+package.use : dev-texlive/texlive-langpolish:0 -doc -source
+
+[dev-texlive/texlive-langportuguese:0]
+package.use : dev-texlive/texlive-langportuguese:0 -doc -source
+
+[dev-texlive/texlive-langspanish:0]
+package.use : dev-texlive/texlive-langspanish:0 -doc -source
+
 [dev-texlive/texlive-latex:0]
 package.use : dev-texlive/texlive-latex:0 -doc -source
 
@@ -4039,9 +4015,6 @@ package.use : dev-texlive/texlive-plainextra:0 -doc -source
 [dev-texlive/texlive-publishers:0]
 package.use : dev-texlive/texlive-publishers:0 -doc -source
 
-[dev-util/android-tools:0]
-package.use : dev-util/android-tools:0 -libressl
-
 [dev-util/astyle:0]
 package.use : dev-util/astyle:0 -doc -java static-libs
 
@@ -4055,6 +4028,9 @@ package.use : dev-util/boost-build:0 -examples -test python
 package.use : dev-util/cccc:0 -apidoc -debug -doc -mfc
 package.accept_keywords : =dev-util/cccc-3.1.5 ~amd64
 
+[dev-util/cdecl:0]
+package.use : dev-util/cdecl:0 readline
+
 [dev-util/cmake:0]
 package.use : dev-util/cmake:0 -doc -emacs -qt5 -system-jsoncpp -test ncurses qt4
 
@@ -4064,6 +4040,9 @@ package.use : dev-util/cppi:0 -nls
 [dev-util/cppunit:0]
 package.use : dev-util/cppunit:0 -doc -examples static-libs
 
+[dev-util/crow-designer:0]
+package.use : dev-util/crow-designer:0 -nls
+
 [dev-util/cscope:0]
 package.use : dev-util/cscope:0 -emacs
 
@@ -4088,6 +4067,9 @@ package.use : dev-util/diffball:0 -debug
 [dev-util/difffilter:0]
 package.use : dev-util/difffilter:0 -doc
 
+[dev-util/duma:0]
+package.use : dev-util/duma:0 -examples
+
 [dev-util/elfkickers:0]
 package.use : dev-util/elfkickers:0 -doc
 
@@ -4100,12 +4082,12 @@ package.use : dev-util/geany:0 -gtk3 vte
 [dev-util/global:0]
 package.use : dev-util/global:0 -doc -emacs -vim
 
-[dev-util/google-perftools:0]
-package.use : dev-util/google-perftools:0 -largepages -minimal -static-libs -test debug
-
 [dev-util/jay:0]
 package.use : dev-util/jay:0 -java -mono
 
+[dev-util/ketchup:0]
+package.use : dev-util/ketchup:0 -doc
+
 [dev-util/memprof:0]
 package.use : dev-util/memprof:0 -nls
 
@@ -4124,6 +4106,9 @@ package.use : dev-util/patchutils:0 -test
 [dev-util/pkgconfig:0]
 package.use : dev-util/pkgconfig:0 -internal-glib hardened
 
+[dev-util/qdevelop:0]
+package.use : dev-util/qdevelop:0 -debug -plugins
+
 [dev-util/quilt:0]
 package.use : dev-util/quilt:0 -emacs -graphviz
 
@@ -4154,9 +4139,6 @@ package.use : dev-util/uncrustify:0 -test
 [dev-util/valgrind:0]
 package.use : dev-util/valgrind:0 -mpi
 
-[dev-util/vbindiff:0]
-package.use : dev-util/vbindiff:0 -debug
-
 [dev-util/wiggle:0]
 package.use : dev-util/wiggle:0 -test
 
@@ -4210,6 +4192,7 @@ package.use : dev-vcs/tig:0 unicode
 
 [dev-vcs/tortoisehg:0]
 package.use : dev-vcs/tortoisehg:0 -doc
+package.accept_keywords : =dev-vcs/tortoisehg-3.7.3 ??
 
 [games-action/0verkill:0]
 package.use : games-action/0verkill:0 X
@@ -4218,7 +4201,7 @@ package.use : games-action/0verkill:0 X
 package.use : games-action/bomberclone:0 X
 
 [games-action/bzflag:0]
-package.use : games-action/bzflag:0 -dedicated -upnp
+package.use : games-action/bzflag:0 -dedicated sdl
 
 [games-action/chromium-bsu:0]
 package.use : games-action/chromium-bsu:0 -mixer -nls sdl
@@ -4337,9 +4320,6 @@ package.use : games-board/teg:0 -debug -nls
 [games-board/xboard:0]
 package.use : games-board/xboard:0 -nls -zippy Xaw3d default-font gtk
 
-[games-board/xscrabble:0]
-package.use : games-board/xscrabble:0 -l10n_fr
-
 [games-emulation/advancemame:0]
 package.use : games-emulation/advancemame:0 -truetype alsa fbcon oss
 
@@ -4419,7 +4399,13 @@ package.use : games-fps/warsow:0 -debug -dedicated -irc -server openal
 package.use : games-kids/lletters:0 -nls
 
 [games-misc/fortune-mod-all:0]
-package.use : games-misc/fortune-mod-all:0 -l10n_cs -l10n_de -l10n_it -l10n_sk -offensive
+package.use : games-misc/fortune-mod-all:0 -offensive
+
+[games-misc/fortune-mod-at-linux:0]
+package.use : games-misc/fortune-mod-at-linux:0 unicode
+
+[games-misc/fortune-mod-cs:0]
+package.use : games-misc/fortune-mod-cs:0 unicode
 
 [games-misc/fortune-mod-gentoo-dev:0]
 package.use : games-misc/fortune-mod-gentoo-dev:0 -offensive
@@ -4427,6 +4413,9 @@ package.use : games-misc/fortune-mod-gentoo-dev:0 -offensive
 [games-misc/fortune-mod-gentoo-forums:0]
 package.use : games-misc/fortune-mod-gentoo-forums:0 -offensive
 
+[games-misc/fortune-mod-it:0]
+package.use : games-misc/fortune-mod-it:0 -offensive
+
 [games-misc/fortune-mod-kernelcookies:0]
 package.use : games-misc/fortune-mod-kernelcookies:0 -offensive
 
@@ -4535,14 +4524,11 @@ package.use : games-roguelike/zangband:0 tk
 [games-rpg/adonthell:0]
 package.use : games-rpg/adonthell:0 -doc -nls
 
-[games-rpg/draci-historie:0]
-package.use : games-rpg/draci-historie:0 -l10n_cs -l10n_de -l10n_en -l10n_pl
-
 [games-rpg/drascula:0]
-package.use : games-rpg/drascula:0 -l10n_de -l10n_es -l10n_fr -l10n_it sound
+package.use : games-rpg/drascula:0 sound
 
 [games-rpg/dreamweb:0]
-package.use : games-rpg/dreamweb:0 -doc -l10n_de -l10n_en -l10n_en-GB -l10n_es -l10n_fr -l10n_it
+package.use : games-rpg/dreamweb:0 -doc
 
 [games-rpg/freedroidrpg:0]
 package.use : games-rpg/freedroidrpg:0 -nls -sound opengl
@@ -4551,10 +4537,7 @@ package.use : games-rpg/freedroidrpg:0 -nls -sound opengl
 package.use : games-rpg/kqlives:0 -cheats -nls
 
 [games-rpg/queen:0]
-package.use : games-rpg/queen:0 -l10n_de -l10n_fr -l10n_he -l10n_it l10n_en mp3
-
-[games-rpg/soltys:0]
-package.use : games-rpg/soltys:0 -l10n_en -l10n_es -l10n_pl
+package.use : games-rpg/queen:0 mp3
 
 [games-rpg/wastesedge:0]
 package.use : games-rpg/wastesedge:0 -nls
@@ -4669,7 +4652,7 @@ package.env : gnome-base/gnome-desktop:3 gnome-base_gnome-desktop_3
 env : CPPFLAGS="-D_GNU_SOURCE"
 
 [gnome-base/gnome-keyring:0]
-package.use : gnome-base/gnome-keyring:0 -pam -selinux -test caps filecaps ssh-agent
+package.use : gnome-base/gnome-keyring:0 -debug -pam -selinux -test caps filecaps ssh-agent
 
 [gnome-base/gnome-menus:3]
 package.use : gnome-base/gnome-menus:3 -debug -test introspection
@@ -4708,7 +4691,7 @@ package.use : gnome-base/libgnomecanvas:0 -glade -test
 package.use : gnome-base/libgnomeui:0 -test
 
 [gnome-base/libgtop:2]
-package.use : gnome-base/libgtop:2 introspection
+package.use : gnome-base/libgtop:2 -debug introspection
 
 [gnome-base/librsvg:2]
 package.use : gnome-base/librsvg:2 -tools introspection vala
@@ -4720,7 +4703,7 @@ package.use : gnome-base/orbit:2 -debug -test pic static-libs
 package.use : gnome-extra/assogiate:0 -debug
 
 [gnome-extra/evolution-data-server:0]
-package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -google -kerberos -test berkdb gnome-online-accounts gtk introspection ipv6 ldap vala weather
+package.use : gnome-extra/evolution-data-server:0 -api-doc-extras -kerberos -test berkdb gnome-online-accounts gtk introspection ipv6 ldap vala weather
 
 [gnome-extra/evolution-ews:0]
 package.use : gnome-extra/evolution-ews:0 -test
@@ -4737,8 +4720,11 @@ package.use : gnome-extra/gnome-system-monitor:0 -systemd X
 [gnome-extra/gnome-user-docs:0]
 package.use : gnome-extra/gnome-user-docs:0 -test
 
+[gnome-extra/gucharmap:0]
+package.use : gnome-extra/gucharmap:0 -cjk -debug -doc introspection
+
 [gnome-extra/gucharmap:2.90]
-package.use : gnome-extra/gucharmap:2.90 -debug -test introspection vala
+package.use : gnome-extra/gucharmap:2.90 -cjk -debug -test introspection vala
 
 [gnome-extra/libgda:5]
 package.use : gnome-extra/libgda:5 -canvas -debug -firebird -gnome-keyring -graphviz -http -java -json -mdb -mysql -oci8 -postgres -reports -sourceview -vala berkdb gtk introspection ldap ssl
@@ -4753,7 +4739,7 @@ package.use : kde-frameworks/extra-cmake-modules:5 -doc -test
 package.use : kde-frameworks/oxygen-icons:5 -test
 
 [kde-misc/kdiff3:4]
-package.use : kde-misc/kdiff3:4 -aqua -debug -kde -l10n_ar -l10n_bg -l10n_br -l10n_bs -l10n_ca -l10n_ca-valencia -l10n_cs -l10n_cy -l10n_da -l10n_de -l10n_el -l10n_en-GB -l10n_eo -l10n_es -l10n_et -l10n_fr -l10n_ga -l10n_gl -l10n_hi -l10n_hne -l10n_hr -l10n_hu -l10n_is -l10n_it -l10n_ja -l10n_ka -l10n_lt -l10n_mai -l10n_ml -l10n_nb -l10n_nds -l10n_nl -l10n_nn -l10n_pl -l10n_pt -l10n_pt-BR -l10n_ro -l10n_ru -l10n_rw -l10n_sk -l10n_sv -l10n_ta -l10n_tg -l10n_tr -l10n_ug -l10n_uk -l10n_zh-CN -l10n_zh-TW -qt5 handbook qt4
+package.use : kde-misc/kdiff3:4 -aqua -debug -kde -qt5 handbook qt4
 
 [lxde-base/lxdm:0]
 package.use : lxde-base/lxdm:0 -consolekit -debug -nls -pam gtk3
@@ -4782,6 +4768,9 @@ package.use : mail-client/mutt:0 -debug -doc -gnutls -gpg -imap -kerberos -libre
 [mail-client/nail:0]
 package.use : mail-client/nail:0 -kerberos -net ssl
 
+[mail-client/trojita:0]
+package.use : mail-client/trojita:0 -debug -qt5 -test password zlib
+
 [mail-filter/bmf:0]
 package.use : mail-filter/bmf:0 -mysql berkdb
 
@@ -4825,26 +4814,26 @@ package.use : mail-filter/spamprobe:0 berkdb gif jpeg png
 package.use : mail-filter/sqlgrey:0 -mysql -postgres sqlite
 
 [mail-mta/postfix:0]
-package.use : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux berkdb cdb eai hardened ldap mbox sasl sqlite ssl
+package.use : mail-mta/postfix:0 -doc -dovecot-sasl -ldap-bind -libressl -lmdb -memcached -mysql -nis -pam -postgres -selinux -vda berkdb cdb eai hardened ldap mbox sasl sqlite ssl
 
 [mate-base/mate-common:0]
-package.accept_keywords : =mate-base/mate-common-1.10.0 ??
+package.accept_keywords : =mate-base/mate-common-1.10.0 ~amd64
 
 [mate-base/mate-desktop:0]
 package.use : mate-base/mate-desktop:0 -debug X introspection startup-notification user-guide
-package.accept_keywords : =mate-base/mate-desktop-1.10.2 ??
+package.accept_keywords : =mate-base/mate-desktop-1.10.2 ~amd64
 
 [mate-base/mate-menus:0]
 package.use : mate-base/mate-menus:0 -debug introspection python
-package.accept_keywords : =mate-base/mate-menus-1.10.1 ??
+package.accept_keywords : =mate-base/mate-menus-1.10.1 ~amd64
 
 [mate-base/mate-panel:0]
 package.use : mate-base/mate-panel:0 X introspection
-package.accept_keywords : =mate-base/mate-panel-1.10.1 ??
+package.accept_keywords : =mate-base/mate-panel-1.10.1 ~amd64
 
 [mate-extra/mate-sensors-applet:0]
 package.use : mate-extra/mate-sensors-applet:0 -hddtemp -lm_sensors -video_cards_fglrx -video_cards_nvidia dbus libnotify
-package.accept_keywords : =mate-extra/mate-sensors-applet-1.10.4-r1 ??
+package.accept_keywords : =mate-extra/mate-sensors-applet-1.10.4-r1 ~amd64
 
 [media-fonts/alee-fonts:0]
 package.use : media-fonts/alee-fonts:0 X
@@ -4867,12 +4856,18 @@ package.use : media-fonts/arabeyes-fonts:0 X
 [media-fonts/arkpandora:0]
 package.use : media-fonts/arkpandora:0 X
 
+[media-fonts/arphicfonts:0]
+package.use : media-fonts/arphicfonts:0 X
+
 [media-fonts/artwiz-aleczapka-en:0]
 package.use : media-fonts/artwiz-aleczapka-en:0 X
 
 [media-fonts/artwiz-latin1:0]
 package.use : media-fonts/artwiz-latin1:0 X
 
+[media-fonts/baekmuk-fonts:0]
+package.use : media-fonts/baekmuk-fonts:0 X unicode
+
 [media-fonts/bitstream-cyberbit:0]
 package.use : media-fonts/bitstream-cyberbit:0 X
 
@@ -4930,9 +4925,6 @@ package.use : media-fonts/font-bitstream-100dpi:0 -nls X
 [media-fonts/font-cursor-misc:0]
 package.use : media-fonts/font-cursor-misc:0 -nls X
 
-[media-fonts/font-misc-misc:0]
-package.use : media-fonts/font-misc-misc:0 X nls
-
 [media-fonts/font-schumacher-misc:0]
 package.use : media-fonts/font-schumacher-misc:0 -nls X
 
@@ -4957,6 +4949,9 @@ package.use : media-fonts/hunkyfonts:0 X
 [media-fonts/inconsolata:0]
 package.use : media-fonts/inconsolata:0 X
 
+[media-fonts/intlfonts:0]
+package.use : media-fonts/intlfonts:0 -bdf X
+
 [media-fonts/ipaex:0]
 package.use : media-fonts/ipaex:0 X
 
@@ -4975,6 +4970,9 @@ package.use : media-fonts/kanjistrokeorders:0 X
 [media-fonts/khmer:0]
 package.use : media-fonts/khmer:0 X
 
+[media-fonts/kochi-substitute:0]
+package.use : media-fonts/kochi-substitute:0 X
+
 [media-fonts/lfpfonts-fix:0]
 package.use : media-fonts/lfpfonts-fix:0 X
 
@@ -5162,7 +5160,7 @@ package.use : media-gfx/graphite2:0 -test perl
 package.use : media-gfx/gthumb:0 -cdr -debug -gnome-keyring -gstreamer -http -json -lcms -slideshow -test exif jpeg raw svg tiff webkit webp
 
 [media-gfx/gtkam:0]
-package.use : media-gfx/gtkam:0 -gimp -nls
+package.use : media-gfx/gtkam:0 -debug -gimp -gnome -nls
 
 [media-gfx/imagemagick:0]
 package.use : media-gfx/imagemagick:0 -X -autotrace -bzip2 -corefonts -djvu -fftw -fontconfig -fpx -graphviz -hdri -jbig -jpeg -jpeg2k -lcms -lqr -lzma -opencl -openexr -pango -perl -png -postscript -q32 -q64 -q8 -raw -static-libs -svg -test -tiff -truetype -webp -wmf -xml cxx openmp zlib
@@ -5210,7 +5208,7 @@ package.use : media-gfx/pornview:0 -nls exif
 package.use : media-gfx/potrace:0 -metric static-libs
 
 [media-gfx/povray:0]
-package.use : media-gfx/povray:0 -debug -test X io-restrictions openexr static-libs tiff
+package.use : media-gfx/povray:0 -debug -mkl -test X io-restrictions openexr static-libs tiff
 
 [media-gfx/pstoedit:0]
 package.use : media-gfx/pstoedit:0 -emf -flash -imagemagick -plotutils -pptx static-libs
@@ -5227,6 +5225,9 @@ package.use : media-gfx/sam2p:0 -examples gif
 [media-gfx/scantailor:0]
 package.use : media-gfx/scantailor:0 -test opengl
 
+[media-gfx/skencil:0]
+package.use : media-gfx/skencil:0 -nls
+
 [media-gfx/splashutils:0]
 package.use : media-gfx/splashutils:0 -fbcondecor -gpm hardened png truetype
 
@@ -5279,7 +5280,7 @@ package.use : media-libs/assimp:0 -samples -static -tools boost
 package.use : media-libs/audiofile:0 -test flac static-libs
 
 [media-libs/babl:0]
-package.use : media-libs/babl:0 -altivec -cpu_flags_x86_f16c -cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
+package.use : media-libs/babl:0 -altivec cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2
 
 [media-libs/blib:0]
 package.use : media-libs/blib:0 aalib directfb gtk
@@ -5336,7 +5337,7 @@ package.use : media-libs/freealut:0 static-libs
 package.use : media-libs/freeglut:0 -debug static-libs
 
 [media-libs/freetype:2]
-package.use : media-libs/freetype:2 -debug -doc -harfbuzz -infinality X adobe-cff bindist bzip2 fontforge png static-libs utils
+package.use : media-libs/freetype:2 -auto-hinter -debug -doc -harfbuzz -infinality X adobe-cff bindist bzip2 fontforge png static-libs utils
 
 [media-libs/freeverb3:0]
 package.use : media-libs/freeverb3:0 -audacious -cpu_flags_x86_3dnow -cpu_flags_x86_avx -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -forcefpu -jack -plugdouble -threads cpu_flags_x86_sse cpu_flags_x86_sse2 openmp
@@ -5365,6 +5366,9 @@ package.use : media-libs/glu:0 static-libs
 [media-libs/gmtk:0]
 package.use : media-libs/gmtk:0 -pulseaudio alsa dconf
 
+[media-libs/gnonlin:0.10]
+package.use : media-libs/gnonlin:0.10 -doc -test
+
 [media-libs/gnonlin:1.0]
 package.use : media-libs/gnonlin:1.0 -nls -test
 
@@ -5375,7 +5379,7 @@ package.use : media-libs/gsound:0 introspection
 package.use : media-libs/gst-plugins-bad:0.10 -nls -orc
 
 [media-libs/gst-plugins-bad:1.0]
-package.use : media-libs/gst-plugins-bad:1.0 -egl -gles2 -gtk -nls -orc -test -vcd -vnc -wayland X bzip2 introspection opengl
+package.use : media-libs/gst-plugins-bad:1.0 -egl -gles2 -gtk -nls -orc -test -vcd -vnc -wayland X introspection opengl
 
 [media-libs/gst-plugins-base:0.10]
 package.use : media-libs/gst-plugins-base:0.10 -nls -orc introspection
@@ -5526,6 +5530,9 @@ env : CPPFLAGS=-D_POSIX_SOURCE
 [media-libs/libgphoto2:0]
 package.use : media-libs/libgphoto2:0 -cameras_adc65 -cameras_agfa_cl20 -cameras_aox -cameras_ax203 -cameras_barbie -cameras_canon -cameras_casio_qv -cameras_clicksmart310 -cameras_digigr8 -cameras_digita -cameras_dimagev -cameras_dimera3500 -cameras_directory -cameras_enigma13 -cameras_fuji -cameras_gsmart300 -cameras_hp215 -cameras_iclick -cameras_jamcam -cameras_jd11 -cameras_jl2005a -cameras_jl2005c -cameras_kodak_dc120 -cameras_kodak_dc210 -cameras_kodak_dc240 -cameras_kodak_dc3200 -cameras_kodak_ez200 -cameras_konica -cameras_konica_qm150 -cameras_largan -cameras_lg_gsm -cameras_mars -cameras_mustek -cameras_panasonic_coolshot -cameras_panasonic_dc1000 -cameras_panasonic_dc1580 -cameras_panasonic_l859 -cameras_pccam300 -cameras_pccam600 -cameras_pentax -cameras_polaroid_pdc320 -cameras_polaroid_pdc640 -cameras_polaroid_pdc700 -cameras_ricoh -cameras_ricoh_g3 -cameras_samsung -cameras_sierra -cameras_sipix_blink2 -cameras_sipix_web2 -cameras_smal -cameras_sonix -cameras_sony_ds
 cf1 -cameras_sony_dscf55 -cameras_soundvision -cameras_spca50x -cameras_sq905 -cameras_st2205 -cameras_stv0674 -cameras_stv0680 -cameras_sx330z -cameras_topfield -cameras_toshiba_pdrm11 -cameras_tp6801 -doc -examples -gd -nls -serial cameras_ptp2 exif jpeg
 
+[media-libs/libharu:0]
+package.use : media-libs/libharu:0 png static-libs zlib
+
 [media-libs/libid3tag:0]
 package.use : media-libs/libid3tag:0 -debug static-libs
 
@@ -5628,9 +5635,6 @@ package.use : media-libs/libsdl2:0 -altivec -cpu_flags_x86_3dnow -custom-cflags
 [media-libs/libsdl:0]
 package.use : media-libs/libsdl:0 -custom-cflags -pulseaudio -tslib X aalib alsa dga fbcon joystick libcaca nas opengl oss sound static-libs video xinerama xv
 
-[media-libs/libsfml:0]
-package.use : media-libs/libsfml:0 -debug -doc -examples
-
 [media-libs/libshout:0]
 package.use : media-libs/libshout:0 speex static-libs theora
 
@@ -5656,7 +5660,7 @@ package.use : media-libs/libvisual:0.4 -debug -nls static-libs threads
 package.use : media-libs/libvorbis:0 static-libs
 
 [media-libs/libvpx:0]
-package.use : media-libs/libvpx:0 -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_ssse3 -doc -svc -test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 postproc static-libs threads
+package.use : media-libs/libvpx:0 -altivec -cpu_flags_x86_avx -cpu_flags_x86_avx2 -cpu_flags_x86_sse3 -cpu_flags_x86_sse4_1 -cpu_flags_x86_ssse3 -doc -test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 postproc static-libs threads
 
 [media-libs/libwebp:0]
 package.use : media-libs/libwebp:0 -experimental -swap-16bit-csp gif jpeg opengl png static-libs tiff
@@ -5670,8 +5674,11 @@ package.use : media-libs/libxtract:0 -doc -fftw static-libs
 [media-libs/libzen:0]
 package.use : media-libs/libzen:0 -doc static-libs
 
+[media-libs/mash:0.2]
+package.use : media-libs/mash:0.2 -doc -examples introspection
+
 [media-libs/mesa:0]
-package.use : media-libs/mesa:0 -d3d9 -debug -gallium -gles1 -gles2 -llvm -opencl -openmax -osmesa -selinux -vaapi -valgrind -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_ilo -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vc4 -video_cards_vmware -wayland -xa bindist classic dri3 egl gbm nptl pax_kernel pic udev video_cards_intel video_cards_nouveau video_cards_radeon xvmc
+package.use : media-libs/mesa:0 -d3d9 -debug -gallium -gles1 -gles2 -llvm -opencl -openmax -osmesa -selinux -vaapi -vdpau -video_cards_freedreno -video_cards_i915 -video_cards_i965 -video_cards_ilo -video_cards_r100 -video_cards_r200 -video_cards_r300 -video_cards_r600 -video_cards_radeonsi -video_cards_vmware -wayland -xa bindist classic dri3 egl gbm nptl pax_kernel pic udev video_cards_intel video_cards_nouveau video_cards_radeon xvmc
 
 [media-libs/musicbrainz:3]
 package.use : media-libs/musicbrainz:3 -test
@@ -5853,6 +5860,9 @@ package.use : media-plugins/gmpc-shout:0 -nls
 [media-plugins/gmpc-tagedit:0]
 package.use : media-plugins/gmpc-tagedit:0 -nls
 
+[media-plugins/gmpc-wikipedia:0]
+package.use : media-plugins/gmpc-wikipedia:0 -nls
+
 [media-plugins/gst-plugins-a52dec:0.10]
 package.use : media-plugins/gst-plugins-a52dec:0.10 -orc
 
@@ -5895,6 +5905,9 @@ package.use : media-plugins/libvisual-plugins:0.4 -debug -mplayer alsa gtk jack
 [media-radio/adifmerg:0]
 package.use : media-radio/adifmerg:0 -examples
 
+[media-radio/ax25-tools:0]
+package.use : media-radio/ax25-tools:0 X
+
 [media-radio/dxcc:0]
 package.use : media-radio/dxcc:0 tk
 
@@ -5943,6 +5956,9 @@ package.use : media-sound/aylet:0 gtk
 [media-sound/cdparanoia:0]
 package.use : media-sound/cdparanoia:0 static-libs
 
+[media-sound/cplay:0]
+package.use : media-sound/cplay:0 mp3 vorbis
+
 [media-sound/darkice:0]
 package.use : media-sound/darkice:0 -debug -libsamplerate -pulseaudio aac aacplus alsa jack mp3 opus twolame vorbis
 
@@ -5965,7 +5981,7 @@ package.use : media-sound/exaile:0 -nls cddb libnotify
 package.use : media-sound/fapg:0 -xspf
 
 [media-sound/flacon:0]
-package.use : media-sound/flacon:0 -aac -mac -opus -qt5 -replaygain -test -tta -vorbis flac mp3 wavpack
+package.use : media-sound/flacon:0 -aac -mac -opus -qt5 -replaygain -test -tta -vorbis flac mp3 qt4 wavpack
 
 [media-sound/fluidsynth:0]
 package.use : media-sound/fluidsynth:0 -debug -examples -lash -pulseaudio -sndfile alsa dbus jack ladspa portaudio readline
@@ -5979,6 +5995,9 @@ package.use : media-sound/glurp:0 -debug
 [media-sound/gmpc:0]
 package.use : media-sound/gmpc:0 -nls -xspf unique
 
+[media-sound/gnaural:0]
+package.use : media-sound/gnaural:0 -nls
+
 [media-sound/gnomad:0]
 package.use : media-sound/gnomad:0 -nls
 
@@ -5992,7 +6011,7 @@ package.use : media-sound/gom:0 -examples
 package.use : media-sound/grip:0 -nls vorbis
 
 [media-sound/guayadeque:0]
-package.use : media-sound/guayadeque:0 -ayatana -ipod minimal
+package.use : media-sound/guayadeque:0 -ayatana -ipod
 
 [media-sound/hydrogen:0]
 package.use : media-sound/hydrogen:0 -lash alsa archive jack ladspa oss portaudio
@@ -6003,6 +6022,9 @@ package.use : media-sound/jack-audio-connection-kit:0 -altivec -coreaudio -cpu_f
 [media-sound/jack-rack:0]
 package.use : media-sound/jack-rack:0 -gnome -lash alsa xml
 
+[media-sound/jokosher:0]
+package.use : media-sound/jokosher:0 -gnome
+
 [media-sound/lame:0]
 package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile frontend static-libs
 
@@ -6048,6 +6070,9 @@ package.use : media-sound/mserv:0 -vhosts vorbis
 [media-sound/mt-daapd:0]
 package.use : media-sound/mt-daapd:0 vorbis
 
+[media-sound/muse:0]
+package.use : media-sound/muse:0 -debug gtk
+
 [media-sound/ncmpc:0]
 package.use : media-sound/ncmpc:0 -artist-screen -chat-screen -colors -debug -key-screen -lirc -lyrics-screen -mouse -nls -search-screen -song-screen help-screen
 
@@ -6162,6 +6187,9 @@ package.use : media-tv/dvbtune:0 xml
 [media-video/acidrip:0]
 package.use : media-video/acidrip:0 encode
 
+[media-video/arista:0]
+package.use : media-video/arista:0 -kde -nautilus -x264 faac xvid
+
 [media-video/camorama:0]
 package.use : media-video/camorama:0 -debug
 
@@ -6184,7 +6212,7 @@ package.use : media-video/ffmpegthumbnailer:0 -gnome gtk jpeg png
 package.use : media-video/flumotion:0 -doc -test
 
 [media-video/gaupol:0]
-package.use : media-video/gaupol:0 -test spell
+package.use : media-video/gaupol:0 spell
 
 [media-video/gnome-mplayer:0]
 package.use : media-video/gnome-mplayer:0 -gda -gnome -ipod -pulseaudio alsa dbus dconf libnotify musicbrainz
@@ -6201,8 +6229,11 @@ package.use : media-video/mediainfo:0 -wxwidgets curl mms
 [media-video/mjpegtools:1]
 package.use : media-video/mjpegtools:1 cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs
 
+[media-video/motion:0]
+package.use : media-video/motion:0 -libav -mysql -postgres ffmpeg v4l
+
 [media-video/mplayer:0]
-package.use : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vcd -vdpau -vidix -x264 -xanim -yuv4mpeg X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga directfb dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg jpeg2k ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga video_cards_s3virge video_cards_tdfx vorbis xinerama xscreensaver xv xvid xvmc zoran
+package.use : media-video/mplayer:0 -altivec -aqua -bluray -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_ssse3 -cpudetection -debug -doc -faad -lirc -live -pulseaudio -rar -rtc -selinux -toolame -tremor -vcd -vdpau -vidix -x264 -yuv4mpeg X a52 aalib alsa bidi bl bs2b cddb cdio cdparanoia cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 dga directfb dts dv dvb dvd dvdnav enca encode faac fbcon ftp ggi gif gsm iconv ipv6 jack joystick jpeg jpeg2k ladspa libass libcaca libmpeg2 lzo mad md5sum mng mp3 nas network nut openal opengl osdmenu oss png pnm pvr radio rtmp samba sdl shm speex tga theora truetype twolame unicode v4l video_cards_mga video_cards_s3virge video_cards_tdfx vorbis xanim xinerama xscreensaver xv xvid xvmc zoran
 
 [media-video/parole:0]
 package.use : media-video/parole:0 -clutter -debug libnotify taglib
@@ -6220,7 +6251,7 @@ package.use : media-video/subtitleeditor:0 -debug -nls
 package.use : media-video/transcode:0 -altivec -cpu_flags_x86_3dnow -imagemagick -mjpeg -nuv -pic -truetype -x264 X a52 aac alsa cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dv dvd iconv jpeg lzo mp3 mpeg ogg oss postproc quicktime sdl theora v4l vorbis xml xvid
 
 [media-video/ushare:0]
-package.use : media-video/ushare:0 -nls
+package.use : media-video/ushare:0 -dlna -nls
 
 [media-video/x264-encoder:0]
 package.use : media-video/x264-encoder:0 -10bit -avs -custom-cflags -ffmpegsource -mp4 ffmpeg interlaced threads
@@ -6280,7 +6311,7 @@ package.use : net-analyzer/munin:0 -apache -asterisk -dhcpd -doc -http -ipmi -ir
 package.use : net-analyzer/nagstamon:0 -gnome -sound
 
 [net-analyzer/net-snmp:0]
-package.use : net-analyzer/net-snmp:0 -doc -elf -libressl -lm_sensors -mfd-rewrites -minimal -mysql -netlink -pci -rpm -selinux -smux -ucd-compat X bzip2 ipv6 perl python ssl tcpd zlib
+package.use : net-analyzer/net-snmp:0 -doc -elf -libressl -lm_sensors -mfd-rewrites -minimal -mysql -netlink -pci -rpm -selinux -ucd-compat X bzip2 ipv6 perl python ssl tcpd zlib
 
 [net-analyzer/netcat:0]
 package.use : net-analyzer/netcat:0 -static crypt ipv6
@@ -6325,7 +6356,7 @@ package.use : net-analyzer/sflowtool:0 -debug
 package.use : net-analyzer/ssldump:0 ssl
 
 [net-analyzer/tcpdump:0]
-package.use : net-analyzer/tcpdump:0 -libressl -smi -test drop-root samba ssl suid
+package.use : net-analyzer/tcpdump:0 -smi -test drop-root ipv6 samba ssl suid
 
 [net-analyzer/tcpstat:0]
 package.use : net-analyzer/tcpstat:0 ipv6
@@ -6345,6 +6376,9 @@ package.use : net-analyzer/yersinia:0 gtk ncurses
 [net-analyzer/zabbix:0]
 package.use : net-analyzer/zabbix:0 -agent -frontend -java -libxml2 -mysql -openipmi -oracle -postgres -proxy -server -snmp -ssh -static -xmpp curl ipv6 ldap odbc sqlite
 
+[net-dialup/capi4k-utils:0]
+package.use : net-dialup/capi4k-utils:0 -fax -rcapid pppd
+
 [net-dialup/freeradius:0]
 package.use : net-dialup/freeradius:0 -debug -firebird -kerberos -mysql -oracle -pam -pcap -postgres iodbc ldap odbc python readline sqlite ssl
 
@@ -6381,6 +6415,9 @@ package.use : net-dns/ddclient:0 hardened
 [net-dns/djbdns:0]
 package.use : net-dns/djbdns:0 -selinux ipv6
 
+[net-dns/dnstop:0]
+package.use : net-dns/dnstop:0 ipv6
+
 [net-dns/idnkit:0]
 package.use : net-dns/idnkit:0 static-libs
 
@@ -6426,7 +6463,7 @@ package.use : net-ftp/frox:0 -clamav -transparent ssl
 package.use : net-ftp/ftpbase:0 -pam
 
 [net-ftp/lftp:0]
-package.use : net-ftp/lftp:0 -convert-mozilla-cookies -libressl -nls -socks5 -verify-file gnutls idn ipv6 ssl
+package.use : net-ftp/lftp:0 -convert-mozilla-cookies -nls -openssl -socks5 -verify-file gnutls idn ipv6 ssl
 
 [net-ftp/ncftp:0]
 package.use : net-ftp/ncftp:0 -pch ipv6
@@ -6450,13 +6487,13 @@ package.use : net-im/mcabber:0 -aspell -otr crypt idn modules spell ssl vim-synt
 package.use : net-im/minbif:0 -gnutls -pam -xinetd imlib libcaca
 
 [net-im/pidgin:0]
-package.use : net-im/pidgin:0 -aqua -debug -doc -eds -gadu -groupwise -meanwhile -mxit -networkmanager -nls -prediction -silc -zephyr dbus gnutls gstreamer gtk idn ncurses perl pie python sasl spell tcl tk xscreensaver zeroconf
+package.use : net-im/pidgin:0 -aqua -debug -doc -eds -gadu -groupwise -meanwhile -mxit -networkmanager -nls -prediction -silc -zephyr dbus gnutls gstreamer gtk idn ncurses perl python sasl spell tcl tk xscreensaver zeroconf
 
 [net-im/pork:0]
 package.use : net-im/pork:0 perl
 
 [net-im/prosody:0]
-package.use : net-im/prosody:0 -jit -libevent -libressl -mysql -postgres ipv6 sqlite ssl zlib
+package.use : net-im/prosody:0 -jit -libevent -mysql -postgres ipv6 sqlite ssl zlib
 
 [net-im/pyaim-t:0]
 package.use : net-im/pyaim-t:0 -webinterface
@@ -6465,11 +6502,14 @@ package.use : net-im/pyaim-t:0 -webinterface
 package.use : net-im/pyicq-t:0 -webinterface
 
 [net-im/telepathy-mission-control:0]
-package.use : net-im/telepathy-mission-control:0 -debug -networkmanager
+package.use : net-im/telepathy-mission-control:0 -debug -networkmanager -systemd -upower
 
 [net-im/tkabber:0]
 package.use : net-im/tkabber:0 -plugins ssl
 
+[net-irc/atheme-services:0]
+package.use : net-irc/atheme-services:0 -largenet -nls -profile cracklib ldap pcre perl ssl
+
 [net-irc/bip:0]
 package.use : net-irc/bip:0 -debug -freenode -noctcp -oidentd vim-syntax
 
@@ -6524,8 +6564,8 @@ package.use : net-libs/daq:0 -ipq -nfq afpacket dump ipv6 pcap static-libs
 [net-libs/enet:1.3]
 package.use : net-libs/enet:1.3 static-libs
 
-[net-libs/farstream:0.2]
-package.use : net-libs/farstream:0.2 -test -upnp introspection
+[net-libs/farstream:0.1]
+package.use : net-libs/farstream:0.1 -test introspection python upnp
 
 [net-libs/glib-networking:0]
 package.use : net-libs/glib-networking:0 -libproxy -test gnome smartcard ssl
@@ -6627,7 +6667,7 @@ package.use : net-libs/liboping:0 perl
 package.use : net-libs/libosip:2 -test
 
 [net-libs/libpcap:0]
-package.use : net-libs/libpcap:0 -canusb -netlink bluetooth dbus static-libs
+package.use : net-libs/libpcap:0 -canusb -netlink bluetooth dbus ipv6 static-libs
 
 [net-libs/libproxy:0]
 package.use : net-libs/libproxy:0 -gnome -kde -mono -networkmanager -spidermonkey -test perl python webkit
@@ -6641,11 +6681,11 @@ package.use : net-libs/librouteros:0 -debug static-libs
 [net-libs/librsync:0]
 package.accept_keywords : =net-libs/librsync-2.0.0-r1 ~amd64
 
-[net-libs/libsoup:2.4]
-package.use : net-libs/libsoup:2.4 -debug -gssapi -test -vala introspection samba ssl
+[net-libs/libsoup-gnome:2.4]
+package.use : net-libs/libsoup-gnome:2.4 -debug introspection
 
-[net-libs/libsrtp:0]
-package.use : net-libs/libsrtp:0 -aesicm -console -debug -doc -static-libs -syslog
+[net-libs/libsoup:2.4]
+package.use : net-libs/libsoup:2.4 -debug -test -vala introspection samba ssl
 
 [net-libs/libssh2:0]
 package.use : net-libs/libssh2:0 -gcrypt -libressl -static-libs -test zlib
@@ -6672,11 +6712,14 @@ package.use : net-libs/net6:0 -nls static-libs
 package.use : net-libs/obby:0 -nls -zeroconf ipv6 static-libs
 
 [net-libs/rest:0.7]
-package.use : net-libs/rest:0.7 -test introspection
+package.use : net-libs/rest:0.7 -test gnome introspection
 
 [net-libs/serf:1]
 package.use : net-libs/serf:1 -kerberos
 
+[net-libs/socket++:0]
+package.use : net-libs/socket++:0 -debug -static-libs
+
 [net-libs/socket_wrapper:0]
 package.use : net-libs/socket_wrapper:0 -test
 
@@ -6690,10 +6733,13 @@ package.use : net-libs/telepathy-glib:0 -debug -test introspection vala
 package.use : net-libs/webkit-gtk:2 -aqua -coverage -debug -gles2 -gnome-keyring -jit -test X egl geoloc gstreamer introspection opengl spell webgl
 
 [net-libs/webkit-gtk:3]
-package.use : net-libs/webkit-gtk:3 -aqua -coverage -debug -gles2 -gnome-keyring -jit -test -wayland X egl geolocation gstreamer introspection opengl spell webgl
+package.use : net-libs/webkit-gtk:3 -aqua -coverage -debug -gles2 -gnome-keyring -jit -test -wayland X egl geoloc gstreamer introspection opengl spell webgl
 
 [net-libs/webkit-gtk:4]
-package.use : net-libs/webkit-gtk:4 -aqua -coverage -doc -gles2 -gnome-keyring -jit -libnotify -nsplugin -spell -test -wayland X egl geolocation gstreamer introspection opengl webgl
+package.use : net-libs/webkit-gtk:4 -aqua -coverage -doc -gles2 -gnome-keyring -jit -nsplugin -spell -test -wayland X egl geoloc gstreamer introspection opengl webgl
+
+[net-libs/wt:0]
+package.use : net-libs/wt:0 -doc -fcgi -graphicsmagick -mysql -postgres -resources -test extjs pdf server sqlite ssl zlib
 
 [net-libs/zeromq:0]
 package.use : net-libs/zeromq:0 -pgm -test static-libs
@@ -6789,7 +6835,10 @@ package.use : net-misc/dibbler:0 -doc
 package.use : net-misc/dnetstats:0 -policykit
 
 [net-misc/dropbox:0]
-package.use : net-misc/dropbox:0 -selinux X librsync-bundled
+package.use : net-misc/dropbox:0 X librsync-bundled
+
+[net-misc/gogoc:0]
+package.use : net-misc/gogoc:0 -debug
 
 [net-misc/gwget:0]
 package.use : net-misc/gwget:0 -epiphany libnotify
@@ -6816,7 +6865,7 @@ package.use : net-misc/knock:0 server
 package.use : net-misc/linux-identd:0 xinetd
 
 [net-misc/lldpd:0]
-package.use : net-misc/lldpd:0 -cdp -doc -edp -fdp -graph -jansson -old-kernel -sanitizers -seccomp -snmp -sonmp -zsh-completion dot1 dot3 lldpmed readline static-libs xml
+package.use : net-misc/lldpd:0 -cdp -doc -edp -fdp -graph -jansson -json-c -seccomp -snmp -sonmp -zsh-completion dot1 dot3 lldpmed readline static-libs xml
 
 [net-misc/mediatomb:0]
 package.use : net-misc/mediatomb:0 -debug -id3tag -lastfm -libextractor -mysql -thumbnail curl exif ffmpeg flac inotify javascript magic mp4 sqlite taglib zlib
@@ -6833,6 +6882,9 @@ package.use : net-misc/modemmanager:0 -mbim -policykit -qmi-newest introspection
 [net-misc/mosh:0]
 package.use : net-misc/mosh:0 -examples -ufw client mosh-hardening server utempter
 
+[net-misc/netfleet:0]
+package.use : net-misc/netfleet:0 -debug
+
 [net-misc/netkit-talk:0]
 package.use : net-misc/netkit-talk:0 ipv6
 
@@ -6845,8 +6897,11 @@ package.use : net-misc/olsrd:0 gtk
 [net-misc/omniORB:0]
 package.use : net-misc/omniORB:0 -doc ssl static-libs
 
+[net-misc/openntpd:0]
+package.use : net-misc/openntpd:0 -selinux
+
 [net-misc/openssh:0]
-package.use : net-misc/openssh:0 -X509 -bindist -debug -hpn -kerberos -ldns -libedit -libressl -livecd -pam -sctp -selinux -ssh1 -static -test X ldap pie skey ssl
+package.use : net-misc/openssh:0 -X509 -bindist -debug -hpn -kerberos -ldns -libedit -libressl -pam -sctp -selinux -ssh1 -static X ldap pie skey ssl
 
 [net-misc/pen:0]
 package.use : net-misc/pen:0 geoip ssl
@@ -6888,7 +6943,7 @@ package.use : net-misc/sitecopy:0 -expat -nls -rsh -webdav ssl xml zlib
 package.use : net-misc/sobby:0 -zeroconf
 
 [net-misc/sslh:0]
-package.use : net-misc/sslh:0 -caps -systemd tcpd
+package.use : net-misc/sslh:0 -caps tcpd
 
 [net-misc/ssvnc:0]
 package.use : net-misc/ssvnc:0 -java
@@ -6905,6 +6960,9 @@ package.use : net-misc/stunnel:0 -libressl -selinux -stunnel3 ipv6 ssl tcpd
 [net-misc/suite3270:0]
 package.use : net-misc/suite3270:0 -cjk -doc X ncurses ssl tcl
 
+[net-misc/tightvnc:0]
+package.use : net-misc/tightvnc:0 -java server tcpd
+
 [net-misc/tor:0]
 package.use : net-misc/tor:0 -bufferevents -libressl -scrypt -seccomp -selinux -stats -systemd -test -tor-hardening -transparent-proxy -web
 
@@ -6915,7 +6973,7 @@ package.use : net-misc/vinagre:0 -rdp -spice -zeroconf ssh telepathy
 package.use : net-misc/vtun:0 -socks5 lzo ssl zlib
 
 [net-misc/wget:0]
-package.use : net-misc/wget:0 -debug -libressl -nls -ntlm -static -test gnutls idn ipv6 pcre ssl uuid zlib
+package.use : net-misc/wget:0 -debug -nls -ntlm -static -test gnutls idn ipv6 pcre ssl uuid zlib
 
 [net-misc/wol:0]
 package.use : net-misc/wol:0 -nls
@@ -6945,7 +7003,7 @@ package.use : net-nds/openldap:0 -debug -experimental -kerberos -minimal -overla
 package.use : net-news/liferea:0 -ayatana libnotify
 
 [net-news/quiterss:0]
-package.use : net-news/quiterss:0 -phonon -qt5
+package.use : net-news/quiterss:0 -debug -phonon
 
 [net-nntp/nzbget:0]
 package.use : net-nntp/nzbget:0 -debug -parcheck gnutls ncurses ssl zlib
@@ -6981,7 +7039,7 @@ package.use : net-p2p/torrentinfo:0 -test
 package.use : net-p2p/transmission-remote-gtk:0 -ayatana -debug -libproxy geoip libnotify
 
 [net-p2p/transmission:0]
-package.use : net-p2p/transmission:0 -ayatana -libressl -lightweight -qt5 -systemd -xfs gtk qt4
+package.use : net-p2p/transmission:0 -ayatana -lightweight -qt5 -systemd -xfs gtk qt4
 
 [net-print/cups-filters:0]
 package.use : net-print/cups-filters:0 -ldap dbus foomatic jpeg perl png static-libs tiff zeroconf
@@ -7031,9 +7089,6 @@ package.use : net-proxy/squid:0 -ecap -esi -ipf-transparent -kerberos -kqueue -l
 [net-proxy/squidguard:0]
 package.use : net-proxy/squidguard:0 ldap
 
-[net-proxy/sshuttle:0]
-package.use : net-proxy/sshuttle:0 -test
-
 [net-proxy/tinyproxy:0]
 package.use : net-proxy/tinyproxy:0 -debug -minimal -reverse-proxy -test -transparent-proxy filter-proxy upstream-proxy xtinyproxy-header
 
@@ -7079,6 +7134,12 @@ package.use : net-wireless/wireless-tools:0 -multicall
 [net-wireless/wpa_supplicant:0]
 package.use : net-wireless/wpa_supplicant:0 -fasteap -libressl -ps3 -qt5 -selinux -wimax ap dbus eap-sim gnutls hs2-0 p2p qt4 readline smartcard ssl tdls uncommon-eap-types wps
 
+[perl-core/CPAN-Meta:0]
+package.use : perl-core/CPAN-Meta:0 -test
+
+[perl-core/libnet:0]
+package.use : perl-core/libnet:0 sasl
+
 [sci-astronomy/celestia:0]
 package.use : sci-astronomy/celestia:0 -debug -gnome -nls -pch cairo gtk theora threads
 
@@ -7100,6 +7161,9 @@ package.use : sci-biology/augustus:0 -examples
 [sci-biology/bioruby:0]
 package.use : sci-biology/bioruby:0 -doc -test
 
+[sci-biology/bowtie:2]
+package.use : sci-biology/bowtie:2 -examples cpu_flags_x86_sse2 tbb
+
 [sci-biology/cutg:0]
 package.use : sci-biology/cutg:0 -emboss -minimal
 
@@ -7365,13 +7429,13 @@ package.use : sys-apps/fbset:0 -static
 package.use : sys-apps/file:0 -python static-libs zlib
 
 [sys-apps/findutils:0]
-package.use : sys-apps/findutils:0 -nls -selinux -static -test
+package.use : sys-apps/findutils:0 -debug -nls -selinux -static -test
 
 [sys-apps/flashrom:0]
-package.use : sys-apps/flashrom:0 -atahpt -ft2232_spi -mstarddc_spi -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv -static -tools atavia buspirate_spi dediprog drkaiser dummy gfxnvidia internal internal_dmi it8212 linux_spi nicintel nicintel_eeprom nicintel_spi ogp_spi pickit2_spi pony_spi satasii serprog usbblaster_spi wiki
+package.use : sys-apps/flashrom:0 -atahpt -ft2232_spi -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv -static -tools -usbblaster bitbang_spi buspirate_spi dediprog drkaiser dummy gfxnvidia internal linux_spi nicintel nicintel_spi ogp_spi pony_spi satasii serprog wiki
 
 [sys-apps/gawk:0]
-package.use : sys-apps/gawk:0 -mpfr -nls readline
+package.use : sys-apps/gawk:0 -nls readline
 
 [sys-apps/gptfdisk:0]
 package.use : sys-apps/gptfdisk:0 -static ncurses
@@ -7383,7 +7447,7 @@ package.use : sys-apps/gradm:0 -pam
 package.use : sys-apps/grep:0 -nls -static pcre
 
 [sys-apps/groff:0]
-package.use : sys-apps/groff:0 -examples -l10n_ja X
+package.use : sys-apps/groff:0 -examples X
 
 [sys-apps/gsmartcontrol:0]
 package.use : sys-apps/gsmartcontrol:0 -test
@@ -7416,7 +7480,7 @@ package.use : sys-apps/ipmitool:0 -openipmi -static
 package.use : sys-apps/iproute2:0 -minimal -selinux atm berkdb iptables ipv6
 
 [sys-apps/irqbalance:0]
-package.use : sys-apps/irqbalance:0 -selinux caps numa
+package.use : sys-apps/irqbalance:0 caps numa
 
 [sys-apps/kbd:0]
 package.use : sys-apps/kbd:0 -nls -pam
@@ -7440,7 +7504,7 @@ package.use : sys-apps/lm_sensors:0 -sensord static-libs
 package.use : sys-apps/man-db:0 -nls -selinux berkdb gdbm manpager static-libs zlib
 
 [sys-apps/man-pages:0]
-package.use : sys-apps/man-pages:0 -l10n_da -l10n_de -l10n_fr -l10n_it -l10n_ja -l10n_nl -l10n_pl -l10n_ro -l10n_ru -l10n_zh-CN nls
+package.use : sys-apps/man-pages:0 nls
 
 [sys-apps/miscfiles:0]
 package.use : sys-apps/miscfiles:0 -minimal
@@ -7449,7 +7513,7 @@ package.use : sys-apps/miscfiles:0 -minimal
 package.use : sys-apps/mlocate:0 -nls -selinux
 
 [sys-apps/net-tools:0]
-package.use : sys-apps/net-tools:0 -nis -nls -plipconfig -selinux -slattach -static arp hostname ipv6
+package.use : sys-apps/net-tools:0 -nls -old-output -selinux -static
 
 [sys-apps/netplug:0]
 package.use : sys-apps/netplug:0 -debug -doc
@@ -7461,7 +7525,7 @@ package.use : sys-apps/openrc:0 -audit -debug -newnet -pam -prefix -selinux -too
 package.use : sys-apps/pciutils:0 -dns kmod static-libs udev zlib
 
 [sys-apps/pcsc-lite:0]
-package.use : sys-apps/pcsc-lite:0 -libusb -policykit -python -selinux udev
+package.use : sys-apps/pcsc-lite:0 -libusb -policykit -selinux udev
 
 [sys-apps/portage:0]
 package.use : sys-apps/portage:0 -build -doc -epydoc -selinux ipc xattr
@@ -7585,7 +7649,7 @@ package.use : sys-devel/autogen:0 -libopts static-libs
 package.use : sys-devel/bc:0 -libedit -static readline
 
 [sys-devel/binutils:2.25.1]
-package.use : sys-devel/binutils:2.25.1 -multitarget -nls -static-libs -test -vanilla cxx zlib
+package.use : sys-devel/binutils:2.25.1 -multislot -multitarget -nls -static-libs -test -vanilla cxx zlib
 
 [sys-devel/bison:0]
 package.use : sys-devel/bison:0 -examples -nls -static -test
@@ -7594,7 +7658,7 @@ package.use : sys-devel/bison:0 -examples -nls -static -test
 package.use : sys-devel/flex:0 -nls -static -test
 
 [sys-devel/gcc:4.9.3]
-package.use : sys-devel/gcc:4.9.3 -altivec -awt -cilk -debug -doc -fixed-point -go -libssp -multilib -nls -nopie -nossp -regression-test -sanitize -vanilla -vtv cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
+package.use : sys-devel/gcc:4.9.3 -altivec -awt -cilk -debug -doc -fixed-point -go -libssp -multilib -multislot -nls -nopie -nossp -regression-test -sanitize -vanilla -vtv cxx fortran gcj graphite hardened nptl objc objc++ objc-gc openmp
 
 [sys-devel/gdb:0]
 package.use : sys-devel/gdb:0 -expat -multitarget -nls -test -vanilla client lzma python server
@@ -7627,7 +7691,7 @@ package.use : sys-firmware/atmel-firmware:0 -pcmcia -usb
 package.use : sys-fs/cachefilesd:0 -doc -selinux
 
 [sys-fs/cryptsetup:0]
-package.use : sys-fs/cryptsetup:0 -libressl -nettle -nls -openssl -pwquality -reencrypt -static -udev -urandom gcrypt python static-libs
+package.use : sys-fs/cryptsetup:0 -nettle -nls -openssl -pwquality -reencrypt -static -udev -urandom gcrypt python static-libs
 
 [sys-fs/dd-rescue:0]
 package.use : sys-fs/dd-rescue:0 -cpu_flags_x86_avx2 -cpu_flags_x86_sse4_2 -lzo -static xattr
@@ -7654,7 +7718,7 @@ package.use : sys-fs/fuse:0 -examples static-libs
 package.use : sys-fs/lvm2:0 -clvm -cman -device-mapper-only -lvm1 -lvm2create_initrd -selinux -static -systemd -thin readline static-libs udev
 
 [sys-fs/mhddfs:0]
-package.use : sys-fs/mhddfs:0 -l10n_ru suid
+package.use : sys-fs/mhddfs:0 suid
 
 [sys-fs/mtd-utils:0]
 package.use : sys-fs/mtd-utils:0 xattr
@@ -7680,6 +7744,9 @@ package.use : sys-fs/sysfsutils:0 static-libs
 [sys-kernel/genkernel:0]
 package.use : sys-kernel/genkernel:0 -cryptsetup -ibm -selinux
 
+[sys-kernel/gentoo-sources:4.4.6]
+package.use : sys-kernel/gentoo-sources:4.4.6 -build -experimental -kdbus -symlink
+
 [sys-kernel/linux-firmware:0]
 package.use : sys-kernel/linux-firmware:0 -savedconfig
 
@@ -7730,12 +7797,6 @@ package.use : sys-libs/libkudzu:0 zlib
 [sys-libs/libraw1394:0]
 package.use : sys-libs/libraw1394:0 static-libs
 
-[sys-libs/libseccomp:0]
-package.use : sys-libs/libseccomp:0 -static-libs
-
-[sys-libs/libunwind:7]
-package.use : sys-libs/libunwind:7 -debug -debug-frame -libatomic -lzma -static-libs
-
 [sys-libs/libutempter:0]
 package.use : sys-libs/libutempter:0 static-libs
 
@@ -7800,7 +7861,7 @@ package.use : sys-process/at:0 -pam -selinux
 package.use : sys-process/daemontools:0 -selinux -static
 
 [sys-process/fcron:0]
-package.use : sys-process/fcron:0 -debug -l10n_fr -pam -selinux mta readline system-crontab
+package.use : sys-process/fcron:0 -debug -pam -selinux mta readline system-crontab
 
 [sys-process/htop:0]
 package.use : sys-process/htop:0 -oom -openvz -vserver unicode
@@ -7812,7 +7873,7 @@ package.use : sys-process/latencytop:0 gtk unicode
 package.use : sys-process/lsof:0 -examples -rpc -selinux -static ipv6
 
 [sys-process/procps:0]
-package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test kill ncurses static-libs unicode
+package.use : sys-process/procps:0 -modern-top -nls -selinux -systemd -test ncurses static-libs unicode
 
 [sys-process/psmisc:0]
 package.use : sys-process/psmisc:0 -nls -selinux X ipv6
@@ -7844,18 +7905,15 @@ package.use : virtual/libudev:0 -systemd static-libs
 [virtual/libusb:1]
 package.use : virtual/libusb:1 -udev
 
+[virtual/linux-sources:0]
+package.use : virtual/linux-sources:0 -firmware
+
 [virtual/mysql:0]
 package.use : virtual/mysql:0 -embedded -static static-libs
 
 [virtual/notification-daemon:0]
 package.use : virtual/notification-daemon:0 -gnome
 
-[virtual/ruby-ffi:0]
-package.use : virtual/ruby-ffi:0
-
-[virtual/rubygems:0]
-package.use : virtual/rubygems:0
-
 [virtual/service-manager:0]
 package.use : virtual/service-manager:0 -prefix
 
@@ -7908,16 +7966,23 @@ package.use : www-apps/viewvc:0 -cvs -cvsgraph -mod_wsgi -mysql -pygments -vhost
 package.use : www-client/httrack:0 static-libs
 
 [www-client/links:2]
-package.use : www-client/links:2 -libressl -livecd -suid -svga X bzip2 directfb fbcon gpm ipv6 jpeg lzma ssl tiff unicode zlib
+package.use : www-client/links:2 -livecd -suid -svga X bzip2 directfb fbcon gpm ipv6 jpeg lzma ssl tiff unicode zlib
 
 [www-client/lynx:0]
 package.use : www-client/lynx:0 -cjk -nls bzip2 gnutls idn ipv6 ssl unicode
 
+[www-client/midori:0]
+package.use : www-client/midori:0 -deprecated -doc -granite -introspection -jit -xscreensaver -zeitgeist webkit2
+package.accept_keywords : =www-client/midori-0.5.11-r1 ~amd64
+
+[www-client/opera:0]
+package.use : www-client/opera:0 -kde -multilib gstreamer gtk
+
 [www-client/pybugz:0]
 package.use : www-client/pybugz:0 -zsh-completion
 
 [www-client/qupzilla:0]
-package.use : www-client/qupzilla:0 -debug -kde -libressl -nonblockdialogs dbus gnome-keyring
+package.use : www-client/qupzilla:0 -debug -kde -libressl -nonblockdialogs -qt5 dbus gnome-keyring qt4
 
 [www-client/surf:0]
 package.use : www-client/surf:0 -savedconfig
@@ -7941,7 +8006,7 @@ package.use : www-misc/profile-sync-daemon:0 -systemd
 package.use : www-plugins/gecko-mediaplayer:0 curl
 
 [www-servers/apache:2]
-package.use : www-servers/apache:2 -apache2_modules_access_compat -apache2_modules_asis -apache2_modules_auth_digest -apache2_modules_authn_dbd -apache2_modules_authz_dbd -apache2_modules_cache_disk -apache2_modules_cern_meta -apache2_modules_charset_lite -apache2_modules_dbd -apache2_modules_dumpio -apache2_modules_http2 -apache2_modules_ident -apache2_modules_imagemap -apache2_modules_lbmethod_bybusyness -apache2_modules_lbmethod_byrequests -apache2_modules_lbmethod_bytraffic -apache2_modules_lbmethod_heartbeat -apache2_modules_log_forensic -apache2_modules_macro -apache2_modules_proxy -apache2_modules_proxy_ajp -apache2_modules_proxy_balancer -apache2_modules_proxy_connect -apache2_modules_proxy_fcgi -apache2_modules_proxy_ftp -apache2_modules_proxy_html -apache2_modules_proxy_http -apache2_modules_proxy_scgi -apache2_modules_proxy_wstunnel -apache2_modules_ratelimit -apache2_modules_remoteip -apache2_modules_reqtimeout -apache2_modules_slotmem_shm -apache2_modules_substitute -ap
 ache2_modules_version -apache2_mpms_event -apache2_mpms_prefork -apache2_mpms_worker -debug -doc -libressl -selinux -static -suexec apache2_modules_actions apache2_modules_alias apache2_modules_auth_basic apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_deflate apache2_modules_dir apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_logio apache2_modules_mime apache2_modules_mime_magic ap
 ache2_modules_negotiation apache2_modules_rewrite apache2_modules_setenvif apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_unique_id apache2_modules_unixd apache2_modules_userdir apache2_modules_usertrack apache2_modules_vhost_alias ldap ssl threads
+package.use : www-servers/apache:2 -apache2_modules_access_compat -apache2_modules_asis -apache2_modules_auth_digest -apache2_modules_authn_dbd -apache2_modules_authz_dbd -apache2_modules_cache_disk -apache2_modules_cern_meta -apache2_modules_charset_lite -apache2_modules_dbd -apache2_modules_dumpio -apache2_modules_http2 -apache2_modules_ident -apache2_modules_imagemap -apache2_modules_lbmethod_bybusyness -apache2_modules_lbmethod_byrequests -apache2_modules_lbmethod_bytraffic -apache2_modules_lbmethod_heartbeat -apache2_modules_log_forensic -apache2_modules_macro -apache2_modules_proxy -apache2_modules_proxy_ajp -apache2_modules_proxy_balancer -apache2_modules_proxy_connect -apache2_modules_proxy_fcgi -apache2_modules_proxy_ftp -apache2_modules_proxy_html -apache2_modules_proxy_http -apache2_modules_proxy_scgi -apache2_modules_proxy_wstunnel -apache2_modules_ratelimit -apache2_modules_remoteip -apache2_modules_reqtimeout -apache2_modules_slotmem_shm -apache2_modules_substitute -ap
 ache2_modules_version -apache2_mpms_event -apache2_mpms_peruser -apache2_mpms_prefork -apache2_mpms_worker -debug -doc -libressl -selinux -static -suexec apache2_modules_actions apache2_modules_alias apache2_modules_auth_basic apache2_modules_authn_alias apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authz_core apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_cache apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_deflate apache2_modules_dir apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers apache2_modules_include apache2_modules_info apache2_modules_log_config apache2_modules_logio apache2_modules_mime apache2
 _modules_mime_magic apache2_modules_negotiation apache2_modules_rewrite apache2_modules_setenvif apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_unique_id apache2_modules_unixd apache2_modules_userdir apache2_modules_usertrack apache2_modules_vhost_alias ldap ssl threads
 
 [www-servers/gunicorn:0]
 package.use : www-servers/gunicorn:0 -doc -examples -test
@@ -7977,7 +8042,7 @@ package.use : x11-apps/xsm:0 -rsh
 package.use : x11-base/xorg-drivers:0 -input_devices_libinput -input_devices_vmmouse -video_cards_amdgpu -video_cards_dummy -video_cards_fglrx -video_cards_freedreno -video_cards_geode -video_cards_i740 -video_cards_nvidia -video_cards_omap -video_cards_omapfb -video_cards_radeonsi -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx -video_cards_tegra -video_cards_via -video_cards_virtualbox -video_cards_vmware -video_cards_voodoo input_devices_acecad input_devices_aiptek input_devices_elographics input_devices_evdev input_devices_fpit input_devices_hyperpen input_devices_joystick input_devices_keyboard input_devices_mouse input_devices_mutouch input_devices_penmount input_devices_synaptics input_devices_tslib input_devices_void input_devices_wacom video_cards_apm video_cards_ast video_cards_chips video_cards_cirrus video_cards_epson video_cards_fbdev video_cards_glint video_cards_i128 video_car
 ds_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nouveau video_cards_nv video_cards_qxl video_cards_r128 video_cards_radeon video_cards_rendition video_cards_s3 video_cards_s3virge video_cards_savage video_cards_siliconmotion video_cards_sisusb video_cards_tdfx video_cards_tga video_cards_trident video_cards_tseng video_cards_vesa
 
 [x11-base/xorg-server:0]
-package.use : x11-base/xorg-server:0 -dmx -doc -kdrive -libressl -minimal -selinux -systemd -tslib -unwind -wayland -xephyr -xnest -xvfb glamor ipv6 static-libs suid udev xorg
+package.use : x11-base/xorg-server:0 -dmx -doc -glamor -kdrive -libressl -minimal -selinux -systemd -tslib -unwind -wayland -xephyr -xnest -xvfb ipv6 nptl static-libs suid udev xorg
 
 [x11-drivers/xf86-input-mtrack:0]
 package.use : x11-drivers/xf86-input-mtrack:0 -debug
@@ -7999,6 +8064,9 @@ package.use : x11-drivers/xf86-video-mach64:0 dri
 [x11-drivers/xf86-video-mga:0]
 package.use : x11-drivers/xf86-video-mga:0 dri
 
+[x11-drivers/xf86-video-nouveau:0]
+package.use : x11-drivers/xf86-video-nouveau:0 -glamor
+
 [x11-drivers/xf86-video-openchrome:0]
 package.use : x11-drivers/xf86-video-openchrome:0 -debug -viaregtool
 
@@ -8043,6 +8111,9 @@ package.use : x11-libs/glamor:0 -gles static-libs xv
 package.env : x11-libs/glamor:0 x11-libs_glamor_0
 env : CPPFLAGS="-D_GNU_SOURCE"
 
+[x11-libs/glamor:0]
+package.use : x11-libs/glamor:0 -gles static-libs xv
+
 [x11-libs/gnome-pty-helper:0]
 package.use : x11-libs/gnome-pty-helper:0 hardened
 
@@ -8056,7 +8127,7 @@ package.use : x11-libs/goocanvas:0 -examples
 package.use : x11-libs/gtk+:2 -aqua -debug -examples -test cups introspection vim-syntax xinerama
 
 [x11-libs/gtk+:3]
-package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -examples -test -wayland X cups introspection vim-syntax xinerama
+package.use : x11-libs/gtk+:3 -aqua -broadway -cloudprint -colord -debug -examples -test -wayland X cups introspection vim-syntax xinerama
 
 [x11-libs/gtk+extra:0]
 package.use : x11-libs/gtk+extra:0 -test introspection static-libs
@@ -8197,7 +8268,7 @@ package.use : x11-libs/libdesktop-agnostic:0 -debug -glade -gnome gconf introspe
 package.use : x11-libs/libdockapp:0 X
 
 [x11-libs/libdrm:0]
-package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_amdgpu -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vc4 -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
+package.use : x11-libs/libdrm:0 -libkms -valgrind -video_cards_amdgpu -video_cards_exynos -video_cards_freedreno -video_cards_omap -video_cards_tegra -video_cards_vmware static-libs video_cards_intel video_cards_nouveau video_cards_radeon
 
 [x11-libs/libfontenc:0]
 package.use : x11-libs/libfontenc:0 static-libs
@@ -8211,9 +8282,6 @@ package.use : x11-libs/libnotify:0 -test introspection
 [x11-libs/libpciaccess:0]
 package.use : x11-libs/libpciaccess:0 static-libs zlib
 
-[x11-libs/libqxt:0]
-package.use : x11-libs/libqxt:0 -debug -doc -sql -web -xscreensaver -zeroconf berkdb
-
 [x11-libs/libva-intel-driver:0]
 package.use : x11-libs/libva-intel-driver:0 -wayland X drm
 
@@ -8254,7 +8322,7 @@ package.use : x11-libs/libxshmfence:0 static-libs
 package.use : x11-libs/motif:0 -examples -xft jpeg motif22-compatibility png static-libs unicode
 
 [x11-libs/pango:0]
-package.use : x11-libs/pango:0 -test X introspection
+package.use : x11-libs/pango:0 -debug -test X introspection
 
 [x11-libs/pixman:0]
 package.use : x11-libs/pixman:0 -altivec -cpu_flags_x86_ssse3 -iwmmxt -loongson2f -neon cpu_flags_x86_mmxext cpu_flags_x86_sse2 static-libs
@@ -8403,9 +8471,6 @@ package.use : x11-misc/synergy:0 -test qt4
 [x11-misc/touchfreeze:0]
 package.use : x11-misc/touchfreeze:0 -debug
 
-[x11-misc/treeline:0]
-package.use : x11-misc/treeline:0 -l10n_de -l10n_fr
-
 [x11-misc/wbar:0]
 package.use : x11-misc/wbar:0 gtk
 
@@ -8443,7 +8508,7 @@ package.use : x11-misc/xnots:0 vim-syntax
 package.use : x11-misc/xosview:0 suid
 
 [x11-misc/xscreensaver:0]
-package.use : x11-misc/xscreensaver:0 -gdm -new-login -offensive -pam -selinux jpeg opengl perl suid xinerama
+package.use : x11-misc/xscreensaver:0 -gdm -new-login -pam -selinux jpeg opengl perl suid xinerama
 
 [x11-misc/xxkb:0]
 package.use : x11-misc/xxkb:0 svg
@@ -8578,7 +8643,7 @@ package.use : x11-terms/valaterm:0 -nls
 package.use : x11-terms/xfce4-terminal:0 -debug
 
 [x11-terms/xterm:0]
-package.use : x11-terms/xterm:0 -toolbar -truetype -xinerama Xaw3d openpty unicode
+package.use : x11-terms/xterm:0 -toolbar -truetype Xaw3d openpty unicode
 
 [x11-themes/adwaita-icon-theme:0]
 package.use : x11-themes/adwaita-icon-theme:0 -branding

diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index 57bd270..e42e18f 100644
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@@ -4,6 +4,7 @@ app-arch/file-roller
 app-editors/gedit
 app-editors/nano
 app-editors/vim
+app-misc/tmux
 app-office/abiword
 app-portage/gentoolkit
 app-portage/grs
@@ -61,5 +62,3 @@ xfce-base/xfce4-appfinder
 xfce-base/xfce4-meta
 xfce-extra/thunar-archive-plugin
 xfce-extra/thunar-shares-plugin
-xfce-extra/xfce4-mixer
-xfce-extra/xfce4-volumed

diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index e3e3651..3c22352 100644
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
@@ -4,6 +4,7 @@ app-arch/file-roller
 app-editors/gedit
 app-editors/nano
 app-editors/vim
+app-misc/tmux
 app-office/abiword
 app-office/gnumeric
 app-portage/gentoolkit
@@ -63,5 +64,3 @@ xfce-base/xfce4-appfinder
 xfce-base/xfce4-meta
 xfce-extra/thunar-archive-plugin
 xfce-extra/thunar-shares-plugin
-xfce-extra/xfce4-mixer
-xfce-extra/xfce4-volumed

diff --git a/scripts/kernel-config b/scripts/kernel-config
index 5985a28..5b46a42 100644
--- a/scripts/kernel-config
+++ b/scripts/kernel-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.7.10-hardened Kernel Configuration
+# Linux/x86 4.13.8 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -39,14 +39,13 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
-CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_DEBUG_RODATA=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
 
 #
 # General setup
@@ -76,6 +75,7 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
+CONFIG_USELIB=y
 CONFIG_AUDIT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 CONFIG_AUDITSYSCALL=y
@@ -87,14 +87,18 @@ CONFIG_AUDIT_TREE=y
 #
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_IRQ_CHIP=y
 CONFIG_IRQ_DOMAIN=y
 CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_GENERIC_MSI_IRQ=y
 CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
@@ -134,18 +138,19 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TREE_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
 CONFIG_TASKS_RCU=y
 CONFIG_RCU_STALL_COMMON=y
-# CONFIG_RCU_EXPEDITE_BOOT is not set
+CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_CGROUPS=y
@@ -161,6 +166,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
@@ -168,7 +174,10 @@ CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
 # CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
@@ -200,6 +209,7 @@ CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_POSIX_TIMERS=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
@@ -219,10 +229,12 @@ CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
+CONFIG_USERFAULTFD=y
 CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PC104=y
 
 #
 # Kernel Performance Events And Counters
@@ -231,13 +243,18 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_MEMCG_SYSFS_ON=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_CRASH_CORE=y
 CONFIG_KEXEC_CORE=y
 CONFIG_OPROFILE=m
 # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
@@ -247,7 +264,8 @@ CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 CONFIG_OPTPROBES=y
-# CONFIG_UPROBES is not set
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -262,6 +280,9 @@ CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -269,6 +290,7 @@ CONFIG_HAVE_HW_BREAKPOINT=y
 CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
 CONFIG_HAVE_PERF_REGS=y
 CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
@@ -281,16 +303,19 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
+# CONFIG_GCC_PLUGINS is not set
 CONFIG_HAVE_CC_STACKPROTECTOR=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
 # CONFIG_CC_STACKPROTECTOR_REGULAR is not set
 CONFIG_CC_STACKPROTECTOR_STRONG=y
+CONFIG_THIN_ARCHIVES=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -301,6 +326,7 @@ CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_HAVE_COPY_THREAD_TLS=y
 CONFIG_HAVE_STACK_VALIDATION=y
 # CONFIG_HAVE_ARCH_HASH is not set
@@ -308,10 +334,20 @@ CONFIG_ISA_BUS_API=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
+# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+# CONFIG_REFCOUNT_FULL is not set
 
 #
 # GCOV-based kernel profiling
 #
+# CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_SLABINFO=y
@@ -321,7 +357,7 @@ CONFIG_MODULES=y
 # CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
-CONFIG_MODVERSIONS=y
+# CONFIG_MODVERSIONS is not set
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODULE_SIG=y
 # CONFIG_MODULE_SIG_FORCE is not set
@@ -335,11 +371,19 @@ CONFIG_MODULE_SIG_HASH="sha512"
 # CONFIG_MODULE_COMPRESS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
+CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_CMDLINE_PARSER=y
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_WBT_SQ is not set
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_SED_OPAL=y
 
 #
 # Partition Types
@@ -366,6 +410,8 @@ CONFIG_EFI_PARTITION=y
 CONFIG_SYSV68_PARTITION=y
 CONFIG_CMDLINE_PARTITION=y
 CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
 
 #
 # IO Schedulers
@@ -374,10 +420,14 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_MQ_IOSCHED_DEADLINE=m
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=y
@@ -406,6 +456,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y
 CONFIG_X86_X2APIC=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_GOLDFISH is not set
+# CONFIG_INTEL_RDT_A is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
 CONFIG_X86_NUMACHIP=y
 # CONFIG_X86_VSMP is not set
@@ -415,19 +466,26 @@ CONFIG_X86_NUMACHIP=y
 CONFIG_X86_INTEL_LPSS=y
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_IOSF_MBI=y
+CONFIG_IOSF_MBI_DEBUG=y
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
 CONFIG_PARAVIRT_SPINLOCKS=y
+# CONFIG_QUEUED_LOCK_STAT is not set
 CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_PV_SMP=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
 CONFIG_XEN_512GB=y
 CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
 CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
+CONFIG_KVM_DEBUG_FS=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
@@ -455,10 +513,11 @@ CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
-# CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=256
+CONFIG_MAXSMP=y
+CONFIG_NR_CPUS=8192
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
@@ -466,6 +525,7 @@ CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 CONFIG_X86_MCE=y
+CONFIG_X86_MCELOG_LEGACY=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_THRESHOLD=y
@@ -478,8 +538,10 @@ CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_PERF_EVENTS_INTEL_UNCORE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=m
 CONFIG_PERF_EVENTS_INTEL_CSTATE=m
-CONFIG_PERF_EVENTS_AMD_POWER=m
+# CONFIG_PERF_EVENTS_AMD_POWER is not set
 # CONFIG_VM86 is not set
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
 CONFIG_X86_VSYSCALL_EMULATION=y
 CONFIG_I8K=m
 CONFIG_MICROCODE=y
@@ -496,11 +558,12 @@ CONFIG_AMD_NUMA=y
 CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=10
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -513,9 +576,9 @@ CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y
 CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_GENERIC_GUP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
-CONFIG_MOVABLE_NODE=y
 CONFIG_HAVE_BOOTMEM_INFO_NODE=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
@@ -536,28 +599,37 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
 CONFIG_TRANSPARENT_HUGEPAGE=y
-CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
-# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
 CONFIG_CLEANCACHE=y
 CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
 CONFIG_CMA_AREAS=7
+CONFIG_MEM_SOFT_DIRTY=y
 CONFIG_ZSWAP=y
 CONFIG_ZPOOL=y
 CONFIG_ZBUD=y
 CONFIG_Z3FOLD=m
 CONFIG_ZSMALLOC=y
 CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
 CONFIG_GENERIC_EARLY_IOREMAP=y
 CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_ZONE_DEVICE=y
 CONFIG_ZONE_DEVICE=y
 CONFIG_FRAME_VECTOR=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
 CONFIG_X86_PMEM_LEGACY_DEVICE=y
 CONFIG_X86_PMEM_LEGACY=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -583,22 +655,30 @@ CONFIG_HZ_250=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_VERIFY_SIG=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
 CONFIG_LEGACY_VSYSCALL_EMULATE=y
 # CONFIG_LEGACY_VSYSCALL_NONE is not set
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_MODIFY_LDT_SYSCALL=y
-CONFIG_DEFAULT_MODIFY_LDT_SYSCALL=y
 CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
@@ -606,10 +686,13 @@ CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 #
 # Power management and ACPI options
 #
+CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_SUSPEND_SKIP_SYNC is not set
 CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_AUTOSLEEP is not set
@@ -644,7 +727,9 @@ CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
 CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
@@ -653,6 +738,7 @@ CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_CUSTOM_DSDT_FILE=""
 # CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
@@ -662,6 +748,7 @@ CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
 CONFIG_ACPI_BGRT=y
 # CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 CONFIG_ACPI_NFIT=m
@@ -671,9 +758,13 @@ CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
 CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
 # CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_DPTF_POWER=m
+CONFIG_ACPI_WATCHDOG=y
 CONFIG_ACPI_EXTLOG=m
 # CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_CONFIGFS=m
 CONFIG_SFI=y
 
 #
@@ -683,7 +774,6 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@@ -695,7 +785,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 
 #
 # CPU frequency scaling drivers
@@ -724,12 +814,6 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 CONFIG_INTEL_IDLE=y
 
 #
-# Memory power savings
-#
-CONFIG_I7300_IDLE_IOAT_CHANNEL=y
-CONFIG_I7300_IDLE=m
-
-#
 # Bus options (PCI etc.)
 #
 CONFIG_PCI=y
@@ -747,9 +831,11 @@ CONFIG_PCIEASPM=y
 CONFIG_PCIEASPM_DEBUG=y
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
 CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -759,6 +845,7 @@ CONFIG_PCI_STUB=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_HT_IRQ=y
 CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
@@ -773,10 +860,28 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 
 #
-# PCI host controller drivers
+# DesignWare PCI Core Support
 #
-CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_PLAT=y
+
+#
+# PCI host controller drivers
+#
+CONFIG_VMD=m
+
+#
+# PCI Endpoint
+#
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_EPF_TEST is not set
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
 CONFIG_ISA_BUS=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
@@ -804,6 +909,7 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
 CONFIG_RAPIDIO_DMA_ENGINE=y
 # CONFIG_RAPIDIO_DEBUG is not set
 CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
 CONFIG_RAPIDIO_MPORT_CDEV=m
 
 #
@@ -813,6 +919,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_CPS_XX=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
 # CONFIG_X86_SYSFB is not set
 
 #
@@ -829,13 +936,11 @@ CONFIG_COREDUMP=y
 CONFIG_IA32_EMULATION=y
 # CONFIG_IA32_AOUT is not set
 CONFIG_X86_X32=y
+CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
-CONFIG_PMC_ATOM=y
-CONFIG_VMD=m
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@@ -848,7 +953,9 @@ CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
 CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@@ -857,6 +964,8 @@ CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@@ -882,6 +991,7 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
@@ -891,6 +1001,7 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_DIAG=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
@@ -900,6 +1011,7 @@ CONFIG_TCP_CONG_HTCP=m
 CONFIG_TCP_CONG_HSTCP=m
 CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
 CONFIG_TCP_CONG_SCALABLE=m
 CONFIG_TCP_CONG_LP=m
 CONFIG_TCP_CONG_VENO=m
@@ -907,6 +1019,7 @@ CONFIG_TCP_CONG_YEAH=m
 CONFIG_TCP_CONG_ILLINOIS=m
 CONFIG_TCP_CONG_DCTCP=m
 CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
 CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -917,6 +1030,7 @@ CONFIG_IPV6_ROUTE_INFO=y
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
@@ -939,6 +1053,9 @@ CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
 CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_INLINE=y
+CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_NETLABEL=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NET_PTP_CLASSIFY=y
@@ -958,6 +1075,7 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
@@ -966,10 +1084,10 @@ CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CONNTRACK_TIMEOUT=y
 CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CONNTRACK_LABELS=y
-CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
@@ -987,9 +1105,9 @@ CONFIG_NF_CT_NETLINK_HELPER=m
 CONFIG_NETFILTER_NETLINK_GLUE_CT=y
 CONFIG_NF_NAT=m
 CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_PROTO_DCCP=y
+CONFIG_NF_NAT_PROTO_UDPLITE=y
+CONFIG_NF_NAT_PROTO_SCTP=y
 CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
@@ -1002,19 +1120,27 @@ CONFIG_NF_TABLES_INET=m
 CONFIG_NF_TABLES_NETDEV=m
 CONFIG_NFT_EXTHDR=m
 CONFIG_NFT_META=m
+CONFIG_NFT_RT=m
+CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
+CONFIG_NFT_SET_BITMAP=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
 CONFIG_NFT_MASQ=m
 CONFIG_NFT_REDIR=m
 CONFIG_NFT_NAT=m
+CONFIG_NFT_OBJREF=m
 CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
 CONFIG_NFT_REJECT=m
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
@@ -1076,7 +1202,6 @@ CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ECN=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_GRADM=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_HL=m
@@ -1117,6 +1242,7 @@ CONFIG_IP_SET_HASH_IPMARK=m
 CONFIG_IP_SET_HASH_IPPORT=m
 CONFIG_IP_SET_HASH_IPPORTIP=m
 CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
 CONFIG_IP_SET_HASH_MAC=m
 CONFIG_IP_SET_HASH_NETPORTNET=m
 CONFIG_IP_SET_HASH_NET=m
@@ -1172,10 +1298,12 @@ CONFIG_IP_VS_PE_SIP=m
 #
 CONFIG_NF_DEFRAG_IPV4=m
 CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
 CONFIG_NFT_REJECT_IPV4=m
 CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
 CONFIG_NF_TABLES_ARP=m
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1217,10 +1345,12 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_NF_SOCKET_IPV6=m
 CONFIG_NF_TABLES_IPV6=m
 CONFIG_NFT_CHAIN_ROUTE_IPV6=m
 CONFIG_NFT_REJECT_IPV6=m
 CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=m
 CONFIG_NF_LOG_IPV6=m
@@ -1317,6 +1447,7 @@ CONFIG_ATM_MPOA=m
 CONFIG_ATM_BR2684=m
 # CONFIG_ATM_BR2684_IPFILTER is not set
 CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
 CONFIG_L2TP_V3=y
 CONFIG_L2TP_IP=m
 CONFIG_L2TP_ETH=m
@@ -1327,7 +1458,14 @@ CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
-# CONFIG_NET_DSA is not set
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_KSZ=y
+CONFIG_NET_DSA_TAG_LAN9303=y
+CONFIG_NET_DSA_TAG_MTK=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_TAG_QCA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1339,12 +1477,12 @@ CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 CONFIG_ATALK=m
 CONFIG_DEV_APPLETALK=m
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
+# CONFIG_IPDDP is not set
 CONFIG_X25=m
 CONFIG_LAPB=m
 CONFIG_PHONET=m
 CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
 CONFIG_6LOWPAN_NHC=m
 CONFIG_6LOWPAN_NHC_DEST=m
 CONFIG_6LOWPAN_NHC_FRAGMENT=m
@@ -1353,12 +1491,12 @@ CONFIG_6LOWPAN_NHC_IPV6=m
 CONFIG_6LOWPAN_NHC_MOBILITY=m
 CONFIG_6LOWPAN_NHC_ROUTING=m
 CONFIG_6LOWPAN_NHC_UDP=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
-CONFIG_6LOWPAN_GHC_UDP=m
-CONFIG_6LOWPAN_GHC_ICMPV6=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
-CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
+# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
+# CONFIG_6LOWPAN_GHC_UDP is not set
+# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
 CONFIG_IEEE802154=m
 # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
 CONFIG_IEEE802154_SOCKET=m
@@ -1394,6 +1532,7 @@ CONFIG_NET_SCH_HHF=m
 CONFIG_NET_SCH_PIE=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
 
 #
 # Classification
@@ -1412,6 +1551,7 @@ CONFIG_NET_CLS_FLOW=m
 CONFIG_NET_CLS_CGROUP=m
 CONFIG_NET_CLS_BPF=m
 CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -1426,6 +1566,7 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
@@ -1435,7 +1576,9 @@ CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_ACT_VLAN=m
 CONFIG_NET_ACT_BPF=m
 CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
 # CONFIG_NET_ACT_IFE is not set
+CONFIG_NET_ACT_TUNNEL_KEY=m
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 CONFIG_DCB=y
@@ -1446,12 +1589,15 @@ CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUGFS is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
 CONFIG_NETLINK_DIAG=m
 CONFIG_MPLS=y
 CONFIG_NET_MPLS_GSO=m
@@ -1460,10 +1606,10 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_HSR=m
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_NET_NCSI=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
@@ -1476,6 +1622,7 @@ CONFIG_NET_FLOW_LIMIT=y
 #
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_TCPPROBE=m
+CONFIG_NET_DROP_MONITOR=m
 CONFIG_HAMRADIO=y
 
 #
@@ -1505,6 +1652,7 @@ CONFIG_CAN_GW=m
 # CAN Device Drivers
 #
 CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
 CONFIG_CAN_SLCAN=m
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
@@ -1518,6 +1666,7 @@ CONFIG_CAN_CC770_ISA=m
 CONFIG_CAN_CC770_PLATFORM=m
 CONFIG_CAN_IFI_CANFD=m
 CONFIG_CAN_M_CAN=m
+CONFIG_CAN_PEAK_PCIEFD=m
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_SJA1000_PLATFORM=m
@@ -1534,6 +1683,7 @@ CONFIG_CAN_SOFTING_CS=m
 #
 # CAN SPI interfaces
 #
+CONFIG_CAN_HI311X=m
 CONFIG_CAN_MCP251X=m
 
 #
@@ -1545,6 +1695,7 @@ CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_PEAK_USB=m
 CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_MCBA_USB=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_IRDA=m
 
@@ -1616,6 +1767,7 @@ CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
 CONFIG_BT_LEDS=y
 # CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
 
 #
 # Bluetooth device drivers
@@ -1629,7 +1781,9 @@ CONFIG_BT_HCIBTUSB_BCM=y
 CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
 CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
@@ -1638,6 +1792,7 @@ CONFIG_BT_HCIUART_INTEL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
 CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1651,9 +1806,12 @@ CONFIG_BT_MRVL_SDIO=m
 CONFIG_BT_ATH3K=m
 CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=y
 CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=m
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1666,6 +1824,7 @@ CONFIG_CFG80211=m
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_DEBUGFS=y
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_CRDA_SUPPORT=y
 CONFIG_CFG80211_WEXT=y
@@ -1684,6 +1843,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
 CONFIG_MAC80211_MESSAGE_TRACING=y
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
@@ -1692,10 +1852,10 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=y
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
-CONFIG_RFKILL_REGULATOR=m
 CONFIG_RFKILL_GPIO=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
 CONFIG_NET_9P_RDMA=m
 # CONFIG_NET_9P_DEBUG is not set
 CONFIG_CAIF=m
@@ -1716,7 +1876,6 @@ CONFIG_NFC_SHDLC=y
 #
 # Near Field Communication (NFC) devices
 #
-CONFIG_NFC_WILINK=m
 CONFIG_NFC_TRF7970A=m
 CONFIG_NFC_MEI_PHY=m
 CONFIG_NFC_SIM=m
@@ -1747,8 +1906,12 @@ CONFIG_NFC_NXP_NCI_I2C=m
 CONFIG_NFC_S3FWRN5=m
 CONFIG_NFC_S3FWRN5_I2C=m
 CONFIG_NFC_ST95HF=m
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
 CONFIG_NET_DEVLINK=m
 CONFIG_MAY_USE_DEVLINK=m
 CONFIG_HAVE_EBPF_JIT=y
@@ -1776,6 +1939,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_SYS_HYPERVISOR=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_GENERIC_CPU_AUTOPROBE=y
@@ -1786,7 +1951,7 @@ CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_FENCE_TRACE is not set
+# CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_CMA is not set
 
 #
@@ -1804,6 +1969,10 @@ CONFIG_MTD_CMDLINE_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
 #
+# Partition parsers
+#
+
+#
 # User Modules And Translation Layers
 #
 CONFIG_MTD_BLKDEVS=m
@@ -1877,6 +2046,7 @@ CONFIG_MTD_DATAFLASH=m
 # CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
 CONFIG_MTD_DATAFLASH_OTP=y
 CONFIG_MTD_M25P80=m
+CONFIG_MTD_MCHP23K256=m
 CONFIG_MTD_SST25L=m
 CONFIG_MTD_SLRAM=m
 CONFIG_MTD_PHRAM=m
@@ -1899,10 +2069,8 @@ CONFIG_MTD_NAND_ECC_BCH=y
 CONFIG_MTD_SM_COMMON=m
 CONFIG_MTD_NAND_DENALI=m
 CONFIG_MTD_NAND_DENALI_PCI=m
-CONFIG_MTD_NAND_DENALI_SCRATCH_REG_ADDR=0xFF108018
 CONFIG_MTD_NAND_GPIO=m
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
@@ -1912,7 +2080,6 @@ CONFIG_MTD_NAND_DOCG4=m
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_PLATFORM=m
-CONFIG_MTD_NAND_HISI504=m
 CONFIG_MTD_ONENAND=m
 CONFIG_MTD_ONENAND_VERIFY_WRITE=y
 CONFIG_MTD_ONENAND_GENERIC=m
@@ -1927,6 +2094,8 @@ CONFIG_MTD_QINFO_PROBE=m
 CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_MT81xx_NOR=m
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_INTEL_SPI=m
+CONFIG_SPI_INTEL_SPI_PLATFORM=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -1986,7 +2155,6 @@ CONFIG_PARIDE_ON20=m
 CONFIG_PARIDE_ON26=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
-CONFIG_ZRAM_LZ4_COMPRESS=y
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
@@ -1999,9 +2167,8 @@ CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SKD=m
-CONFIG_BLK_DEV_OSD=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=65536
 CONFIG_BLK_DEV_RAM_DAX=y
@@ -2011,13 +2178,20 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_VIRTIO_BLK=y
-# CONFIG_BLK_DEV_HD is not set
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK_SCSI=y
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_RSXX=m
 CONFIG_NVME_CORE=m
 CONFIG_BLK_DEV_NVME=m
-CONFIG_BLK_DEV_NVME_SCSI=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+# CONFIG_NVME_TARGET_FCLOOP is not set
 
 #
 # Misc devices
@@ -2039,23 +2213,16 @@ CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
 CONFIG_SENSORS_TSL2550=m
-CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_BH1770=m
 CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-CONFIG_BMP085_SPI=m
 CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_SRAM=y
-CONFIG_PANEL=m
-CONFIG_PANEL_PARPORT=0
-CONFIG_PANEL_PROFILE=5
-# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
 
@@ -2068,6 +2235,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@@ -2126,12 +2294,13 @@ CONFIG_MIC_COSM=m
 # VOP Driver
 #
 CONFIG_VOP=m
+CONFIG_VHOST_RING=m
 CONFIG_GENWQE=m
 CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
 CONFIG_ECHO=m
 # CONFIG_CXL_BASE is not set
-# CONFIG_CXL_KERNEL_API is not set
-# CONFIG_CXL_EEH is not set
+# CONFIG_CXL_AFU_DRIVER_OPS is not set
+# CONFIG_CXL_LIB is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -2217,9 +2386,12 @@ CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128
 CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
 CONFIG_SCSI_UFSHCD=m
 CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
 CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
 CONFIG_SCSI_HPTIOP=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_SCSI_FLASHPOINT=y
@@ -2231,6 +2403,7 @@ CONFIG_LIBFCOE=m
 CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_TAGGED_QUEUE=y
@@ -2260,7 +2433,10 @@ CONFIG_SCSI_QLA_FC=m
 CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
 CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_WD719X=m
@@ -2394,12 +2570,13 @@ CONFIG_MD_FAULTY=m
 CONFIG_MD_CLUSTER=m
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_MQ_DEFAULT is not set
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_BUFIO=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
 CONFIG_DM_BIO_PRISON=m
 CONFIG_DM_PERSISTENT_DATA=m
 CONFIG_DM_CRYPT=m
@@ -2407,7 +2584,6 @@ CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_CACHE=m
 CONFIG_DM_CACHE_SMQ=m
-CONFIG_DM_CACHE_CLEANER=m
 CONFIG_DM_ERA=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -2423,6 +2599,8 @@ CONFIG_DM_VERITY=m
 # CONFIG_DM_VERITY_FEC is not set
 CONFIG_DM_SWITCH=m
 CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -2469,6 +2647,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
 CONFIG_GTP=m
@@ -2482,11 +2661,13 @@ CONFIG_RIONET=m
 CONFIG_RIONET_TX_SIZE=128
 CONFIG_RIONET_RX_SIZE=128
 CONFIG_TUN=y
+CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
-CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
 CONFIG_SUNGEM_PHY=m
 CONFIG_ARCNET=m
 CONFIG_ARCNET_1201=m
@@ -2538,15 +2719,26 @@ CONFIG_CAIF_SPI_SLAVE=m
 # CONFIG_CAIF_SPI_SYNC is not set
 CONFIG_CAIF_HSI=m
 CONFIG_CAIF_VIRTIO=m
-CONFIG_VHOST_NET=m
-CONFIG_VHOST_SCSI=m
-CONFIG_VHOST_RING=m
-CONFIG_VHOST=m
-# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
 
 #
 # Distributed Switch Architecture drivers
 #
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_MICROCHIP_KSZ=m
+CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
 CONFIG_ETHERNET=y
 CONFIG_MDIO=m
 CONFIG_NET_VENDOR_3COM=y
@@ -2558,14 +2750,23 @@ CONFIG_NET_VENDOR_ADAPTEC=y
 CONFIG_ADAPTEC_STARFIRE=m
 CONFIG_NET_VENDOR_AGERE=y
 CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
 CONFIG_NET_VENDOR_ALTEON=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=m
 CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_DCB=y
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@@ -2577,6 +2778,8 @@ CONFIG_NET_VENDOR_AURORA=y
 CONFIG_AURORA_NB8800=m
 CONFIG_NET_CADENCE=y
 CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2586,28 +2789,30 @@ CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
 CONFIG_BNX2X=m
 CONFIG_BNX2X_SRIOV=y
-CONFIG_BNX2X_VXLAN=y
-CONFIG_BNX2X_GENEVE=y
 CONFIG_BNXT=m
 CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_DCB=y
 CONFIG_NET_VENDOR_BROCADE=y
 CONFIG_BNA=m
 CONFIG_NET_VENDOR_CAVIUM=y
 CONFIG_THUNDER_NIC_PF=m
 CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
 CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
 CONFIG_NET_VENDOR_CHELSIO=y
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T3=m
 CONFIG_CHELSIO_T4=m
 CONFIG_CHELSIO_T4_DCB=y
-CONFIG_CHELSIO_T4_UWIRE=y
 CONFIG_CHELSIO_T4_FCOE=y
 CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_CX_ECAT=m
@@ -2632,7 +2837,6 @@ CONFIG_SUNDANCE=m
 CONFIG_NET_VENDOR_EMULEX=y
 CONFIG_BE2NET=m
 CONFIG_BE2NET_HWMON=y
-CONFIG_BE2NET_VXLAN=y
 CONFIG_NET_VENDOR_EZCHIP=y
 CONFIG_NET_VENDOR_EXAR=y
 CONFIG_S2IO=m
@@ -2653,42 +2857,46 @@ CONFIG_IGB_DCA=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBE=m
-CONFIG_IXGBE_VXLAN=y
 CONFIG_IXGBE_HWMON=y
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
 CONFIG_IXGBEVF=m
 CONFIG_I40E=m
-CONFIG_I40E_VXLAN=y
-CONFIG_I40E_GENEVE=y
 CONFIG_I40E_DCB=y
-CONFIG_I40E_FCOE=y
 CONFIG_I40EVF=m
 CONFIG_FM10K=m
-CONFIG_FM10K_VXLAN=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
-# CONFIG_MVNETA_BM is not set
 CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
 CONFIG_SKGE_GENESIS=y
 CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
 CONFIG_NET_VENDOR_MELLANOX=y
 CONFIG_MLX4_EN=m
 CONFIG_MLX4_EN_DCB=y
-CONFIG_MLX4_EN_VXLAN=y
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
 CONFIG_MLX5_CORE_EN=y
 CONFIG_MLX5_CORE_EN_DCB=y
+CONFIG_MLX5_CORE_IPOIB=y
+CONFIG_MLX5_EN_IPSEC=y
 CONFIG_MLXSW_CORE=m
 CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
 CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SWITCHIB=m
 CONFIG_MLXSW_SWITCHX2=m
 CONFIG_MLXSW_SPECTRUM=m
 CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
 CONFIG_NET_VENDOR_MICREL=y
 CONFIG_KS8842=m
 CONFIG_KS8851=m
@@ -2706,8 +2914,9 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP_NETVF=m
-# CONFIG_NFP_NET_DEBUG is not set
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+# CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -2724,16 +2933,18 @@ CONFIG_QLA3XXX=m
 CONFIG_QLCNIC=m
 CONFIG_QLCNIC_SRIOV=y
 CONFIG_QLCNIC_DCB=y
-CONFIG_QLCNIC_VXLAN=y
 CONFIG_QLCNIC_HWMON=y
 CONFIG_QLGE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_QED=m
+CONFIG_QED_LL2=y
 CONFIG_QED_SRIOV=y
 CONFIG_QEDE=m
-CONFIG_QEDE_VXLAN=y
-CONFIG_QEDE_GENEVE=y
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
 CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
 CONFIG_NET_VENDOR_REALTEK=y
 CONFIG_ATP=m
 CONFIG_8139CP=m
@@ -2756,11 +2967,14 @@ CONFIG_SC92031=m
 CONFIG_NET_VENDOR_SIS=y
 CONFIG_SIS900=m
 CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
@@ -2777,7 +2991,6 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
-CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@@ -2796,48 +3009,58 @@ CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
 CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
 CONFIG_NET_SB1000=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_THUNDER=m
 CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
 
 #
 # MII PHY device drivers
 #
+CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
 CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=y
 CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
+CONFIG_INTEL_XWAY_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
 CONFIG_MICREL_PHY=m
-CONFIG_DP83848_PHY=m
-CONFIG_DP83867_PHY=m
 CONFIG_MICROCHIP_PHY=m
-CONFIG_FIXED_PHY=y
-CONFIG_MDIO_BITBANG=m
-CONFIG_MDIO_GPIO=m
-CONFIG_MDIO_CAVIUM=m
-CONFIG_MDIO_OCTEON=m
-CONFIG_MDIO_THUNDER=m
-CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_PLIP=m
 CONFIG_PPP=y
@@ -2902,6 +3125,7 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -2909,34 +3133,45 @@ CONFIG_WLAN_VENDOR_ATH=y
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_COMMON_DEBUG=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_STATION_STATISTICS=y
 # CONFIG_ATH9K_DYNACK is not set
 CONFIG_ATH9K_WOW=y
 CONFIG_ATH9K_RFKILL=y
 CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
 CONFIG_ATH9K_HWRNG=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
 CONFIG_CARL9170_WPC=y
 CONFIG_CARL9170_HWRNG=y
 CONFIG_ATH6KL=m
 CONFIG_ATH6KL_SDIO=m
 CONFIG_ATH6KL_USB=m
 # CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
 CONFIG_AR5523=m
 CONFIG_WIL6210=m
 CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
 CONFIG_ATH10K=m
 CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
 # CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_TRACING=y
 CONFIG_WCN36XX=m
 # CONFIG_WCN36XX_DEBUGFS is not set
 CONFIG_WLAN_VENDOR_ATMEL=y
@@ -3007,6 +3242,7 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
 CONFIG_IWLWIFI=m
 CONFIG_IWLWIFI_LEDS=y
 CONFIG_IWLDVM=m
@@ -3019,6 +3255,8 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
@@ -3088,6 +3326,7 @@ CONFIG_RT2X00_LIB=m
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_WLAN_VENDOR_REALTEK=y
 CONFIG_RTL8180=m
@@ -3134,6 +3373,9 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PEARL_PCIE=m
 CONFIG_PCMCIA_RAYCS=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_MAC80211_HWSIM=m
@@ -3170,10 +3412,13 @@ CONFIG_SBNI=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
 CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_AT86RF230_DEBUGFS=y
 CONFIG_IEEE802154_MRF24J40=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+CONFIG_IEEE802154_CA8210_DEBUGFS=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
@@ -3308,8 +3553,8 @@ CONFIG_MISDN_ISAR=m
 CONFIG_ISDN_HDLC=m
 CONFIG_NVM=y
 # CONFIG_NVM_DEBUG is not set
-CONFIG_NVM_GENNVM=m
 CONFIG_NVM_RRPC=m
+CONFIG_NVM_PBLK=m
 
 #
 # Input device support
@@ -3336,12 +3581,14 @@ CONFIG_INPUT_EVBUG=m
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_ADP5520=m
 CONFIG_KEYBOARD_ADP5588=m
 CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
@@ -3358,6 +3605,7 @@ CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_KEYBOARD_SAMSUNG=m
 CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
 CONFIG_KEYBOARD_TWL4030=m
 CONFIG_KEYBOARD_XTKBD=m
 CONFIG_KEYBOARD_CROS_EC=m
@@ -3367,6 +3615,7 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
@@ -3375,6 +3624,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
 CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -3417,12 +3667,15 @@ CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
 CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TABLET_SERIAL_WACOM4=m
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_PROPERTIES=y
@@ -3433,6 +3686,7 @@ CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
 CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
@@ -3448,12 +3702,12 @@ CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
-CONFIG_TOUCHSCREEN_FT6236=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
@@ -3503,11 +3757,18 @@ CONFIG_TOUCHSCREEN_TSC200X_CORE=m
 CONFIG_TOUCHSCREEN_TSC2004=m
 CONFIG_TOUCHSCREEN_TSC2005=m
 CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
 CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
 CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
 CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 CONFIG_TOUCHSCREEN_SX8654=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_INPUT_MISC=y
@@ -3525,11 +3786,11 @@ CONFIG_INPUT_MAX8925_ONKEY=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
+CONFIG_INPUT_GPIO_DECODER=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
@@ -3571,10 +3832,16 @@ CONFIG_INPUT_DRV2667_HAPTICS=m
 CONFIG_RMI4_CORE=m
 CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
 CONFIG_RMI4_2D_SENSOR=y
 CONFIG_RMI4_F11=y
 CONFIG_RMI4_F12=y
 CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F54=y
+CONFIG_RMI4_F55=y
 
 #
 # Hardware I/O ports
@@ -3628,6 +3895,7 @@ CONFIG_N_GSM=m
 CONFIG_TRACE_ROUTER=m
 CONFIG_TRACE_SINK=m
 CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
 
 #
 # Serial drivers
@@ -3640,6 +3908,7 @@ CONFIG_SERIAL_8250_FINTEK=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=m
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_RUNTIME_UARTS=32
@@ -3651,6 +3920,7 @@ CONFIG_SERIAL_8250_RSA=y
 # CONFIG_SERIAL_8250_FSL is not set
 CONFIG_SERIAL_8250_DW=m
 CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
 CONFIG_SERIAL_8250_MID=m
 CONFIG_SERIAL_8250_MOXA=m
 
@@ -3661,6 +3931,7 @@ CONFIG_SERIAL_KGDB_NMI=y
 CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_MAX310X=y
 CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_CONSOLE_POLL=y
@@ -3682,6 +3953,7 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_MEN_Z135=m
+CONFIG_SERIAL_DEV_BUS=m
 CONFIG_TTY_PRINTK=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -3692,10 +3964,10 @@ CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_VIRTIO_CONSOLE=y
 CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
-CONFIG_IPMI_SI_PROBE_DEFAULTS=y
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
 CONFIG_IPMI_POWEROFF=m
@@ -3716,6 +3988,7 @@ CONFIG_APPLICOM=m
 CONFIG_SYNCLINK_CS=m
 CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
 CONFIG_IPWIRELESS=m
 CONFIG_MWAVE=m
 CONFIG_RAW_DRIVER=m
@@ -3725,7 +3998,9 @@ CONFIG_HPET_MMAP=y
 CONFIG_HPET_MMAP_DEFAULT=y
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=y
+CONFIG_TCG_TIS_CORE=y
 CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
 CONFIG_TCG_TIS_I2C_ATMEL=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_TCG_TIS_I2C_NUVOTON=m
@@ -3734,10 +4009,12 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TCG_XEN=m
 CONFIG_TCG_CRB=m
+CONFIG_TCG_VTPM_PROXY=m
 CONFIG_TCG_TIS_ST33ZP24=m
 CONFIG_TCG_TIS_ST33ZP24_I2C=m
 CONFIG_TCG_TIS_ST33ZP24_SPI=m
 CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 
@@ -3755,10 +4032,12 @@ CONFIG_I2C_MUX=m
 # Multiplexer I2C Chip support
 #
 CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_SMBUS=m
 CONFIG_I2C_ALGOBIT=m
@@ -3798,11 +4077,12 @@ CONFIG_I2C_SCMI=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_CBUS_GPIO=m
-CONFIG_I2C_DESIGNWARE_CORE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
-CONFIG_I2C_EMEV2=m
+# CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_KEMPLD=m
 CONFIG_I2C_OCORES=m
@@ -3826,10 +4106,10 @@ CONFIG_I2C_VIPERBOARD=m
 #
 # Other I2C/SMBus bus drivers
 #
+CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_CROS_EC_TUNNEL=m
 CONFIG_I2C_STUB=m
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_SLAVE is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -3855,7 +4135,7 @@ CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
-CONFIG_SPI_ROCKCHIP=m
+# CONFIG_SPI_ROCKCHIP is not set
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
@@ -3867,6 +4147,9 @@ CONFIG_SPI_ZYNQMP_GQSPI=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_LOOPBACK_TEST=m
 CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
 CONFIG_SPMI=m
 CONFIG_HSI=m
 CONFIG_HSI_BOARDINFO=y
@@ -3879,10 +4162,6 @@ CONFIG_HSI_BOARDINFO=y
 # HSI clients
 #
 CONFIG_HSI_CHAR=m
-
-#
-# PPS support
-#
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
 
@@ -3906,6 +4185,7 @@ CONFIG_PTP_1588_CLOCK=m
 #
 # Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
+CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
 
 #
@@ -3916,14 +4196,16 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
 CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=m
 CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_SUNRISEPOINT=m
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_DEBUG_GPIO is not set
@@ -3935,13 +4217,15 @@ CONFIG_GPIO_MAX730X=m
 # Memory mapped GPIO drivers
 #
 CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_AXP209=m
 CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_MOCKUP=m
 CONFIG_GPIO_VX855=m
-CONFIG_GPIO_ZX=y
 
 #
 # Port-mapped I/O GPIO drivers
@@ -3950,6 +4234,7 @@ CONFIG_GPIO_104_DIO_48E=m
 CONFIG_GPIO_104_IDIO_16=m
 CONFIG_GPIO_104_IDI_48=m
 CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_GPIO_MM=m
 CONFIG_GPIO_IT87=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_SCH311X=m
@@ -3978,6 +4263,7 @@ CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_JANZ_TTL=m
 CONFIG_GPIO_KEMPLD=m
 CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_TPS65086=m
@@ -3988,6 +4274,7 @@ CONFIG_GPIO_TPS65912=m
 CONFIG_GPIO_TWL4030=m
 CONFIG_GPIO_TWL6040=m
 CONFIG_GPIO_UCB1400=m
+CONFIG_GPIO_WHISKEY_COVE=m
 CONFIG_GPIO_WM831X=m
 CONFIG_GPIO_WM8350=m
 CONFIG_GPIO_WM8994=m
@@ -3996,8 +4283,8 @@ CONFIG_GPIO_WM8994=m
 # PCI GPIO expanders
 #
 CONFIG_GPIO_AMD8111=m
-CONFIG_GPIO_INTEL_MID=y
 CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCI_IDIO_16=m
 CONFIG_GPIO_RDC321X=m
 
 #
@@ -4006,11 +4293,7 @@ CONFIG_GPIO_RDC321X=m
 CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_PISOSR=m
-
-#
-# SPI or I2C GPIO expanders
-#
-CONFIG_GPIO_MCP23S08=m
+CONFIG_GPIO_XRA1403=m
 
 #
 # USB GPIO expanders
@@ -4033,6 +4316,7 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
 CONFIG_W1_SLAVE_DS2408=m
 CONFIG_W1_SLAVE_DS2408_READBACK=y
 CONFIG_W1_SLAVE_DS2413=m
@@ -4041,11 +4325,15 @@ CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
 CONFIG_W1_SLAVE_DS28E04=m
 CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_AVS=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
@@ -4061,12 +4349,17 @@ CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2781=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
 CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_BQ27XXX_I2C=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
 CONFIG_BATTERY_DA9030=m
 CONFIG_BATTERY_DA9052=m
 CONFIG_CHARGER_DA9150=m
 CONFIG_BATTERY_DA9150=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
 CONFIG_AXP288_CHARGER=m
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_BATTERY_MAX17040=m
@@ -4082,6 +4375,7 @@ CONFIG_CHARGER_LP8727=m
 CONFIG_CHARGER_LP8788=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LTC3651=m
 CONFIG_CHARGER_MAX14577=m
 CONFIG_CHARGER_MAX77693=m
 CONFIG_CHARGER_MAX8997=m
@@ -4097,10 +4391,6 @@ CONFIG_CHARGER_TPS65217=m
 CONFIG_BATTERY_GAUGE_LTC2941=m
 CONFIG_BATTERY_RT5033=m
 CONFIG_CHARGER_RT9455=m
-CONFIG_AXP20X_POWER=m
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_RESTART=y
-CONFIG_POWER_AVS=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -4132,6 +4422,7 @@ CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_APPLESMC=m
 CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ASPEED=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -4144,6 +4435,7 @@ CONFIG_SENSORS_F71882FG=m
 CONFIG_SENSORS_F75375S=m
 CONFIG_SENSORS_MC13783_ADC=m
 CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_G760A=m
@@ -4179,6 +4471,7 @@ CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MAX31790=m
 CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
 CONFIG_SENSORS_MENF21BMC_HWMON=m
 CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_LM63=m
@@ -4208,6 +4501,7 @@ CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
 CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_IR35221=m
 CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 CONFIG_SENSORS_LTC2978_REGULATOR=y
@@ -4222,6 +4516,7 @@ CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
@@ -4234,6 +4529,7 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS1015=m
@@ -4242,13 +4538,14 @@ CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
 CONFIG_SENSORS_INA209=m
 CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
 CONFIG_SENSORS_TC74=m
 CONFIG_SENSORS_THMC50=m
 CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
 CONFIG_SENSORS_TMP401=m
 CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_TWL4030_MADC=m
 CONFIG_SENSORS_VIA_CPUTEMP=m
 CONFIG_SENSORS_VIA686A=m
 CONFIG_SENSORS_VT1211=m
@@ -4265,6 +4562,7 @@ CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_WM831X=m
 CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_XGENE=m
 
 #
 # ACPI drivers
@@ -4272,6 +4570,7 @@ CONFIG_SENSORS_WM8350=m
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
@@ -4295,29 +4594,32 @@ CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INT340X_THERMAL=m
 CONFIG_ACPI_THERMAL_REL=m
 CONFIG_INT3406_THERMAL=m
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
 CONFIG_INTEL_PCH_THERMAL=m
 CONFIG_GENERIC_ADC_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 CONFIG_WATCHDOG_SYSFS=y
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
+CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
 CONFIG_DA9052_WATCHDOG=m
 CONFIG_DA9055_WATCHDOG=m
 CONFIG_DA9063_WATCHDOG=m
 CONFIG_DA9062_WATCHDOG=m
 CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_WDAT_WDT=m
 CONFIG_WM831X_WATCHDOG=m
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
-CONFIG_RN5T618_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
@@ -4357,6 +4659,7 @@ CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_INTEL_MEI_WDT=m
 CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
 CONFIG_MEN_A21_WDT=m
 CONFIG_XEN_WDT=m
 
@@ -4370,6 +4673,15 @@ CONFIG_WDTPCI=m
 # USB-based Watchdog Cards
 #
 CONFIG_USBPCWATCHDOG=m
+
+#
+# Watchdog Pretimeout Governors
+#
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
 CONFIG_SSB_POSSIBLE=y
 
 #
@@ -4401,6 +4713,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
 CONFIG_BCMA_HOST_SOC=y
 CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
 CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_DRIVER_GPIO=y
 # CONFIG_BCMA_DEBUG is not set
@@ -4436,6 +4749,8 @@ CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=m
 CONFIG_MFD_INTEL_LPSS=m
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
@@ -4465,7 +4780,6 @@ CONFIG_MFD_RTSX_PCI=m
 CONFIG_MFD_RT5033=m
 CONFIG_MFD_RTSX_USB=m
 CONFIG_MFD_RC5T583=y
-CONFIG_MFD_RN5T618=m
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SM501=m
@@ -4479,6 +4793,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
 CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
 CONFIG_MFD_PALMAS=y
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
@@ -4486,6 +4801,7 @@ CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65086=m
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65217=m
+CONFIG_MFD_TI_LP873X=m
 CONFIG_MFD_TPS65218=m
 CONFIG_MFD_TPS6586X=y
 CONFIG_MFD_TPS65910=y
@@ -4527,7 +4843,8 @@ CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AAT2870=m
 CONFIG_REGULATOR_AB3100=m
-CONFIG_REGULATOR_ARIZONA=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
 CONFIG_REGULATOR_AS3711=m
 CONFIG_REGULATOR_AXP20X=m
 CONFIG_REGULATOR_BCM590XX=m
@@ -4542,12 +4859,14 @@ CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=m
 CONFIG_REGULATOR_ISL9305=m
 CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
 CONFIG_REGULATOR_LP3971=m
 CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_LP872X=m
 CONFIG_REGULATOR_LP8755=m
 CONFIG_REGULATOR_LP8788=m
 CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
 CONFIG_REGULATOR_MAX14577=m
 CONFIG_REGULATOR_MAX1586=m
 CONFIG_REGULATOR_MAX8649=m
@@ -4562,6 +4881,7 @@ CONFIG_REGULATOR_MC13XXX_CORE=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6323=m
 CONFIG_REGULATOR_MT6397=m
 CONFIG_REGULATOR_PALMAS=m
 CONFIG_REGULATOR_PCAP=m
@@ -4573,7 +4893,6 @@ CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RC5T583=m
-CONFIG_REGULATOR_RN5T618=m
 CONFIG_REGULATOR_RT5033=m
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
@@ -4586,6 +4905,7 @@ CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
 CONFIG_REGULATOR_TPS65086=m
 CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -4597,6 +4917,7 @@ CONFIG_REGULATOR_WM831X=m
 CONFIG_REGULATOR_WM8350=m
 CONFIG_REGULATOR_WM8400=m
 CONFIG_REGULATOR_WM8994=m
+CONFIG_CEC_CORE=m
 CONFIG_MEDIA_SUPPORT=m
 
 #
@@ -4608,6 +4929,8 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
 CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_VIDEO_DEV=m
@@ -4615,9 +4938,11 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_PCI_SKELETON=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -4633,6 +4958,7 @@ CONFIG_DVB_NET=y
 CONFIG_TTPCI_EEPROM=m
 CONFIG_DVB_MAX_ADAPTERS=8
 CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
 
 #
 # Media drivers
@@ -4661,6 +4987,7 @@ CONFIG_IR_ITE_CIR=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
+CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGORPLUGUSB=m
@@ -4668,6 +4995,9 @@ CONFIG_IR_IGUANA=m
 CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -4744,7 +5074,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
@@ -4770,6 +5099,7 @@ CONFIG_VIDEO_TM6000_DVB=m
 #
 CONFIG_DVB_USB=m
 # CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
 CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_DIBUSB_MB=m
 # CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
@@ -4808,6 +5138,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
@@ -4830,6 +5161,12 @@ CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_USB_AIRSPY=m
 CONFIG_USB_HACKRF=m
 CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
 CONFIG_MEDIA_PCI_SUPPORT=y
 
 #
@@ -4837,6 +5174,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 #
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
 CONFIG_VIDEO_TW68=m
 CONFIG_VIDEO_TW686X=m
 CONFIG_VIDEO_ZORAN=m
@@ -4852,6 +5190,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 # Media capture/analog TV support
 #
 CONFIG_VIDEO_IVTV=m
+# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
@@ -4918,10 +5257,14 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 CONFIG_VIDEO_SH_VEU=m
 CONFIG_V4L_TEST_DRIVERS=y
+# CONFIG_VIDEO_VIMC is not set
 CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
 CONFIG_VIDEO_VIM2M=m
 CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
 
 #
 # Supported MMC/SDIO adapters
@@ -4973,10 +5316,11 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
 CONFIG_VIDEO_V4L2_TPG=m
 
 #
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
 #
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_ATTACH=y
@@ -5040,8 +5384,10 @@ CONFIG_VIDEO_ADV7511=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9M111=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -5060,6 +5406,10 @@ CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_SAA6752HS=m
 
 #
+# SDR tuner chips
+#
+
+#
 # Miscellaneous helper chips
 #
 CONFIG_VIDEO_M52790=m
@@ -5077,7 +5427,6 @@ CONFIG_SOC_CAMERA_MT9M111=m
 CONFIG_SOC_CAMERA_MT9T031=m
 CONFIG_SOC_CAMERA_MT9T112=m
 CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV5642=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
@@ -5137,6 +5486,8 @@ CONFIG_DVB_M88DS3103=m
 CONFIG_DVB_DRXK=m
 CONFIG_DVB_TDA18271C2DD=m
 CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
 
 #
 # DVB-S (satellite) frontends
@@ -5197,6 +5548,8 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
 
 #
 # DVB-C (cable) frontends
@@ -5262,6 +5615,7 @@ CONFIG_DVB_M88RS2000=m
 CONFIG_DVB_AF9033=m
 CONFIG_DVB_HORUS3A=m
 CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
 
 #
 # Tools to develop new frontends
@@ -5283,27 +5637,30 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_VM=y
 
 #
 # I2C encoder or helper chips
 #
-CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_CIK is not set
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
 CONFIG_DRM_AMDGPU_USERPTR=y
-CONFIG_DRM_AMD_POWERPLAY=y
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 
 #
 # ACP (Audio CoProcessor) Configuration
@@ -5313,20 +5670,24 @@ CONFIG_DRM_NOUVEAU=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
-# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
 CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_GVT=y
+CONFIG_DRM_I915_GVT_KVMGT=m
 
 #
 # drm/i915 Debugging
 #
 # CONFIG_DRM_I915_WERROR is not set
 # CONFIG_DRM_I915_DEBUG is not set
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
 CONFIG_DRM_VGEM=m
 CONFIG_DRM_VMWGFX=m
 CONFIG_DRM_VMWGFX_FBCON=y
@@ -5335,7 +5696,7 @@ CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
-# CONFIG_DRM_MGAG200 is not set
+CONFIG_DRM_MGAG200=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_QXL=m
 # CONFIG_DRM_BOCHS is not set
@@ -5346,12 +5707,19 @@ CONFIG_DRM_PANEL=y
 # Display Panels
 #
 CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
 
 #
 # Display Interface Bridges
 #
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_HSA_AMD=m
+CONFIG_DRM_HISI_HIBMC=m
+CONFIG_DRM_TINYDRM=m
+CONFIG_TINYDRM_MIPI_DBI=m
+CONFIG_TINYDRM_MI0283QT=m
+# CONFIG_DRM_LEGACY is not set
+# CONFIG_DRM_LIB_RANDOM is not set
 
 #
 # Frame buffer Devices
@@ -5369,6 +5737,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
@@ -5456,7 +5825,7 @@ CONFIG_FB_CARMINE_DRAM_EVAL=y
 CONFIG_FB_SM501=m
 CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
-CONFIG_FB_IBM_GXT4500=m
+# CONFIG_FB_IBM_GXT4500 is not set
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_METRONOME=m
@@ -5514,6 +5883,7 @@ CONFIG_BACKLIGHT_AS3711=m
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_BACKLIGHT_LV5207LP=m
 CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
 CONFIG_VGASTATE=m
 CONFIG_HDMI=y
 
@@ -5536,22 +5906,19 @@ CONFIG_SND=m
 CONFIG_SND_TIMER=m
 CONFIG_SND_PCM=m
 CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
 CONFIG_SND_RAWMIDI=m
 CONFIG_SND_COMPRESS_OFFLOAD=m
 CONFIG_SND_JACK=y
 CONFIG_SND_JACK_INPUT_DEV=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_PCM_TIMER=y
-# CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_MAX_CARDS=32
 CONFIG_SND_SUPPORT_OLD_API=y
@@ -5561,13 +5928,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_VMASTER=y
 CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-# CONFIG_SND_OPL4_LIB_SEQ is not set
-# CONFIG_SND_SBAWE_SEQ is not set
-CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
 CONFIG_SND_MPU401_UART=m
 CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+# CONFIG_SND_OPL4_LIB_SEQ is not set
 CONFIG_SND_VX_LIB=m
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
@@ -5621,6 +5993,7 @@ CONFIG_SND_INDIGODJ=m
 CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGODJX=m
 CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_ENS1370=m
 CONFIG_SND_ENS1371=m
@@ -5710,6 +6083,8 @@ CONFIG_SND_FIREWORKS=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_FIREWIRE_DIGI00X=m
 CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
@@ -5721,6 +6096,7 @@ CONFIG_SND_SOC_TOPOLOGY=y
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_ATMEL_SOC=m
 CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
 
 #
 # SoC Audio for Freescale CPUs
@@ -5735,6 +6111,7 @@ CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
+CONFIG_SND_I2S_HI6210_I2S=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
 CONFIG_SND_SOC_IMG_I2S_OUT=m
@@ -5742,42 +6119,64 @@ CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
 CONFIG_SND_SOC_IMG_SPDIF_IN=m
 CONFIG_SND_SOC_IMG_SPDIF_OUT=m
 CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
-CONFIG_SND_SST_MFLD_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
 CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST_MATCH=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
 CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
 CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
 CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
 CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
 
 #
-# Allwinner SoC Audio support
+# STMicroelectronics STM32 SOC audio support
 #
-CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_ZX_TDM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
 # CODEC drivers
 #
 CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
 CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
 CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4554=m
 CONFIG_SND_SOC_AK4613=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BT_SCO=m
 CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS42L42=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
@@ -5791,13 +6190,27 @@ CONFIG_SND_SOC_CS4271_SPI=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DIO2125=m
 CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES8316=m
 CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_INNO_RK3036=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM179X=m
 CONFIG_SND_SOC_PCM179X_I2C=m
@@ -5812,17 +6225,21 @@ CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RL6347A=m
 CONFIG_SND_SOC_RT286=m
 CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5616=m
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_RT5640=m
 CONFIG_SND_SOC_RT5645=m
 CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_RT5670=m
-# CONFIG_SND_SOC_RT5677_SPI is not set
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SI476X=m
 CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
 CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
@@ -5863,10 +6280,18 @@ CONFIG_SND_SOC_WM8960=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8974=m
 CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
 CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SOUND_PRIME is not set
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
 CONFIG_AC97_BUS=m
 
 #
@@ -5882,6 +6307,7 @@ CONFIG_HID_GENERIC=m
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
@@ -5914,9 +6340,11 @@ CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
 CONFIG_HID_LENOVO=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
@@ -5926,9 +6354,11 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MAYFLASH=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -5943,6 +6373,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
 CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
@@ -5962,6 +6393,7 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_THINGM=m
 CONFIG_HID_THRUSTMASTER=m
 CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_XINMO=m
@@ -5970,6 +6402,7 @@ CONFIG_ZEROPLUS_FF=y
 CONFIG_HID_ZYDACRON=m
 CONFIG_HID_SENSOR_HUB=m
 CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
 
 #
 # USB HID support
@@ -5988,11 +6421,17 @@ CONFIG_USB_MOUSE=m
 # I2C HID support
 #
 CONFIG_I2C_HID=m
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB=y
+CONFIG_USB_PCI=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 
 #
@@ -6003,7 +6442,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
-CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
 CONFIG_USB_MON=m
 CONFIG_USB_WUSB=m
 CONFIG_USB_WUSB_CBAF=m
@@ -6081,6 +6520,8 @@ CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 CONFIG_USBIP_CORE=m
 CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
@@ -6120,6 +6561,7 @@ CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_PCI=m
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_ULPI=y
 CONFIG_USB_ISP1760=m
 CONFIG_USB_ISP1760_HCD=y
 CONFIG_USB_ISP1761_UDC=y
@@ -6150,6 +6592,7 @@ CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_EDGEPORT=m
 CONFIG_USB_SERIAL_EDGEPORT_TI=m
 CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
 CONFIG_USB_SERIAL_GARMIN=m
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_IUU=m
@@ -6196,6 +6639,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -6208,7 +6652,6 @@ CONFIG_USB_SEVSEG=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
 CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 CONFIG_USB_IDMOUSE=m
@@ -6224,10 +6667,11 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
 CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_LINK_LAYER_TEST=m
 CONFIG_USB_CHAOSKEY=m
-CONFIG_UCSI=m
 CONFIG_USB_ATM=m
 CONFIG_USB_SPEEDTOUCH=m
 CONFIG_USB_CXACRU=m
@@ -6246,6 +6690,7 @@ CONFIG_USB_ISP1301=m
 CONFIG_USB_GADGET=m
 # CONFIG_USB_GADGET_DEBUG is not set
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_U_SERIAL_CONSOLE=y
@@ -6259,6 +6704,7 @@ CONFIG_USB_R8A66597=m
 CONFIG_USB_PXA27X=m
 CONFIG_USB_MV_UDC=m
 CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
 # CONFIG_USB_M66592 is not set
 CONFIG_USB_BDC_UDC=m
 
@@ -6278,6 +6724,7 @@ CONFIG_USB_F_ACM=m
 CONFIG_USB_F_SS_LB=m
 CONFIG_USB_U_SERIAL=m
 CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
 CONFIG_USB_F_SERIAL=m
 CONFIG_USB_F_OBEX=m
 CONFIG_USB_F_NCM=m
@@ -6289,6 +6736,7 @@ CONFIG_USB_F_RNDIS=m
 CONFIG_USB_F_MASS_STORAGE=m
 CONFIG_USB_F_FS=m
 CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC1_LEGACY=m
 CONFIG_USB_F_UAC2=m
 CONFIG_USB_F_UVC=m
 CONFIG_USB_F_MIDI=m
@@ -6309,6 +6757,7 @@ CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_LB_SS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
 CONFIG_USB_CONFIGFS_F_UAC2=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_F_HID=y
@@ -6318,6 +6767,7 @@ CONFIG_USB_CONFIGFS_F_TCM=y
 CONFIG_USB_ZERO=m
 CONFIG_USB_AUDIO=m
 CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 CONFIG_USB_ETH_EEM=y
@@ -6341,20 +6791,23 @@ CONFIG_USB_G_DBGP=m
 # CONFIG_USB_G_DBGP_PRINTK is not set
 CONFIG_USB_G_DBGP_SERIAL=y
 CONFIG_USB_G_WEBCAM=m
+
+#
+# USB Power Delivery and Type-C drivers
+#
+CONFIG_TYPEC=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_ACPI=m
 CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 
@@ -6379,6 +6832,7 @@ CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_TOSHIBA_PCI=m
 CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
@@ -6400,6 +6854,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 
 #
 # LED drivers
@@ -6408,10 +6863,12 @@ CONFIG_LEDS_88PM860X=m
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_MT6323=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_PCA9532_GPIO=y
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
 CONFIG_LEDS_LP55XX_COMMON=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -6433,7 +6890,6 @@ CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_ADP5520=m
-CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
 CONFIG_LEDS_TLC591XX=m
@@ -6445,6 +6901,9 @@ CONFIG_LEDS_MENF21BMC=m
 # LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
 CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
 
 #
 # LED Triggers
@@ -6452,6 +6911,7 @@ CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
 CONFIG_LEDS_TRIGGER_MTD=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
@@ -6486,6 +6946,7 @@ CONFIG_MLX5_INFINIBAND=m
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
 CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
 CONFIG_INFINIBAND_USNIC=m
 CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_IPOIB_CM=y
@@ -6494,18 +6955,22 @@ CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
 CONFIG_INFINIBAND_ISER=m
 CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_OPA_VNIC=m
 CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
 CONFIG_INFINIBAND_HFI1=m
 # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
 CONFIG_HFI1_VERBS_31BIT_PSN=y
 # CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_BNXT_RE=m
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EDAC=y
 # CONFIG_EDAC_LEGACY_SYSFS is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MM_EDAC=m
+# CONFIG_EDAC_GHES is not set
 CONFIG_EDAC_AMD64=m
 # CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
 CONFIG_EDAC_E752X=m
@@ -6520,13 +6985,17 @@ CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_PND2=m
 CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 # CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
 
 #
 # RTC interfaces
@@ -6546,6 +7015,7 @@ CONFIG_RTC_DRV_ABB5ZES3=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1307_HWMON=y
+CONFIG_RTC_DRV_DS1307_CENTURY=y
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1374_WDT=y
 CONFIG_RTC_DRV_DS1672=m
@@ -6558,7 +7028,6 @@ CONFIG_RTC_DRV_MAX8997=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=m
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
 CONFIG_RTC_DRV_PCF85063=m
@@ -6567,7 +7036,6 @@ CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
 CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_DRV_PALMAS=m
 CONFIG_RTC_DRV_TPS6586X=m
 CONFIG_RTC_DRV_TPS65910=m
@@ -6592,6 +7060,7 @@ CONFIG_RTC_DRV_DS1305=m
 CONFIG_RTC_DRV_DS1343=m
 CONFIG_RTC_DRV_DS1347=m
 CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RX4581=m
 CONFIG_RTC_DRV_RX6110=m
@@ -6605,6 +7074,7 @@ CONFIG_RTC_I2C_AND_SPI=y
 # SPI and I2C RTC drivers
 #
 CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_RV3029_HWMON=y
@@ -6645,6 +7115,7 @@ CONFIG_RTC_DRV_AB3100=m
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_FTRTC010=m
 CONFIG_RTC_DRV_PCAP=m
 CONFIG_RTC_DRV_MC13XXX=m
 CONFIG_RTC_DRV_MT6397=m
@@ -6683,13 +7154,21 @@ CONFIG_DMA_ENGINE_RAID=y
 # DMABUF options
 #
 CONFIG_SYNC_FILE=y
+CONFIG_SW_SYNC=y
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
+CONFIG_CHARLCD=m
+CONFIG_HD44780=m
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
 CONFIG_KS0108_DELAY=2
 CONFIG_CFAG12864B=m
 CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
 CONFIG_UIO=m
 CONFIG_UIO_CIF=m
 CONFIG_UIO_PDRV_GENIRQ=m
@@ -6700,15 +7179,18 @@ CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 CONFIG_UIO_PRUSS=m
 CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VFIO=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO=y
@@ -6727,6 +7209,7 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 # Microsoft Hyper-V guest support
 #
 CONFIG_HYPERV=m
+CONFIG_HYPERV_TSCPAGE=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_BALLOON=m
 
@@ -6760,7 +7243,6 @@ CONFIG_XEN_ACPI=y
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_HAVE_VPMU=y
 CONFIG_STAGING=y
-CONFIG_SLICOSS=m
 CONFIG_PRISM2_USB=m
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
@@ -6906,12 +7388,10 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
-CONFIG_R8723AU=m
-CONFIG_8723AU_AP_MODE=y
-CONFIG_8723AU_BT_COEXIST=y
 CONFIG_RTS5208=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
@@ -6927,8 +7407,6 @@ CONFIG_ADIS16201=m
 CONFIG_ADIS16203=m
 CONFIG_ADIS16209=m
 CONFIG_ADIS16240=m
-CONFIG_LIS3L02DQ=m
-CONFIG_SCA3000=m
 
 #
 # Analog to digital converters
@@ -6974,9 +7452,6 @@ CONFIG_AD5933=m
 #
 # Light sensors
 #
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_TSL2583=m
 CONFIG_TSL2x7x=m
 
 #
@@ -7019,17 +7494,10 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
 CONFIG_STAGING_MEDIA=y
+# CONFIG_INTEL_ATOMISP is not set
 CONFIG_I2C_BCM2048=m
 CONFIG_DVB_CXD2099=m
-CONFIG_DVB_MN88472=m
 CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_BT829=m
-CONFIG_LIRC_IMON=m
-CONFIG_LIRC_PARALLEL=m
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SERIAL=m
-CONFIG_LIRC_SERIAL_TRANSMITTER=y
-CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
 
 #
@@ -7048,7 +7516,6 @@ CONFIG_LNET_XPRT_IB=m
 CONFIG_LUSTRE_FS=m
 CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-CONFIG_LUSTRE_LLITE_LLOOP=m
 CONFIG_DGNC=m
 CONFIG_GS_FPGABOOT=m
 CONFIG_CRYPTO_SKEIN=y
@@ -7075,6 +7542,7 @@ CONFIG_FB_TFT_PCD8544=m
 CONFIG_FB_TFT_RA8875=m
 CONFIG_FB_TFT_S6D02A1=m
 CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SH1106=m
 CONFIG_FB_TFT_SSD1289=m
 CONFIG_FB_TFT_SSD1305=m
 CONFIG_FB_TFT_SSD1306=m
@@ -7104,10 +7572,35 @@ CONFIG_AIM_V4L2=m
 CONFIG_HDM_DIM2=m
 CONFIG_HDM_I2C=m
 CONFIG_HDM_USB=m
-
-#
-# Old ISDN4Linux (deprecated)
-#
+CONFIG_KS7010=m
+CONFIG_GREYBUS=m
+CONFIG_GREYBUS_ES2=m
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
+
+#
+# USB Power Delivery and Type-C drivers
+#
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_FUSB302=m
+# CONFIG_DRM_VBOXVIDEO is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -7117,10 +7610,10 @@ CONFIG_DELL_SMBIOS=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_SMO8800=m
 CONFIG_DELL_RBTN=m
 CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_FUJITSU_TABLET=m
 CONFIG_AMILO_RFKILL=m
 CONFIG_HP_ACCEL=m
@@ -7132,6 +7625,7 @@ CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SURFACE3_WMI=m
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
@@ -7147,14 +7641,19 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ASUS_WIRELESS=m
 CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
 CONFIG_MSI_WMI=m
+CONFIG_PEAQ_WMI=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_TOSHIBA_HAPS=m
-CONFIG_TOSHIBA_WMI=m
+# CONFIG_TOSHIBA_WMI is not set
 CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_CHT_INT33FE=m
+CONFIG_INTEL_INT0002_VGPIO=m
 CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
 CONFIG_INTEL_IPS=m
 CONFIG_INTEL_PMC_CORE=y
 CONFIG_IBM_RTL=m
@@ -7167,14 +7666,22 @@ CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
 CONFIG_PVPANIC=m
 CONFIG_INTEL_PMC_IPC=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
 CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_3_BUTTON=m
 CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_TELEMETRY=m
+CONFIG_MLX_PLATFORM=m
+CONFIG_MLX_CPLD_PLATFORM=m
+CONFIG_INTEL_TURBO_MAX_3=y
+CONFIG_SILEAD_DMI=y
+CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
 CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_LPC_MEC=y
 CONFIG_CROS_EC_PROTO=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CLKDEV_LOOKUP=y
@@ -7195,11 +7702,7 @@ CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
-CONFIG_COMMON_CLK_OXNAS=y
-
-#
-# Hardware Spinlock drivers
-#
+CONFIG_HWSPINLOCK=m
 
 #
 # Clock Source drivers
@@ -7235,15 +7738,25 @@ CONFIG_IRQ_REMAP=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
 
 #
 # Rpmsg drivers
 #
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
 
 #
 # SOC (System On Chip) specific Drivers
 #
+
+#
+# Broadcom SoC drivers
+#
+
+#
+# i.MX SoC drivers
+#
 # CONFIG_SUNXI_SRAM is not set
 CONFIG_SOC_TI=y
 CONFIG_PM_DEVFREQ=y
@@ -7270,6 +7783,8 @@ CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_ARIZONA=m
 CONFIG_EXTCON_AXP288=m
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
 CONFIG_EXTCON_MAX14577=m
 CONFIG_EXTCON_MAX3355=m
 CONFIG_EXTCON_MAX77693=m
@@ -7288,6 +7803,7 @@ CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_CONFIGFS=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
 CONFIG_IIO_SW_TRIGGER=m
 CONFIG_IIO_TRIGGERED_EVENT=m
 
@@ -7295,24 +7811,34 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 # Accelerometers
 #
 CONFIG_BMA180=m
+CONFIG_BMA220=m
 CONFIG_BMC150_ACCEL=m
 CONFIG_BMC150_ACCEL_I2C=m
 CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
 CONFIG_HID_SENSOR_ACCEL_3D=m
 CONFIG_IIO_ST_ACCEL_3AXIS=m
 CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
 CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
 CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
 CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
 CONFIG_MMA7455=m
 CONFIG_MMA7455_I2C=m
 CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
 CONFIG_MMA8452=m
 CONFIG_MMA9551_CORE=m
 CONFIG_MMA9551=m
 CONFIG_MMA9553=m
 CONFIG_MXC4005=m
 CONFIG_MXC6255=m
+CONFIG_SCA3000=m
 CONFIG_STK8312=m
 CONFIG_STK8BA50=m
 
@@ -7324,31 +7850,47 @@ CONFIG_AD7266=m
 CONFIG_AD7291=m
 CONFIG_AD7298=m
 CONFIG_AD7476=m
+CONFIG_AD7766=m
 CONFIG_AD7791=m
 CONFIG_AD7793=m
 CONFIG_AD7887=m
 CONFIG_AD7923=m
 CONFIG_AD799X=m
+CONFIG_AXP20X_ADC=m
 CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
 CONFIG_DA9150_GPADC=m
 CONFIG_HI8435=m
+CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
 CONFIG_LP8788_ADC=m
+CONFIG_LTC2485=m
+CONFIG_LTC2497=m
 CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
 CONFIG_MAX1363=m
+CONFIG_MAX9611=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
 CONFIG_MEN_Z188_ADC=m
 CONFIG_NAU7802=m
 CONFIG_PALMAS_GPADC=m
+CONFIG_QCOM_VADC_COMMON=m
 CONFIG_QCOM_SPMI_IADC=m
 CONFIG_QCOM_SPMI_VADC=m
+CONFIG_STX104=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
 CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
 CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
 CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_TLC4541=m
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL6030_GPADC=m
 CONFIG_VIPERBOARD_ADC=m
@@ -7364,6 +7906,8 @@ CONFIG_AD8366=m
 CONFIG_ATLAS_PH_SENSOR=m
 CONFIG_IAQCORE=m
 CONFIG_VZ89X=m
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
 
 #
 # Hid Sensor IIO Common
@@ -7382,6 +7926,11 @@ CONFIG_IIO_ST_SENSORS_SPI=m
 CONFIG_IIO_ST_SENSORS_CORE=m
 
 #
+# Counters
+#
+CONFIG_104_QUAD_8=m
+
+#
 # Digital to analog converters
 #
 CONFIG_AD5064=m
@@ -7395,17 +7944,19 @@ CONFIG_AD5592R=m
 CONFIG_AD5593R=m
 CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
+CONFIG_LTC2632=m
 CONFIG_AD5686=m
 CONFIG_AD5755=m
 CONFIG_AD5761=m
 CONFIG_AD5764=m
 CONFIG_AD5791=m
 CONFIG_AD7303=m
+CONFIG_CIO_DAC=m
+CONFIG_AD8801=m
 CONFIG_M62332=m
 CONFIG_MAX517=m
 CONFIG_MCP4725=m
 CONFIG_MCP4922=m
-CONFIG_STX104=m
 
 #
 # IIO dummy driver
@@ -7440,6 +7991,8 @@ CONFIG_BMG160=m
 CONFIG_BMG160_I2C=m
 CONFIG_BMG160_SPI=m
 CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
@@ -7455,6 +8008,7 @@ CONFIG_ITG3200=m
 CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
+CONFIG_MAX30102=m
 
 #
 # Humidity sensors
@@ -7462,6 +8016,10 @@ CONFIG_MAX30100=m
 CONFIG_AM2315=m
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
 CONFIG_HTU21=m
 CONFIG_SI7005=m
 CONFIG_SI7020=m
@@ -7478,6 +8036,9 @@ CONFIG_KMX61=m
 CONFIG_INV_MPU6050_IIO=m
 CONFIG_INV_MPU6050_I2C=m
 CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
 CONFIG_IIO_ADIS_LIB=m
 CONFIG_IIO_ADIS_LIB_BUFFER=y
 
@@ -7495,7 +8056,10 @@ CONFIG_CM32181=m
 CONFIG_CM3232=m
 CONFIG_CM3323=m
 CONFIG_CM36651=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
 CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_ISL29125=m
 CONFIG_HID_SENSOR_ALS=m
 CONFIG_HID_SENSOR_PROX=m
@@ -7506,14 +8070,17 @@ CONFIG_LTR501=m
 CONFIG_MAX44000=m
 CONFIG_OPT3001=m
 CONFIG_PA12203001=m
+CONFIG_SI1145=m
 CONFIG_STK3310=m
 CONFIG_TCS3414=m
 CONFIG_TCS3472=m
 CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
 CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 CONFIG_VEML6070=m
+CONFIG_VL6180=m
 
 #
 # Magnetometer sensors
@@ -7534,6 +8101,10 @@ CONFIG_SENSORS_HMC5843_I2C=m
 CONFIG_SENSORS_HMC5843_SPI=m
 
 #
+# Multiplexers
+#
+
+#
 # Inclinometer sensors
 #
 CONFIG_HID_SENSOR_INCLINOMETER_3D=m
@@ -7544,19 +8115,32 @@ CONFIG_HID_SENSOR_DEVICE_ROTATION=m
 #
 CONFIG_IIO_HRTIMER_TRIGGER=m
 CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 
 #
 # Digital potentiometers
 #
 CONFIG_DS1803=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
 CONFIG_MCP4131=m
 CONFIG_MCP4531=m
 CONFIG_TPL0102=m
 
 #
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+
+#
 # Pressure sensors
 #
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_HID_SENSOR_PRESS=m
 CONFIG_HP03=m
 CONFIG_MPL115=m
@@ -7572,6 +8156,9 @@ CONFIG_IIO_ST_PRESS_I2C=m
 CONFIG_IIO_ST_PRESS_SPI=m
 CONFIG_T5403=m
 CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
 
 #
 # Lightning sensors
@@ -7579,20 +8166,26 @@ CONFIG_HP206C=m
 CONFIG_AS3935=m
 
 #
-# Proximity sensors
+# Proximity and distance sensors
 #
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_SRF04=m
 CONFIG_SX9500=m
+CONFIG_SRF08=m
 
 #
 # Temperature sensors
 #
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
+CONFIG_TMP007=m
 CONFIG_TSYS01=m
 CONFIG_TSYS02D=m
 CONFIG_NTB=m
-CONFIG_NTB_AMD=m
+# CONFIG_NTB_AMD is not set
+CONFIG_NTB_IDT=m
 CONFIG_NTB_INTEL=m
 CONFIG_NTB_PINGPONG=m
 CONFIG_NTB_TOOL=m
@@ -7605,6 +8198,7 @@ CONFIG_VME_BUS=y
 #
 CONFIG_VME_CA91CX42=m
 CONFIG_VME_TSI148=m
+CONFIG_VME_FAKE=m
 
 #
 # VME Board Drivers
@@ -7619,6 +8213,7 @@ CONFIG_VME_PIO2=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
@@ -7631,6 +8226,19 @@ CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
 CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_ATH79 is not set
+# CONFIG_RESET_BERLIN is not set
+# CONFIG_RESET_GEMINI is not set
+# CONFIG_RESET_IMX7 is not set
+# CONFIG_RESET_LPC18XX is not set
+# CONFIG_RESET_MESON is not set
+# CONFIG_RESET_PISTACHIO is not set
+# CONFIG_RESET_SOCFPGA is not set
+# CONFIG_RESET_STM32 is not set
+# CONFIG_RESET_SUNXI is not set
+CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESET_ZYNQ is not set
+# CONFIG_RESET_TEGRA_BPMP is not set
 CONFIG_FMC=m
 CONFIG_FMC_FAKEDEV=m
 CONFIG_FMC_TRIVIAL=m
@@ -7641,9 +8249,12 @@ CONFIG_FMC_CHARDEV=m
 # PHY Subsystem
 #
 CONFIG_GENERIC_PHY=y
+CONFIG_BCM_KONA_USB2_PHY=m
 CONFIG_PHY_PXA_28NM_HSIC=m
 CONFIG_PHY_PXA_28NM_USB2=m
-CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_SAMSUNG_USB2=m
 # CONFIG_PHY_EXYNOS4210_USB2 is not set
 # CONFIG_PHY_EXYNOS4X12_USB2 is not set
@@ -7653,11 +8264,13 @@ CONFIG_POWERCAP=y
 CONFIG_INTEL_RAPL=m
 CONFIG_MCB=m
 CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
 
 #
 # Performance monitor support
 #
 CONFIG_RAS=y
+CONFIG_RAS_CEC=y
 CONFIG_THUNDERBOLT=m
 
 #
@@ -7673,25 +8286,37 @@ CONFIG_BTT=y
 CONFIG_ND_PFN=m
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVDIMM_DAX=y
+CONFIG_DAX=y
 CONFIG_DEV_DAX=m
 CONFIG_DEV_DAX_PMEM=m
-CONFIG_NVMEM=m
+CONFIG_NVMEM=y
 CONFIG_STM=m
 CONFIG_STM_DUMMY=m
 CONFIG_STM_SOURCE_CONSOLE=m
 CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
 CONFIG_INTEL_TH=m
 CONFIG_INTEL_TH_PCI=m
 CONFIG_INTEL_TH_GTH=m
 CONFIG_INTEL_TH_STH=m
 CONFIG_INTEL_TH_MSU=m
 CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
 
 #
 # FPGA Configuration Support
 #
 CONFIG_FPGA=m
-CONFIG_FPGA_MGR_ZYNQ_FPGA=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_ALTERA_PR_IP_CORE=m
+
+#
+# FSI support
+#
+CONFIG_FSI=m
+CONFIG_FSI_MASTER_GPIO=m
+CONFIG_FSI_MASTER_HUB=m
+CONFIG_FSI_SCOM=m
 
 #
 # Firmware Drivers
@@ -7722,12 +8347,20 @@ CONFIG_EFI_RUNTIME_MAP=y
 CONFIG_EFI_RUNTIME_WRAPPERS=y
 CONFIG_EFI_BOOTLOADER_CONTROL=m
 CONFIG_EFI_CAPSULE_LOADER=m
+CONFIG_EFI_TEST=m
+CONFIG_APPLE_PROPERTIES=y
 CONFIG_UEFI_CPER=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+
+#
+# Tegra firmware driver
+#
 
 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_FS_IOMAP=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
@@ -7762,6 +8395,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
 CONFIG_OCFS2_FS=m
 CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
 CONFIG_OCFS2_DEBUG_MASKLOG=y
 # CONFIG_OCFS2_DEBUG_FS is not set
 CONFIG_BTRFS_FS=m
@@ -7772,15 +8406,19 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_ASSERT is not set
 CONFIG_NILFS2_FS=m
 CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 CONFIG_F2FS_FS_ENCRYPTION=y
+# CONFIG_F2FS_IO_TRACE is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
@@ -7802,6 +8440,8 @@ CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=m
 CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+# CONFIG_OVERLAY_FS_INDEX is not set
 
 #
 # Caches
@@ -7841,7 +8481,10 @@ CONFIG_NTFS_FS=m
 # Pseudo filesystems
 #
 CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
 CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
@@ -7850,10 +8493,11 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y
 CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ORANGEFS_FS is not set
+CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
@@ -7888,14 +8532,15 @@ CONFIG_UBIFS_FS=m
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
-# CONFIG_LOGFS is not set
+CONFIG_UBIFS_FS_ENCRYPTION=y
+CONFIG_UBIFS_FS_SECURITY=y
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=y
 # CONFIG_SQUASHFS_FILE_CACHE is not set
 CONFIG_SQUASHFS_FILE_DIRECT=y
-# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
 # CONFIG_SQUASHFS_DECOMP_MULTI is not set
-CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_ZLIB=y
 CONFIG_SQUASHFS_LZ4=y
@@ -7917,8 +8562,12 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
+CONFIG_PSTORE_ZLIB_COMPRESS=y
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
 # CONFIG_PSTORE_CONSOLE is not set
 # CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
@@ -7938,7 +8587,6 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=m
 CONFIG_PNFS_BLOCK=m
-CONFIG_PNFS_OBJLAYOUT=m
 CONFIG_PNFS_FLEXFILE_LAYOUT=m
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 CONFIG_NFS_V4_1_MIGRATION=y
@@ -7946,6 +8594,7 @@ CONFIG_NFS_V4_SECURITY_LABEL=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -7954,7 +8603,9 @@ CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y
 CONFIG_NFSD_BLOCKLAYOUT=y
 CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
 CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
@@ -7965,6 +8616,7 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
 CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_FSCACHE=y
@@ -7979,8 +8631,8 @@ CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
-CONFIG_CIFS_SMB2=y
 CONFIG_CIFS_SMB311=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_NCP_FS=m
@@ -8063,8 +8715,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
 
 #
 # Compile-time checks and compiler options
@@ -8080,6 +8734,8 @@ CONFIG_FRAME_WARN=1024
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 CONFIG_UNUSED_SYMBOLS=y
+# CONFIG_PAGE_OWNER is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
@@ -8088,36 +8744,46 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_STACK_VALIDATION is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
 
 #
 # Memory Debugging
 #
 # CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 # CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_KMEMCHECK is not set
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
+# CONFIG_KCOV is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #
 # Debug Lockups and Hangs
 #
 CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@@ -8136,7 +8802,6 @@ CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_STACK_END_CHECK=y
 # CONFIG_DEBUG_TIMEKEEPING is not set
-CONFIG_TIMER_STATS=y
 
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
@@ -8150,11 +8815,13 @@ CONFIG_TIMER_STATS=y
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_LOCK_TORTURE_TEST=m
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
 CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_PI_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
@@ -8164,7 +8831,6 @@ CONFIG_DEBUG_LIST=y
 # RCU Debugging
 #
 # CONFIG_PROVE_RCU is not set
-# CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_TORTURE_TEST=m
 CONFIG_RCU_PERF_TEST=m
 # CONFIG_RCU_TORTURE_TEST is not set
@@ -8174,49 +8840,97 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
 # CONFIG_FAULT_INJECTION is not set
-CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_LATENCYTOP is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_FENTRY=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_HWLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+CONFIG_TRACING_MAP=y
+CONFIG_HIST_TRIGGERS=y
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+CONFIG_TRACING_EVENTS_GPIO=y
 
 #
 # Runtime Testing
 #
+# CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_SORT is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_RBTREE_TEST=m
-CONFIG_INTERVAL_TREE_TEST=m
-CONFIG_PERCPU_TEST=m
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_TEST_HEXDUMP=m
-CONFIG_TEST_STRING_HELPERS=m
-CONFIG_TEST_KSTRTOX=m
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_KSTRTOX is not set
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
-CONFIG_TEST_UUID=m
+# CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
-CONFIG_TEST_HASH=m
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_PARMAN is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_TEST_LKM=m
 CONFIG_TEST_USER_COPY=m
 CONFIG_TEST_BPF=m
 CONFIG_TEST_FIRMWARE=m
+# CONFIG_TEST_SYSCTL is not set
 CONFIG_TEST_UDELAY=m
 CONFIG_MEMTEST=y
 CONFIG_TEST_STATIC_KEYS=m
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_TEST_KMOD is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_KGDB=y
@@ -8228,18 +8942,21 @@ CONFIG_KDB_DEFAULT_ENABLE=0x1
 CONFIG_KDB_KEYBOARD=y
 CONFIG_KDB_CONTINUE_CATASTROPHIC=0
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
+CONFIG_EARLY_PRINTK_USB=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_EFI=y
-# CONFIG_X86_PTDUMP_CORE is not set
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+CONFIG_X86_PTDUMP_CORE=y
+# CONFIG_X86_PTDUMP is not set
 # CONFIG_EFI_PGT_DUMP is not set
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DEBUG_WX=y
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
@@ -8255,201 +8972,19 @@ CONFIG_IO_DELAY_0XED=y
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IO_DELAY_NONE is not set
 CONFIG_DEFAULT_IO_DELAY_TYPE=1
+# CONFIG_DEBUG_BOOT_PARAMS is not set
 # CONFIG_CPA_DEBUG is not set
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_ENTRY is not set
 # CONFIG_DEBUG_NMI_SELFTEST is not set
 CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
 
 #
 # Security options
 #
-
-#
-# Grsecurity
-#
-CONFIG_TASK_SIZE_MAX_SHIFT=47
-CONFIG_PAX_USERCOPY_SLABS=y
-CONFIG_GRKERNSEC=y
-# CONFIG_GRKERNSEC_CONFIG_AUTO is not set
-CONFIG_GRKERNSEC_CONFIG_CUSTOM=y
-CONFIG_GRKERNSEC_PROC_GID=10
-CONFIG_GRKERNSEC_TPE_TRUSTED_GID=10
-CONFIG_GRKERNSEC_SYMLINKOWN_GID=9996
-
-#
-# Customize Configuration
-#
-
-#
-# PaX
-#
-CONFIG_PAX=y
-
-#
-# PaX Control
-#
-# CONFIG_PAX_SOFTMODE is not set
-# CONFIG_PAX_PT_PAX_FLAGS is not set
-CONFIG_PAX_XATTR_PAX_FLAGS=y
-# CONFIG_PAX_NO_ACL_FLAGS is not set
-CONFIG_PAX_HAVE_ACL_FLAGS=y
-# CONFIG_PAX_HOOK_ACL_FLAGS is not set
-
-#
-# Non-executable pages
-#
-CONFIG_PAX_NOEXEC=y
-CONFIG_PAX_PAGEEXEC=y
-CONFIG_PAX_EMUTRAMP=y
-CONFIG_PAX_MPROTECT=y
-# CONFIG_PAX_MPROTECT_COMPAT is not set
-# CONFIG_PAX_ELFRELOCS is not set
-CONFIG_PAX_KERNEXEC_PLUGIN=y
-# CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_NONE is not set
-CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS=y
-
-#
-# Address Space Layout Randomization
-#
-CONFIG_PAX_ASLR=y
-CONFIG_PAX_RANDKSTACK=y
-CONFIG_PAX_RANDUSTACK=y
-CONFIG_PAX_RANDMMAP=y
-
-#
-# Miscellaneous hardening features
-#
-CONFIG_PAX_MEMORY_SANITIZE=y
-CONFIG_PAX_MEMORY_STACKLEAK=y
-CONFIG_PAX_MEMORY_STRUCTLEAK=y
-CONFIG_PAX_REFCOUNT=y
-CONFIG_PAX_USERCOPY=y
-# CONFIG_PAX_USERCOPY_DEBUG is not set
-CONFIG_PAX_SIZE_OVERFLOW=y
-CONFIG_PAX_SIZE_OVERFLOW_EXTRA=y
-CONFIG_HAVE_PAX_INITIFY_INIT_EXIT=y
-CONFIG_PAX_LATENT_ENTROPY=y
-CONFIG_PAX_RAP=y
-
-#
-# Memory Protections
-#
-CONFIG_GRKERNSEC_KMEM=y
-# CONFIG_GRKERNSEC_IO is not set
-CONFIG_GRKERNSEC_BPF_HARDEN=y
-CONFIG_GRKERNSEC_PERF_HARDEN=y
-CONFIG_GRKERNSEC_RAND_THREADSTACK=y
-CONFIG_GRKERNSEC_PROC_MEMMAP=y
-CONFIG_GRKERNSEC_KSTACKOVERFLOW=y
-CONFIG_GRKERNSEC_BRUTE=y
-CONFIG_GRKERNSEC_MODHARDEN=y
-CONFIG_GRKERNSEC_HIDESYM=y
-CONFIG_GRKERNSEC_RANDSTRUCT=y
-CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE=y
-CONFIG_GRKERNSEC_KERN_LOCKOUT=y
-
-#
-# Role Based Access Control Options
-#
-# CONFIG_GRKERNSEC_NO_RBAC is not set
-CONFIG_GRKERNSEC_ACL_HIDEKERN=y
-CONFIG_GRKERNSEC_ACL_MAXTRIES=3
-CONFIG_GRKERNSEC_ACL_TIMEOUT=30
-
-#
-# Filesystem Protections
-#
-CONFIG_GRKERNSEC_PROC=y
-# CONFIG_GRKERNSEC_PROC_USER is not set
-CONFIG_GRKERNSEC_PROC_USERGROUP=y
-CONFIG_GRKERNSEC_PROC_ADD=y
-CONFIG_GRKERNSEC_LINK=y
-CONFIG_GRKERNSEC_SYMLINKOWN=y
-CONFIG_GRKERNSEC_FIFO=y
-CONFIG_GRKERNSEC_SYSFS_RESTRICT=y
-CONFIG_GRKERNSEC_ROFS=y
-CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL=y
-CONFIG_GRKERNSEC_CHROOT=y
-CONFIG_GRKERNSEC_CHROOT_MOUNT=y
-CONFIG_GRKERNSEC_CHROOT_DOUBLE=y
-CONFIG_GRKERNSEC_CHROOT_PIVOT=y
-CONFIG_GRKERNSEC_CHROOT_CHDIR=y
-CONFIG_GRKERNSEC_CHROOT_CHMOD=y
-CONFIG_GRKERNSEC_CHROOT_FCHDIR=y
-CONFIG_GRKERNSEC_CHROOT_MKNOD=y
-CONFIG_GRKERNSEC_CHROOT_SHMAT=y
-CONFIG_GRKERNSEC_CHROOT_UNIX=y
-CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
-CONFIG_GRKERNSEC_CHROOT_NICE=y
-CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
-CONFIG_GRKERNSEC_CHROOT_RENAME=y
-CONFIG_GRKERNSEC_CHROOT_CAPS=y
-CONFIG_GRKERNSEC_CHROOT_INITRD=y
-
-#
-# Kernel Auditing
-#
-CONFIG_GRKERNSEC_AUDIT_GROUP=y
-CONFIG_GRKERNSEC_AUDIT_GID=100
-CONFIG_GRKERNSEC_EXECLOG=y
-CONFIG_GRKERNSEC_RESLOG=y
-CONFIG_GRKERNSEC_CHROOT_EXECLOG=y
-CONFIG_GRKERNSEC_AUDIT_PTRACE=y
-CONFIG_GRKERNSEC_AUDIT_CHDIR=y
-CONFIG_GRKERNSEC_AUDIT_MOUNT=y
-CONFIG_GRKERNSEC_SIGNAL=y
-CONFIG_GRKERNSEC_FORKFAIL=y
-CONFIG_GRKERNSEC_TIME=y
-CONFIG_GRKERNSEC_PROC_IPADDR=y
-CONFIG_GRKERNSEC_RWXMAP_LOG=y
-
-#
-# Executable Protections
-#
-CONFIG_GRKERNSEC_DMESG=y
-CONFIG_GRKERNSEC_HARDEN_PTRACE=y
-CONFIG_GRKERNSEC_PTRACE_READEXEC=y
-CONFIG_GRKERNSEC_SETXID=y
-# CONFIG_GRKERNSEC_HARDEN_IPC is not set
-CONFIG_GRKERNSEC_HARDEN_TTY=y
-CONFIG_GRKERNSEC_TPE=y
-# CONFIG_GRKERNSEC_TPE_ALL is not set
-CONFIG_GRKERNSEC_TPE_INVERT=y
-CONFIG_GRKERNSEC_TPE_GID=10
-
-#
-# Network Protections
-#
-CONFIG_GRKERNSEC_BLACKHOLE=y
-CONFIG_GRKERNSEC_NO_SIMULT_CONNECT=y
-CONFIG_GRKERNSEC_SOCKET=y
-CONFIG_GRKERNSEC_SOCKET_ALL=y
-CONFIG_GRKERNSEC_SOCKET_ALL_GID=9997
-CONFIG_GRKERNSEC_SOCKET_CLIENT=y
-CONFIG_GRKERNSEC_SOCKET_CLIENT_GID=9998
-CONFIG_GRKERNSEC_SOCKET_SERVER=y
-CONFIG_GRKERNSEC_SOCKET_SERVER_GID=9999
-
-#
-# Physical Protections
-#
-CONFIG_GRKERNSEC_DENYUSB=y
-# CONFIG_GRKERNSEC_DENYUSB_FORCE is not set
-
-#
-# Sysctl Support
-#
-CONFIG_GRKERNSEC_SYSCTL=y
-CONFIG_GRKERNSEC_SYSCTL_ON=y
-
-#
-# Logging Options
-#
-# CONFIG_GRKERNSEC_SELINUX_AVC_LOG_IPADDR is not set
-CONFIG_GRKERNSEC_FLOODTIME=10
-CONFIG_GRKERNSEC_FLOODBURST=6
 CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
 CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_BIG_KEYS=y
 CONFIG_TRUSTED_KEYS=y
@@ -8457,23 +8992,30 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
+# CONFIG_SECURITY_WRITABLE_HOOKS is not set
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
 CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 CONFIG_SECURITY_SMACK=y
 # CONFIG_SECURITY_SMACK_BRINGUP is not set
 CONFIG_SECURITY_SMACK_NETFILTER=y
+CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
 CONFIG_SECURITY_TOMOYO=y
 CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
@@ -8483,7 +9025,10 @@ CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
 # CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
 CONFIG_INTEGRITY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
@@ -8499,25 +9044,25 @@ CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
 CONFIG_IMA_DEFAULT_HASH_SHA1=y
 # CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
 # CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
-# CONFIG_IMA_DEFAULT_HASH_WP512 is not set
 CONFIG_IMA_DEFAULT_HASH="sha1"
-CONFIG_IMA_WRITE_POLICY=y
-CONFIG_IMA_READ_POLICY=y
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
 CONFIG_IMA_APPRAISE=y
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
 CONFIG_IMA_TRUSTED_KEYRING=y
-CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y
-CONFIG_IMA_BLACKLIST_KEYRING=y
+# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
 # CONFIG_IMA_LOAD_X509 is not set
 CONFIG_EVM=y
 CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_EXTRA_SMACK_XATTRS=y
 # CONFIG_EVM_LOAD_X509 is not set
-# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFAULT_SECURITY_SMACK is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
-CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
 # CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="apparmor"
+CONFIG_DEFAULT_SECURITY="selinux"
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m
 CONFIG_ASYNC_MEMCPY=m
@@ -8542,7 +9087,12 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECDH=m
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_USER=m
@@ -8557,13 +9107,15 @@ CONFIG_CRYPTO_MCRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ABLK_HELPER=m
+CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
+CONFIG_CRYPTO_ENGINE=m
 
 #
 # Authenticated Encryption with Associated Data
 #
 CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_ECHAINIV=m
@@ -8597,7 +9149,7 @@ CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
 CONFIG_CRYPTO_CRCT10DIF=y
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
-CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_GHASH=y
 CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_POLY1305_X86_64=m
 CONFIG_CRYPTO_MD4=m
@@ -8612,8 +9164,11 @@ CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA1_MB=m
+CONFIG_CRYPTO_SHA256_MB=m
+CONFIG_CRYPTO_SHA512_MB=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
@@ -8622,6 +9177,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
@@ -8687,6 +9243,7 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=y
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is not set
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
@@ -8697,6 +9254,10 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 # CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
 # CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
@@ -8713,12 +9274,13 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
 CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
 CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_IRQFD=y
 CONFIG_HAVE_KVM_IRQ_ROUTING=y
 CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
 CONFIG_KVM_ASYNC_PF=y
 CONFIG_HAVE_KVM_MSI=y
@@ -8731,8 +9293,13 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
-CONFIG_KVM_DEVICE_ASSIGNMENT=y
-# CONFIG_BINARY_PRINTF is not set
+# CONFIG_KVM_MMU_AUDIT is not set
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_BINARY_PRINTF=y
 
 #
 # Library routines
@@ -8760,6 +9327,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SLICEBY4 is not set
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
+CONFIG_CRC4=m
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
@@ -8807,13 +9375,15 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
+# CONFIG_DMA_NOOP_OPS is not set
+CONFIG_DMA_VIRT_OPS=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
@@ -8831,4 +9401,7 @@ CONFIG_FONT_8x16=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m