3.12: update to v3.12-rc4

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
beagleboard · Oct 10, 2013 · da2adc5 · da2adc5
1 parent c0ec6ca
commit da2adc5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 94 deletions.
diff --git a/configs/beaglebone b/configs/beaglebone
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.0-rc1 Kernel Configuration
+# Linux/arm 3.12.0-rc4 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -229,7 +229,7 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
-CONFIG_CMDLINE_PARSER=y
+CONFIG_BLK_CMDLINE_PARSER=y
 
 #
 # Partition Types
@@ -402,18 +402,6 @@ CONFIG_MACH_IGEP0020=y
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_TEGRA is not set
-
-#
-# ST-Ericsson AB U300/U335 Platform
-#
-
-#
-# ST-Ericsson Mobile Platform Products
-#
-
-#
-# ST-Ericsson U300/U335 Feature Selections
-#
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VIRT is not set
@@ -3885,7 +3873,7 @@ CONFIG_LTE_GDM724X=m
 CONFIG_LUSTRE_FS=m
 CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
-# CONFIG_LUSTRE_TRANSLATE_ERRNOS is not set
+CONFIG_LUSTRE_TRANSLATE_ERRNOS=y
 CONFIG_LUSTRE_LLITE_LLOOP=y
 CONFIG_LNET=m
 CONFIG_LNET_MAX_PAYLOAD=1048576

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-rc1"
+TAG="v3.12-rc4"
 EXTRATAG=""
 
 EXTERNAL_TREE="git://github.com/torvalds/linux.git"
 EXTERNAL_BRANCH="master"
-EXTERNAL_SHA="c43a3855f41a25330326570d8e8d54e9927b3f56"
+EXTERNAL_SHA="d0e639c9e06d44e713170031fe05fb60ebe680af"
 
 PATCHSET="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/dma-devel/0001-ARM-EDMA-Fix-clearing-of-unused-list-for-DT-DMA-reso.patch b/patches/dma-devel/0001-ARM-EDMA-Fix-clearing-of-unused-list-for-DT-DMA-reso.patch
diff --git a/...xx-config-Enable-MMC-and-FS-options.patch → ...xx-config-Enable-MMC-and-FS-options.patch b/...xx-config-Enable-MMC-and-FS-options.patch → ...xx-config-Enable-MMC-and-FS-options.patch
@@ -1,7 +1,7 @@
-From 18ef5e47121c3ed12eb69d3088ebffa79502dacc Mon Sep 17 00:00:00 2001
+From 73717e46163f9fa576c50b7871e879aa549eed05 Mon Sep 17 00:00:00 2001
 From: Joel A Fernandes <agnel.joel@gmail.com>
 Date: Thu, 20 Jun 2013 15:07:40 -0500
-Subject: [PATCH 2/6] da8xx: config: Enable MMC and FS options
+Subject: [PATCH 1/5] da8xx: config: Enable MMC and FS options
 
 Required to get OMAP-L1 EVM access MMC and mount rootfs
 
@@ -29,5 +29,5 @@ index 1571bea..9b50e6c 100644
 +CONFIG_MMC=y
 +CONFIG_MMC_DAVINCI=y
 -- 
-1.8.2.1
+1.8.4.rc3
 
diff --git a/...003-ARM-dts-add-AM33XX-EDMA-support.patch → ...002-ARM-dts-add-AM33XX-EDMA-support.patch b/...003-ARM-dts-add-AM33XX-EDMA-support.patch → ...002-ARM-dts-add-AM33XX-EDMA-support.patch
@@ -1,7 +1,7 @@
-From d95949d9a934fa68ba44dd60a0c0303ad414f287 Mon Sep 17 00:00:00 2001
+From 24bf653fcd4c7076840fde191ebbfb0eec58dd8e Mon Sep 17 00:00:00 2001
 From: Matt Porter <mdp@ti.com>
 Date: Tue, 10 Sep 2013 14:24:37 -0500
