core/linux-veyron to 3.14.0-10

core/linux-veyron/0001-use-chromiumos-mwifiex-drivers.patch

@@ -1,7 +1,7 @@
-From 0cdd50365d92a617e3db5bc9dd2feec6fd0dca3d Mon Sep 17 00:00:00 2001
+From b5f5565fde88936969aee935bdb8273bb7f81f12 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 25 Jun 2015 20:35:06 -0600
-Subject: [PATCH 1/5] use chromiumos mwifiex drivers
+Subject: [PATCH 1/4] use chromiumos mwifiex drivers
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---

core/linux-veyron/0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch

@@ -1,7 +1,7 @@
-From 0eace2f735da15d64c1806f61d11650615ddc52b Mon Sep 17 00:00:00 2001
+From 28a01309079f0a9d2d16ce154e360935c1c32239 Mon Sep 17 00:00:00 2001
 From: Bing Zhao <bzhao@marvell.com>
 Date: Mon, 19 Aug 2013 16:10:21 -0700
-Subject: [PATCH 2/5] mwifiex: do not create AP and P2P interfaces upon driver
+Subject: [PATCH 2/4] mwifiex: do not create AP and P2P interfaces upon driver
  loading
 
 Bug 60747 - 1286:2044 [Microsoft Surface Pro]

core/linux-veyron/0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch

@@ -1,7 +1,7 @@
-From e941d1d7a7c730edbd7fc18e1654b88700a32242 Mon Sep 17 00:00:00 2001
+From 1c67401a52b33aa02cdb0d9608314fc4cd524458 Mon Sep 17 00:00:00 2001
 From: Heiko Stuebner <heiko@sntech.de>
 Date: Mon, 25 May 2015 16:38:07 +0200
-Subject: [PATCH 3/5] UPSTREAM: soc/rockchip: add handler for usb-uart
+Subject: [PATCH 3/4] UPSTREAM: soc/rockchip: add handler for usb-uart
  functionality
 
 Some Rockchip SoCs provide the possibility to use a usb-phy as passthru for

core/linux-veyron/0004-fix-brcmfmac-oops-and-race-condition.patch

@@ -1,7 +1,7 @@
-From d102c36cab907b5a7be1e9fcf36a48fd0cbb3200 Mon Sep 17 00:00:00 2001
+From 832d7d29401718d2d5ed8c1b110cc0c5b0931b05 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 2 Jul 2015 17:48:41 -0600
-Subject: [PATCH 4/5] fix brcmfmac oops and race condition
+Subject: [PATCH 4/4] fix brcmfmac oops and race condition
 
 This fixes a potential null pointer dereference by checking if null before
 freeing the vif struct.

core/linux-veyron/0005-Revert-FROMLIST-drm-rockchip-vop-switch-cursor-plane.patch

@@ -1,35 +0,0 @@
-From 66a7e7a7f2c011762df4e91c9b889e17f7277fc2 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Tue, 4 Aug 2015 20:37:24 -0600
-Subject: [PATCH 5/5] Revert "FROMLIST: drm/rockchip: vop: switch cursor plane
- to window 3"
-
-This reverts commit 181c3fef0d1bab102720cc28d87e96e2fd6f4b8c.
----
- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-index 97402b0..00b2846 100644
---- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
-@@ -329,13 +329,13 @@ static const struct vop_reg_data vop_init_reg_table[] = {
- /*
-  * Note: rk3288 has a dedicated 'cursor' window, however, that window requires
-  * special support to get alpha blending working.  For now, just use overlay
-- * window 3 for the drm cursor.
-+ * window 1 for the drm cursor.
-  */
- static const struct vop_win_data rk3288_vop_win_data[] = {
- 	{ .base = 0x00, .phy = &win01_data, .type = DRM_PLANE_TYPE_PRIMARY },
--	{ .base = 0x40, .phy = &win01_data, .type = DRM_PLANE_TYPE_OVERLAY },
-+	{ .base = 0x40, .phy = &win01_data, .type = DRM_PLANE_TYPE_CURSOR },
- 	{ .base = 0x00, .phy = &win23_data, .type = DRM_PLANE_TYPE_OVERLAY },
--	{ .base = 0x50, .phy = &win23_data, .type = DRM_PLANE_TYPE_CURSOR },
-+	{ .base = 0x50, .phy = &win23_data, .type = DRM_PLANE_TYPE_OVERLAY },
- 	{ .base = 0x00, .phy = &cursor_data, .type = DRM_PLANE_TYPE_OVERLAY },
- };
- 
--- 
-2.5.0
-

core/linux-veyron/PKGBUILD

@@ -7,8 +7,8 @@ pkgbase=linux-veyron
 _kernelname=${pkgbase#linux}
 _desc="Veyron Chromebooks"
 pkgver=3.14.0
-pkgrel=9
-_commit=7ffb6599e297922b75a969bea6bfad7f47b16748
+pkgrel=10
+_commit=6094ec4d1c922be753c08629c9d3595df4e30eb9
 arch=('armv7h')
 url="https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-3.14"
 license=('GPL2')
@@ -21,7 +21,6 @@ source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archiv
         '0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch'
         '0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch'
         '0004-fix-brcmfmac-oops-and-race-condition.patch'
-        '0005-Revert-FROMLIST-drm-rockchip-vop-switch-cursor-plane.patch'
         'config'
         'kernel.its'
         'kernel.keyblock'
@@ -34,11 +33,10 @@ md5sums=('SKIP'
          '5e2d7cd74de07d13052de99411c13a2f'
          '1534c1dbfe5df35a5634072f7b912840'
          '20f8931f3795e5226829d48c3d470334'
-         '600f20ce8286ab7a20d9f6de653a2eec'
-         '612b8420971ec68df1284cacfcd6bcf7'
-         '867486ec04dcfe0ea6594ea89f3a9df5'
-         '389ba1ecb6d62d62499cc0d5c832ae99'
-         '256274adf9c0ee60268bb3e6f4991916'
+         'b98041ace0b7537058ba9095406bbcfc'
+         'a4ed8eff558abe5bea1eda89cdda2526'
+         '1c666a868a11e8b799723673772079f4'
+         'a04ae86c479589d5b638b26d9f6c5a8e'
          'd3d0d08037ec930c4e2b4c53dce7ddb1'
          '1d77c34a9c759a7f54df718cd80de567'
          '61c5ff73c136ed07a7aadbf58db3d96a'
@@ -52,7 +50,6 @@ prepare() {
   git apply 0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch
   git apply 0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch
   git apply 0004-fix-brcmfmac-oops-and-race-condition.patch
-  git apply 0005-Revert-FROMLIST-drm-rockchip-vop-switch-cursor-plane.patch
 
   cp config .config