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 /core | |
| parent | 86ba2a97029ade5651025fffae8535302f8eca4e (diff) | |
| parent | f5730724bc6eb0f4d190cb59599ee65201ffe20c (diff) | |
| download | packages-ecf507dfe8456d8c249156cfadafef195980fea7.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core')
| -rw-r--r-- | core/linux/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/linux/config | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index 356417f2..3b6010f6 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -1,8 +1,8 @@ -# upstream git revision: 42ba24c8b0c817ab8e851b6da41582d14127c358 +# upstream git revision: d299e4f0ee4303f6184169b7c55c2fbf54d158f2 # fail if upstream's .config changes -if [ "${sha256sums[4]}" = '0269d9a56f0d0306c9bd5c179a7e32214b0a1c082d3bca581661203b27305f17' ]; then - sha256sums[4]='dd21a4e32b31f8c1578bd89a3b755c2d7c23a72b6555316cb62abf563343ba7a' +if [ "${sha256sums[4]}" = 'f8e890eac9779a89009c1e2339f757e9781864df09805211fad005146fe2578b' ]; then + sha256sums[4]='6666e6530aac487c28c454c39021ce066b367f540448b4a4f17bfa0df480b824' fi eval "$( diff --git a/core/linux/config b/core/linux/config index 843a0c38..5569797d 100644 --- a/core/linux/config +++ b/core/linux/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.2-1 Kernel Configuration +# Linux/x86 4.17.8-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -6358,7 +6358,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 @@ -6876,7 +6876,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 @@ -7437,7 +7437,6 @@ CONFIG_ASYNC_TX_DMA=y CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set CONFIG_AUXDISPLAY=y -CONFIG_CHARLCD=m CONFIG_HD44780=m CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -7450,6 +7449,7 @@ CONFIG_PANEL=m CONFIG_PANEL_PARPORT=0 CONFIG_PANEL_PROFILE=5 # CONFIG_PANEL_CHANGE_MESSAGE is not set +CONFIG_CHARLCD=m CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m @@ -9360,7 +9360,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 |