3.12: update to v3.12-rc5

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · Oct 17, 2013 · faf99ba · faf99ba
1 parent 95a9e21
commit faf99ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
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-rc4"
+TAG="v3.12-rc5"
 EXTRATAG=""
 
 EXTERNAL_TREE="git://github.com/torvalds/linux.git"
 EXTERNAL_BRANCH="master"
-EXTERNAL_SHA="d0e639c9e06d44e713170031fe05fb60ebe680af"
+EXTERNAL_SHA="61e6cfa80de5760bbe406f4e815b7739205754d2"
 
 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"
 

diff --git a/patches/general-fixes/0002-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch b/patches/general-fixes/0002-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch
@@ -1,4 +1,4 @@
-From 212a69f5c60129463b0da9da54e5b9e714dff4fc Mon Sep 17 00:00:00 2001
+From c6537ec19d26220f5f9396ba76293032f2ddbd18 Mon Sep 17 00:00:00 2001
 From: Grant Likely <grant.likely@secretlab.ca>
 Date: Tue, 2 Aug 2011 15:30:09 +0100
 Subject: [PATCH 2/3] ARM: CUSTOM: Build a uImage with dtb already appended
@@ -13,11 +13,11 @@ Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/Makefile b/arch/arm/Makefile
-index a37a50f..9b25d8b 100644
+index db50b62..cd87948 100644
 --- a/arch/arm/Makefile
 +++ b/arch/arm/Makefile
-@@ -302,7 +302,10 @@ zImage Image xipImage bootpImage uImage: vmlinux
- zinstall uinstall install: vmlinux
+@@ -307,7 +307,10 @@ $(BOOT_TARGETS): vmlinux
+ $(INSTALL_TARGETS):
  	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
 -%.dtb: | scripts
@@ -29,7 +29,7 @@ index a37a50f..9b25d8b 100644
 
  PHONY += dtbs
 diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 84aa2ca..7b03519 100644
+index ec2f806..4359029 100644
 --- a/arch/arm/boot/Makefile
 +++ b/arch/arm/boot/Makefile
 @@ -55,6 +55,9 @@ $(obj)/zImage:	$(obj)/compressed/vmlinux FORCE
@@ -54,5 +54,5 @@ index 84aa2ca..7b03519 100644
  	$(Q)$(MAKE) $(build)=$(obj)/bootp $@
  	@:
 -- 
-1.8.2.1
+1.8.4.rc3