From 76126409208f4495dc274dad02743f28ee6cd649 Mon Sep 17 00:00:00 2001 From: Dan Ziemba Date: Wed, 13 May 2015 21:06:28 -0400 Subject: [PATCH] 4.0.2 --- .SRCINFO | 18 +++++++++--------- PKGBUILD | 8 ++++---- config | 4 ++-- config.x86_64 | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 80c33f6..68c94a4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-vfio - pkgver = 4.0.1 + pkgver = 4.0.2 pkgrel = 1 url = http://www.kernel.org/ arch = i686 @@ -13,8 +13,8 @@ pkgbase = linux-vfio options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.0.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.1.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.2.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.0.2.sign source = config source = config.x86_64 source = linux.preset @@ -23,10 +23,10 @@ pkgbase = linux-vfio source = i915_317.patch sha256sums = 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 sha256sums = SKIP - sha256sums = 9b4b47eb6584dc39aaa5db46843b83f7c60975abecbda4dc106a8722eabe96fb + sha256sums = c879ac300e9c1c8d2433ad9c66be5d374d15cf2175ac9876fb22d7d53a6b2e3b sha256sums = SKIP - sha256sums = 514aa8a9d03d2419c8084725fcdb2b5b4ce07966f5bd6a51224a5f7a5f8c3694 - sha256sums = b268b03a042e3f604a12a80c6e24c42006e4d9bf4a6d9b3201eb006942718128 + sha256sums = f70f2935b1881697ff986b80b444de422cf1869740ca33c25d3d1f20f5e56ba5 + sha256sums = 03b740ce5c70593d26634974499eefc9fc24841d972c38c05f9febd2d0b77249 sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149 @@ -40,20 +40,20 @@ pkgname = linux-vfio depends = kmod depends = mkinitcpio>=0.7 optdepends = crda: to set the correct wireless channels of your country - provides = kernel26-vfio=4.0.1 + provides = kernel26-vfio=4.0.2 conflicts = kernel26-vfio replaces = kernel26-vfio backup = etc/mkinitcpio.d/linux-vfio.preset pkgname = linux-vfio-headers pkgdesc = Header files and scripts for building modules for Linux-vfio kernel - provides = kernel26-vfio-headers=4.0.1 + provides = kernel26-vfio-headers=4.0.2 conflicts = kernel26-vfio-headers replaces = kernel26-vfio-headers pkgname = linux-vfio-docs pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-vfio kernel - provides = kernel26-vfio-docs=4.0.1 + provides = kernel26-vfio-docs=4.0.2 conflicts = kernel26-vfio-docs replaces = kernel26-vfio-docs diff --git a/PKGBUILD b/PKGBUILD index dd5c0e4..7340cd0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=linux-vfio _srcname=linux-4.0 -pkgver=4.0.1 +pkgver=4.0.2 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -23,10 +23,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" ) sha256sums=('0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991' 'SKIP' - '9b4b47eb6584dc39aaa5db46843b83f7c60975abecbda4dc106a8722eabe96fb' + 'c879ac300e9c1c8d2433ad9c66be5d374d15cf2175ac9876fb22d7d53a6b2e3b' 'SKIP' - '514aa8a9d03d2419c8084725fcdb2b5b4ce07966f5bd6a51224a5f7a5f8c3694' - 'b268b03a042e3f604a12a80c6e24c42006e4d9bf4a6d9b3201eb006942718128' + 'f70f2935b1881697ff986b80b444de422cf1869740ca33c25d3d1f20f5e56ba5' + '03b740ce5c70593d26634974499eefc9fc24841d972c38c05f9febd2d0b77249' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149' diff --git a/config b/config index d8f8b80..a0a6b4b 100644 --- a/config +++ b/config @@ -151,8 +151,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y diff --git a/config.x86_64 b/config.x86_64 index 26544ea..8bce6b1 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -159,8 +159,8 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_PAGE_COUNTER=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -# CONFIG_MEMCG_KMEM is not set +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_KMEM=y # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y