diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-21 10:11:03 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-21 10:11:03 +0100 |
| commit | 250a3c2cbfd9a5b1ec17b6d5b9d5bf2c5949b6ab (patch) | |
| tree | 48355a6e5a9217837376c2aaca402c72f217dc20 /core/linux-lts | |
| parent | 38f945d190be4e07b1613a42536b85b513658006 (diff) | |
| parent | d1ca62e03b8427d4c3e8bad6350df4321c3951d2 (diff) | |
| download | packages-250a3c2cbfd9a5b1ec17b6d5b9d5bf2c5949b6ab.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'core/linux-lts')
| -rw-r--r-- | core/linux-lts/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/linux-lts/config | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD index c1e9e565..6d5b41fa 100644 --- a/core/linux-lts/PKGBUILD +++ b/core/linux-lts/PKGBUILD @@ -1,9 +1,9 @@ -# upstream git revision: f0405d5a2107347d1a1a9779c70ed0007f0e0d36 +# upstream git revision: 239cfc1c7c6aad6e5996b7e0e6488d611b9d7283 # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = 'd0f62ce948ad58b96fea316b9cf1f08193c6b56e0ca4901d382494a071865dfd' ]; then - sha256sums[${i}]='8a0459f6f03f7fab9a7d4f8bcdcb6b0fcbacdb21e465a1f3e87405e645223cf7' + if [ "${sha256sums[${i}]}" = '2dbe737dd5d186ca0b3b1753ad3d7a4a722b3eb03ec224dc24b49dd491c18cf1' ]; then + sha256sums[${i}]='7e1cd47b0f1607b255a06e77968275dc81f93ead08df463dfe3d7f007fa1531a' fi done diff --git a/core/linux-lts/config b/core/linux-lts/config index 18d0c5a5..1eae217b 100644 --- a/core/linux-lts/config +++ b/core/linux-lts/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.13-1 Kernel Configuration +# Linux/x86 4.19.16-1 Kernel Configuration # # @@ -5971,6 +5971,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_DP_CEC=y CONFIG_DRM_TTM=m @@ -7259,10 +7260,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m # USB Type-C Alternate Mode drivers # CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_ROLES_INTEL_XHCI=m CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=m -CONFIG_USB_ROLE_SWITCH=m CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m |