Update to Linux-4.1.5

4 files changed, 20 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3afb752d9cd..c8e2980026b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-fbcondecor
 	pkgdesc = The linux-fbcondecor kernel and modules with frame buffer decoration support.
-	pkgver = 4.1.3
+	pkgver = 4.1.5
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@@ -14,8 +14,8 @@ pkgbase = linux-fbcondecor
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.1.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.3.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.3.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.5.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.1.5.sign
 	source = fbcondecor-4.1.patch
 	source = config
 	source = config.x86_64
@@ -27,11 +27,11 @@ pkgbase = linux-fbcondecor
 	source = change-default-console-loglevel.patch
 	sha256sums = caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f
 	sha256sums = SKIP
-	sha256sums = b949517b832af2fc90c57a35e475340f32c186f391cbdbfbe0aba7720dbb0b3e
+	sha256sums = b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc
 	sha256sums = SKIP
 	sha256sums = b8c95822b17a90b65431c518f349bdb7a448688da2774b5b652ef085824d7b42
-	sha256sums = 94d0987bca23a4c0a4d4e81df1badf655136f70b7541f1d47fe429159e737c96
-	sha256sums = f0eae16576ddc5309ebf557e9f6026a5afbcdafba9517bb0a574fbb3d21a95d7
+	sha256sums = 4289c86cd918f34c9a147339247ccbaf5d27a023b91d929e09ab6b05fd151bf9
+	sha256sums = b0fb05bc1a92f9cc46d10b51cc9fc157d1323d2c0c0e3eed44c64b3dc3613c62
 	sha256sums = 521b572c7fcd08112eb9b15d302fa30ac9bc72c590164742da3c405ba54e00ef
 	sha256sums = 9e1d3fd95d768a46353593f6678513839cedb98ee66e83d9323233104ec3b23f
 	sha256sums = bbe3631c737ed8329a1b7a9610cc0a07330c14194da5e9afec7705e7f37eeb81
@@ -47,20 +47,20 @@ pkgname = linux-fbcondecor
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-fbcondecor=4.1.3
+	provides = kernel26-fbcondecor=4.1.5
 	conflicts = kernel26-fbcondecor
 	replaces = kernel26-fbcondecor
 	backup = etc/mkinitcpio.d/linux-fbcondecor.preset
 
 pkgname = linux-fbcondecor-headers
 	pkgdesc = Header files and scripts for building modules for Linux-fbcondecor kernel
-	provides = kernel26-fbcondecor-headers=4.1.3
+	provides = kernel26-fbcondecor-headers=4.1.5
 	conflicts = kernel26-fbcondecor-headers
 	replaces = kernel26-fbcondecor-headers
 
 pkgname = linux-fbcondecor-docs
 	pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-fbcondecor kernel
-	provides = kernel26-fbcondecor-docs=4.1.3
+	provides = kernel26-fbcondecor-docs=4.1.5
 	conflicts = kernel26-fbcondecor-docs
 	replaces = kernel26-fbcondecor-docs
 
diff --git a/PKGBUILD b/PKGBUILD
index 5cbc1a1fc292..8e642a09908a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=linux-fbcondecor               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-4.1
-pkgver=4.1.3
+pkgver=4.1.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@@ -29,11 +29,11 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'change-default-console-loglevel.patch')
 sha256sums=('caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f'
             'SKIP'
-            'b949517b832af2fc90c57a35e475340f32c186f391cbdbfbe0aba7720dbb0b3e'
+            'b495cf8a7b978986dd2b757b687751c62f635d15cc2228edb80934bc0d449dcc'
             'SKIP'
             'b8c95822b17a90b65431c518f349bdb7a448688da2774b5b652ef085824d7b42'
-            '94d0987bca23a4c0a4d4e81df1badf655136f70b7541f1d47fe429159e737c96'
-            'f0eae16576ddc5309ebf557e9f6026a5afbcdafba9517bb0a574fbb3d21a95d7'
+            '4289c86cd918f34c9a147339247ccbaf5d27a023b91d929e09ab6b05fd151bf9'
+            'b0fb05bc1a92f9cc46d10b51cc9fc157d1323d2c0c0e3eed44c64b3dc3613c62'
             '521b572c7fcd08112eb9b15d302fa30ac9bc72c590164742da3c405ba54e00ef'
             '9e1d3fd95d768a46353593f6678513839cedb98ee66e83d9323233104ec3b23f'
             'bbe3631c737ed8329a1b7a9610cc0a07330c14194da5e9afec7705e7f37eeb81'
@@ -59,20 +59,6 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
-  # Fix deadlock with stacked loop devices (FS#45129)
-  # http://marc.info/?l=linux-kernel&m=143280649731902&w=2
-  patch -Np1 -i ../0001-block-loop-convert-to-per-device-workqueue.patch
-  patch -Np1 -i ../0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch
-
-  # Fix bluetooth chip initialization on some macbooks (FS#45554)
-  # http://marc.info/?l=linux-bluetooth&m=143690738728402&w=2
-  # https://bugzilla.kernel.org/show_bug.cgi?id=100651
-  patch -Np1 -i ../0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch
-
-  # Fix kernel oops when booting with root on RAID1 LVM (FS#45548)
-  # https://bugzilla.kernel.org/show_bug.cgi?id=100491#c24
-  patch -Np1 -i ../bitmap-enable-booting-for-dm-md-raid1.patch
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/config b/config
index c82f471fe450..0faf1fcfde0c 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.1-1 Kernel Configuration
+# Linux/x86 4.1.4-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -6331,8 +6331,8 @@ CONFIG_PVPANIC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -6452,7 +6452,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
diff --git a/config.x86_64 b/config.x86_64
index 1259f4f0bcc1..dbcf8a056ef6 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.1.1-1 Kernel Configuration
+# Linux/x86 4.1.4-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -694,6 +694,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
@@ -6071,8 +6072,8 @@ CONFIG_PVPANIC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
@@ -6191,7 +6192,6 @@ CONFIG_KXCJK1013=m
 # CONFIG_AD7887 is not set
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set