-Subject: [PATCH 3/6] ARM: dts: add AM33XX EDMA support
+Subject: [PATCH 2/5] ARM: dts: add AM33XX EDMA support
 
 Adds AM33XX EDMA support to the am33xx.dtsi as documented in
 Documentation/devicetree/bindings/dma/ti-edma.txt
@@ -41,5 +41,5 @@ index f9c5da9..19a1c1d 100644
  			compatible = "ti,omap4-gpio";
  			ti,hwmods = "gpio1";
 -- 
-1.8.2.1
+1.8.4.rc3
 
diff --git a/...-ARM-dts-add-AM33XX-SPI-DMA-support.patch → ...-ARM-dts-add-AM33XX-SPI-DMA-support.patch b/...-ARM-dts-add-AM33XX-SPI-DMA-support.patch → ...-ARM-dts-add-AM33XX-SPI-DMA-support.patch
@@ -1,7 +1,7 @@
-From 6b4ca4b934aa640354b822f62fbf91c20ce9107b Mon Sep 17 00:00:00 2001
+From f9f371c725afaeb71926cd7960e73fa6e29a2a6c Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Tue, 10 Sep 2013 14:24:38 -0500
-Subject: [PATCH 4/6] ARM: dts: add AM33XX SPI DMA support
+Subject: [PATCH 3/5] ARM: dts: add AM33XX SPI DMA support
 
 Adds DMA resources to the AM33XX SPI nodes.
 
@@ -40,5 +40,5 @@ index 19a1c1d..9ce85e5 100644
  		};
 
 -- 
-1.8.2.1
+1.8.4.rc3
 
diff --git a/...M33XX-MMC-support-and-documentation.patch → ...M33XX-MMC-support-and-documentation.patch b/...M33XX-MMC-support-and-documentation.patch → ...M33XX-MMC-support-and-documentation.patch
@@ -1,7 +1,7 @@
-From 33804fe8f1d4ff43af02d929bce7f12a1d45fa60 Mon Sep 17 00:00:00 2001
+From 77337ee9a8729678d4f6dd9dfc4dfff28a425f55 Mon Sep 17 00:00:00 2001
 From: Matt Porter <mporter@ti.com>
 Date: Tue, 10 Sep 2013 14:24:39 -0500
-Subject: [PATCH 5/6] ARM: dts: add AM33XX MMC support and documentation
+Subject: [PATCH 4/5] ARM: dts: add AM33XX MMC support and documentation
 
 Adds AM33XX MMC support for am335x-bone, am335x-evm and am335x-evmsk boards.
 
@@ -179,5 +179,5 @@ index 9ce85e5..0a82fca 100644
  			compatible = "ti,omap3-wdt";
  			ti,hwmods = "wd_timer2";
 -- 
-1.8.2.1
+1.8.4.rc3
 
diff --git a/...engine-pcm-Add-support-for-new-DMAE.patch → ...engine-pcm-Add-support-for-new-DMAE.patch b/...engine-pcm-Add-support-for-new-DMAE.patch → ...engine-pcm-Add-support-for-new-DMAE.patch
@@ -1,7 +1,7 @@
-From 0121501c58c140ab82344f070cc8e3c9cc8730e4 Mon Sep 17 00:00:00 2001
+From 81ae443add8c448041ee6497f9bc1b0cf914ef80 Mon Sep 17 00:00:00 2001
 From: Joel Fernandes <joelf@ti.com>
 Date: Wed, 3 Jul 2013 17:29:44 -0500
-Subject: [PATCH 6/6] sound: soc: soc-dmaengine-pcm: Add support for new
+Subject: [PATCH 5/5] sound: soc: soc-dmaengine-pcm: Add support for new
  DMAEngine request API
 
 Formerly these resources were coming HWMOD on OMAP-like SoCs. With the
@@ -56,5 +56,5 @@ index aa924d9..461fe4f 100644
   * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
   * @substream: PCM substream
 -- 
-1.8.2.1
+1.8.4.rc3