diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-07-18 14:49:27 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-07-18 14:49:27 +0000 |
| commit | ecf507dfe8456d8c249156cfadafef195980fea7 (patch) | |
| tree | 3b76da2777072c6bd868b88595dd14c17c98fc4b /extra/linux-zen | |
| parent | 86ba2a97029ade5651025fffae8535302f8eca4e (diff) | |
| parent | f5730724bc6eb0f4d190cb59599ee65201ffe20c (diff) | |
| download | packages-ecf507dfe8456d8c249156cfadafef195980fea7.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen')
| -rw-r--r-- | extra/linux-zen/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-zen/config | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index a27f746a..a953a8b6 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -1,8 +1,8 @@ -# upstream git revision: 42ba24c8b0c817ab8e851b6da41582d14127c358 +# upstream git revision: d299e4f0ee4303f6184169b7c55c2fbf54d158f2 # fail if upstream's .config changes -if [ "${sha256sums[6]}" = 'd75bb73c44df4c386c8fa2123ca52ec5255d5e52ad804872120824185cf1ba38' ]; then - sha256sums[6]='68a5c63153bc08a48d013f373f321eb012b585d3b816d612ab2b0bfa3c4dd22a' +if [ "${sha256sums[6]}" = '02684ffee3ee036bc7b5362e413dd04fe7dcaed307f9dbd36e3b1f8fc6f05d54' ]; then + sha256sums[6]='17d551876b9a7597f3e3a77bfe88c7b8b6df1b2ec3e50112879899075e38b27c' fi eval "$( diff --git a/extra/linux-zen/config b/extra/linux-zen/config index f66c880c..7ef4698b 100644 --- a/extra/linux-zen/config +++ b/extra/linux-zen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.5-1 Kernel Configuration +# Linux/x86 4.17.8-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -6390,7 +6390,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_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_BYT_CHT_NOCODEC_MACH is not set 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 @@ -6908,7 +6908,7 @@ CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_UPD78F0730=m -# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers @@ -9395,7 +9395,6 @@ CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m CONFIG_CRYPTO_CHACHA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m |