linux-libre-3.6.2-1: updating version

7 files changed, 7 insertions, 145 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 61ba504a7..271d8e639 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.6
-_sublevel=1
+_sublevel=2
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '62d272c8ec79bd2eb9cc56001aaf1042'
+         '1014a197e2bea449600d7b2cca415eec'
          '8262778cb9c808d1c33f3e3c726e48e3'
          'e0ba119c57f72d467995e8e63a69b2ab'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '5dd9f2e6717ed2639c1685cffe034b7f')
+         '1690532ad271b11a87e8824f7da65101')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/alsa-powersave-3.5.x.patch b/libre/linux-libre/alsa-powersave-3.5.x.patch
deleted file mode 100644
index 189fd1ceb..000000000
--- a/libre/linux-libre/alsa-powersave-3.5.x.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 20 Aug 2012 19:25:22 +0000 (+0200)
-Subject: ALSA: hda - Fix leftover codec->power_transition
-X-Git-Tag: v3.6-rc3~14^2~1
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=commitdiff_plain;h=535b6c51fe8293c88ce919cdfc4390c67a1cb6d1
-
-ALSA: hda - Fix leftover codec->power_transition
-
-When the codec turn-on operation is canceled by the immediate
-power-on, the driver left the power_transition flag as is.
-This caused the persistent avoidance of power-save behavior.
-
-Cc: <stable@vger.kernel.org> [v3.5+]
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
-
-diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
-index c3077d5..f560051 100644
---- a/sound/pci/hda/hda_codec.c
-+++ b/sound/pci/hda/hda_codec.c
-@@ -4454,6 +4454,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down)
- 	 * then there is no need to go through power up here.
- 	 */
- 	if (codec->power_on) {
-+		if (codec->power_transition < 0)
-+			codec->power_transition = 0;
- 		spin_unlock(&codec->power_lock);
- 		return;
- 	}
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e3598a3e0..e553c3d44 100755
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1325,7 +1325,7 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
@@ -2449,7 +2449,6 @@ CONFIG_IWLDVM=m
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_TESTMODE=y
 # CONFIG_IWLWIFI_P2P is not set
 # CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
 CONFIG_IWLEGACY=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 3263e4dca..479c39929 100755
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1282,7 +1282,7 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WEXT_PRIV=y
 CONFIG_CFG80211=m
-CONFIG_NL80211_TESTMODE=y
+# CONFIG_NL80211_TESTMODE is not set
 # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_CFG80211_DEFAULT_PS=y
@@ -2330,7 +2330,6 @@ CONFIG_IWLDVM=m
 #
 # CONFIG_IWLWIFI_DEBUG is not set
 CONFIG_IWLWIFI_DEVICE_TRACING=y
-CONFIG_IWLWIFI_DEVICE_TESTMODE=y
 # CONFIG_IWLWIFI_P2P is not set
 # CONFIG_IWLWIFI_EXPERIMENTAL_MFP is not set
 CONFIG_IWLEGACY=m
diff --git a/libre/linux-libre/i915-i2c-crash-3.5.x.patch b/libre/linux-libre/i915-i2c-crash-3.5.x.patch
deleted file mode 100644
index d202b531c..000000000
--- a/libre/linux-libre/i915-i2c-crash-3.5.x.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From cee25168e9c4ef7f9417632af2dc78b8521dfda7 Mon Sep 17 00:00:00 2001
-From: Jani Nikula <jani.nikula@intel.com>
-Date: Mon, 13 Aug 2012 17:33:02 +0300
-Subject: [PATCH] drm/i915: ensure i2c adapter is all set before adding it
-
-i2c_add_adapter() may do i2c transfers on the bus to detect supported
-devices. Therefore the adapter needs to be all set before adding it. This
-was not the case for the bit-banging fallback, resulting in an oops if the
-device detection GMBUS transfers timed out. Fix the issue by calling
-i2c_add_adapter() only after intel_gpio_setup().
-
-LKML-Reference: <5021F00B.7000503@ionic.de>
-Tested-by: Mihai Moldovan <ionic@ionic.de>
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
----
- drivers/gpu/drm/i915/intel_i2c.c |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
-index d79500b..b9755f6 100644
---- a/drivers/gpu/drm/i915/intel_i2c.c
-+++ b/drivers/gpu/drm/i915/intel_i2c.c
-@@ -486,9 +486,6 @@ int intel_setup_gmbus(struct drm_device *dev)
- 		bus->dev_priv = dev_priv;
- 
- 		bus->adapter.algo = &gmbus_algorithm;
--		ret = i2c_add_adapter(&bus->adapter);
--		if (ret)
--			goto err;
- 
- 		/* By default use a conservative clock rate */
- 		bus->reg0 = port | GMBUS_RATE_100KHZ;
-@@ -498,6 +495,10 @@ int intel_setup_gmbus(struct drm_device *dev)
- 			bus->force_bit = true;
- 
- 		intel_gpio_setup(bus, port);
-+
-+		ret = i2c_add_adapter(&bus->adapter);
-+		if (ret)
-+			goto err;
- 	}
- 
- 	intel_i2c_reset(dev_priv->dev);
--- 
-1.7.7.6
-
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 389ab27c6..e5af2a1bd 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.6.1-1-LIBRE
+KERNEL_VERSION=3.6.2-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre/watchdog-3.5.x.patch b/libre/linux-libre/watchdog-3.5.x.patch
deleted file mode 100644
index 7ac1e6732..000000000
--- a/libre/linux-libre/watchdog-3.5.x.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
-index 027cc8f..a05fdfc 100644
---- a/drivers/mfd/lpc_ich.c
-+++ b/drivers/mfd/lpc_ich.c
-@@ -765,7 +765,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
- 	u32 base_addr_cfg;
- 	u32 base_addr;
- 	int ret;
--	bool acpi_conflict = false;
- 	struct resource *res;
- 
- 	/* Setup power management base register */
-@@ -780,20 +779,11 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
- 	res = wdt_io_res(ICH_RES_IO_TCO);
- 	res->start = base_addr + ACPIBASE_TCO_OFF;
- 	res->end = base_addr + ACPIBASE_TCO_END;
--	ret = acpi_check_resource_conflict(res);
--	if (ret) {
--		acpi_conflict = true;
--		goto wdt_done;
--	}
- 
- 	res = wdt_io_res(ICH_RES_IO_SMI);
- 	res->start = base_addr + ACPIBASE_SMI_OFF;
- 	res->end = base_addr + ACPIBASE_SMI_END;
--	ret = acpi_check_resource_conflict(res);
--	if (ret) {
--		acpi_conflict = true;
--		goto wdt_done;
--	}
-+
- 	lpc_ich_enable_acpi_space(dev);
- 
- 	/*
-@@ -813,11 +803,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
- 		res = wdt_mem_res(ICH_RES_MEM_GCS);
- 		res->start = base_addr + ACPIBASE_GCS_OFF;
- 		res->end = base_addr + ACPIBASE_GCS_END;
--		ret = acpi_check_resource_conflict(res);
--		if (ret) {
--			acpi_conflict = true;
--			goto wdt_done;
--		}
- 	}
- 
- 	lpc_ich_finalize_cell(&lpc_ich_cells[LPC_WDT], id);
-@@ -825,9 +810,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
- 				1, NULL, 0);
- 
- wdt_done:
--	if (acpi_conflict)
--		pr_warn("Resource conflict(s) found affecting %s\n",
--				lpc_ich_cells[LPC_WDT].name);
- 	return ret;
- }
- 
--- 
-1.7.1
-
-  
\ No newline at end of file