3.12: update to v3.12.7

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · Jan 14, 2014 · 4fabfe8 · 4fabfe8
1 parent 996e2a4
commit 4fabfe8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/configs/beaglebone b/configs/beaglebone
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.3 Kernel Configuration
+# Linux/arm 3.12.7 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3706,14 +3706,13 @@ CONFIG_DMA_OF=y
 #
 # DMA Clients
 #
-# CONFIG_NET_DMA is not set
 # CONFIG_ASYNC_TX_DMA is not set
 CONFIG_DMATEST=y
 CONFIG_AUXDISPLAY=y
 CONFIG_UIO=y
 CONFIG_UIO_PDRV_GENIRQ=y
-CONFIG_UIO_PRUSS=m
 # CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_PRUSS=m
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=m
 

diff --git a/patch.sh b/patch.sh
@@ -17,12 +17,12 @@ RECIPENAME="linux-mainline_3.12.bb"
 RECIPEFILE="${DIR}/recipes/${RECIPENAME}"
 
 #For TAG, use mainline Kernel tags
-TAG="v3.12.6"
+TAG="v3.12.7"
 EXTRATAG=""
 
 EXTERNAL_TREE="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
 EXTERNAL_BRANCH="linux-3.12.y"
-EXTERNAL_SHA="d0266db287d492abe63e19859ad99dd232bc0e89"
+EXTERNAL_SHA="4301b7a8fe14a787fbf0bb9cad16b623f45956f6"
 
 PATCHSET="omap-next-dt dma-devel general-fixes dtc-fixes dtc-overlays of-fixes pdev-fixes mmc-fixes dts-fixes i2c-fixes pinctrl-fixes capemgr reset capes lcdc-fixes net deassert-hard-reset cape-import audio drm cpufreq pru"