[arch-commits] Commit in linux/trunk (0001-sdhci-revert.patch PKGBUILD)

[Tobias Powalowski]

    Date: Tuesday, March 15, 2016 @ 09:05:16
  Author: tpowa
Revision: 261470

bump to 4.5 series

Modified:
  linux/trunk/PKGBUILD
Deleted:
  linux/trunk/0001-sdhci-revert.patch

-------------------------+
 0001-sdhci-revert.patch |   25 -------------------------
 PKGBUILD                |    5 -----
 2 files changed, 30 deletions(-)

Deleted: 0001-sdhci-revert.patch
===================================================================
--- 0001-sdhci-revert.patch	2016-03-15 08:02:46 UTC (rev 261469)
+++ 0001-sdhci-revert.patch	2016-03-15 08:05:16 UTC (rev 261470)
@@ -1,25 +0,0 @@
-index 2cadf08..b48565e 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -1895,9 +1895,9 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
- 		tuning_count = host->tuning_count;
- 
- 	/*
--	 * The Host Controller needs tuning only in case of SDR104 mode
--	 * and for SDR50 mode when Use Tuning for SDR50 is set in the
--	 * Capabilities register.
-+	 * The Host Controller needs tuning in case of SDR104 and DDR50
-+	 * mode, and for SDR50 mode when Use Tuning for SDR50 is set in
-+	 * the Capabilities register.
- 	 * If the Host Controller supports the HS200 mode then the
- 	 * tuning function has to be executed.
- 	 */
-@@ -1917,6 +1917,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
- 		break;
- 
- 	case MMC_TIMING_UHS_SDR104:
-+	case MMC_TIMING_UHS_DDR50:
- 		break;
- 
- 	case MMC_TIMING_UHS_SDR50:
-generated by cgit v0.11.2 at 2016-01-01 22:11:38 (GMT)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-03-15 08:02:46 UTC (rev 261469)
+++ PKGBUILD	2016-03-15 08:05:16 UTC (rev 261470)
@@ -45,11 +45,6 @@
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
-  
-  # revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91
-  # fixes #47778 sdhci broken on some boards
-  # https://bugzilla.kernel.org/show_bug.cgi?id=106541
-  patch -Rp1 -i "${srcdir}/0001-sdhci-revert.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