diff options
| author | Mikael Eriksson | 2017-07-03 12:06:19 +0200 |
|---|---|---|
| committer | Mikael Eriksson | 2017-07-03 12:07:26 +0200 |
| commit | 265bb45fd4c4347b45fbabefce9b668924d66354 (patch) | |
| tree | e9bd8f77ceb9956eba4213cc8b8390e65728c609 | |
| parent | ef713c47465f30efe474040015c40748d30342f5 (diff) | |
| download | aur-265bb45fd4c4347b45fbabefce9b668924d66354.tar.gz | |
Merge with core/linux 4.11.7-1
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | config.i686 | 6 | ||||
| -rw-r--r-- | config.x86_64 | 6 |
4 files changed, 10 insertions, 10 deletions
@@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Mon Jul 3 10:05:17 UTC 2017 +# Mon Jul 3 10:07:26 UTC 2017 pkgbase = linux-mainline pkgver = 4.12 pkgrel = 1 @@ -20,8 +20,8 @@ pkgbase = linux-mainline source = 90-linux.hook source = linux.preset sha256sums = f51ed5e24bf3b10de6d6a3073bb46269555b151f12a4e791a6027a05e0af6b42 - sha256sums = e4e928488d35ba2b4049bd224dee87be9eb574ed3c1882f22c8fd5d8674c9abd - sha256sums = 2e38528bd2f1be712f5a274b66882c41d2a9cf996b3a05b4a772c8ba7309b261 + sha256sums = f330007da72867bb86556d1f8b84b8a4c8148a5ed5195ae25570a5da61428733 + sha256sums = 9dd9aa4a8ec613cc8261e40db897685d75e3d426219ed8d21fa3a6bc72a27a32 sha256sums = 834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 @@ -153,7 +153,7 @@ _package-headers() { mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include" for i in acpi asm-generic config crypto drm generated keys linux math-emu \ - media net pcmcia scsi soc sound trace uapi video xen; do + media net pcmcia rdma scsi soc sound trace uapi video xen; do cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/" done diff --git a/config.i686 b/config.i686 index 86ecb2416798..7ba5bf1b5b92 100644 --- a/config.i686 +++ b/config.i686 @@ -633,7 +633,7 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS_POWER is not set -# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -1504,7 +1504,7 @@ CONFIG_NET_NCSI=y CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y -# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y @@ -1989,7 +1989,7 @@ CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set diff --git a/config.x86_64 b/config.x86_64 index 96605b066b35..ea468f403fae 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -665,7 +665,7 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS_POWER is not set -# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set +CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -1511,7 +1511,7 @@ CONFIG_NET_NCSI=y CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y -# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y @@ -1973,7 +1973,7 @@ CONFIG_BLK_DEV_FD=m CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m CONFIG_ZRAM=m CONFIG_BLK_CPQ_CISS_DA=m -# CONFIG_CISS_SCSI_TAPE is not set +CONFIG_CISS_SCSI_TAPE=y CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set |