2.6.42.3-1.fc15

17 files changed, 205 insertions, 345 deletions

diff --git a/freed-ora/current/f15/arm-build-bug-on.patch b/freed-ora/current/f15/arm-build-bug-on.patch
new file mode 100644
index 000000000..deb0998d6
--- /dev/null
+++ b/freed-ora/current/f15/arm-build-bug-on.patch
@@ -0,0 +1,28 @@
+BUILD_BUG_ON is defined in linux/kernel.h but that is not included by the
+asm/bug.h header which uses it. This causes a build error:
+
+...include/linux/mtd/map.h: In function 'inline_map_read':
+...include/linux/mtd/map.h:408:3: error: implicit declaration of function
+'BUILD_BUG_ON' [-Werror=implicit-function-declaration]
+
+The check is not essential and is not present for other architectures, so
+just remove it.
+
+Signed-off-by: Simon Glass <sjg <at> chromium.org>
+---
+ arch/arm/include/asm/bug.h |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h
+index 9abe7a0..fac79dc 100644
+--- a/arch/arm/include/asm/bug.h
++++ b/arch/arm/include/asm/bug.h
+@@ -32,7 +32,6 @@
+
+ #define __BUG(__file, __line, __value)				\
+ do {								\
+-	BUILD_BUG_ON(sizeof(struct bug_entry) != 12);		\
+ 	asm volatile("1:\t" BUG_INSTR_TYPE #__value "\n"	\
+ 		".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \
+ 		"2:\t.asciz " #__file "\n" 			\
+--
diff --git a/freed-ora/current/f15/arm-stmmac-mmc-core.patch b/freed-ora/current/f15/arm-stmmac-mmc-core.patch
new file mode 100644
index 000000000..469fe42d4
--- /dev/null
+++ b/freed-ora/current/f15/arm-stmmac-mmc-core.patch
@@ -0,0 +1,26 @@
+Fix this error:
+
+  CC      drivers/net/ethernet/stmicro/stmmac/mmc_core.o
+drivers/net/ethernet/stmicro/stmmac/mmc_core.c: In function 'dwmac_mmc_ctrl':
+drivers/net/ethernet/stmicro/stmmac/mmc_core.c:143:2: error: implicit
+  declaration of function 'pr_debug' [-Werror=implicit-function-declaration]
+
+Signed-off-by: Stefan Roese <sr <at> denx.de>
+Cc: Giuseppe Cavallaro <peppe.cavallaro <at> st.com>
+---
+ drivers/net/ethernet/stmicro/stmmac/mmc_core.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+index 41e6b33..c07cfe9 100644
+--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
++++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
+@@ -22,6 +22,7 @@
+   Author: Giuseppe Cavallaro <peppe.cavallaro <at> st.com>
+ *******************************************************************************/
+
++#include <linux/kernel.h>
+ #include <linux/io.h>
+ #include "mmc.h"
+
+--
diff --git a/freed-ora/current/f15/arm-tegra-nvec-kconfig.patch b/freed-ora/current/f15/arm-tegra-nvec-kconfig.patch
new file mode 100644
index 000000000..a3f568cd5
--- /dev/null
+++ b/freed-ora/current/f15/arm-tegra-nvec-kconfig.patch
@@ -0,0 +1,10 @@
+--- linux-2.6.42.noarch/drivers/staging/nvec/Kconfig.orig	2012-02-02 08:16:12.512727480 -0600
++++ linux-2.6.42.noarch/drivers/staging/nvec/Kconfig	2012-02-01 18:44:56.674990109 -0600
+@@ -1,6 +1,6 @@
+ config MFD_NVEC
+ 	bool "NV Tegra Embedded Controller SMBus Interface"
+-	depends on I2C && GPIOLIB && ARCH_TEGRA
++	depends on I2C && GPIOLIB && ARCH_TEGRA && MFD_CORE=y
+ 	help
+ 	    Say Y here to enable support for a nVidia compliant embedded
+ 	    controller.
diff --git a/freed-ora/current/f15/bcma-brcmsmac-compat.patch b/freed-ora/current/f15/bcma-brcmsmac-compat.patch
new file mode 100644
index 000000000..e16e5b0c5
--- /dev/null
+++ b/freed-ora/current/f15/bcma-brcmsmac-compat.patch
@@ -0,0 +1,35 @@
+Simple patch to remove the overlap between the bcma (i.e. b43) driver
+and the brcmsmac driver.  David Woodhouse <dwmw2@infradead.org>
+confirmed that this patch restores functionality of bcm4331 devices.
+
+-- John W. Linville <linville@redhat.com>
+
+diff -up linux-3.1.x86_64/drivers/bcma/host_pci.c.orig linux-3.1.x86_64/drivers/bcma/host_pci.c
+--- linux-3.1.x86_64/drivers/bcma/host_pci.c.orig	2011-11-10 11:41:26.829742757 -0500
++++ linux-3.1.x86_64/drivers/bcma/host_pci.c	2011-11-10 11:41:22.884792078 -0500
+@@ -225,11 +225,13 @@ static void bcma_host_pci_remove(struct 
+ }
+ 
+ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
+-	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
++#if 0 /* Not in Fedora... */
++ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
++#endif
+ 	{ 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
+diff -up linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig
+--- linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig.orig	2011-11-10 11:42:31.764930961 -0500
++++ linux-3.1.x86_64/drivers/net/wireless/brcm80211/Kconfig	2011-11-10 11:42:33.613907846 -0500
+@@ -5,7 +5,6 @@ config BRCMSMAC
+ 	tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver"
+ 	depends on PCI
+ 	depends on MAC80211
+-	depends on BCMA=n
+ 	select BRCMUTIL
+ 	select FW_LOADER
+ 	select CRC_CCITT
diff --git a/freed-ora/current/f15/config-arm-generic b/freed-ora/current/f15/config-arm-generic
index 558c7c4d0..4f44a3e37 100644
--- a/freed-ora/current/f15/config-arm-generic
+++ b/freed-ora/current/f15/config-arm-generic
@@ -186,6 +186,9 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 # CONFIG_DRM_NOUVEAU is not set 
 # CONFIG_MLX4_EN is not set
 
+# drivers/input/touchscreen/eeti_ts.c:65:2: error: implicit declaration of function 'irq_to_gpio' [-Werror=implicit-function-declaration]
+# CONFIG_TOUCHSCREEN_EETI is not set
+
 # FIXME: Guesses, need checking
 # CONFIG_MACH_EUKREA_CPUIMX35SD is not set
 CONFIG_ARM_ERRATA_720789=y
diff --git a/freed-ora/current/f15/config-arm-imx b/freed-ora/current/f15/config-arm-imx
index 2dbe10a1f..7aa2c779b 100644
--- a/freed-ora/current/f15/config-arm-imx
+++ b/freed-ora/current/f15/config-arm-imx
@@ -33,7 +33,7 @@ CONFIG_MXC_IRQ_PRIOR=y
 CONFIG_MXC_PWM=m
 CONFIG_MXC_DEBUG_BOARD=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
-# CONFIG_CACHE_L2X0 is not set
+CONFIG_CACHE_L2X0=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARM_ERRATA_411920=y
 CONFIG_PL310_ERRATA_588369=y
@@ -56,7 +56,7 @@ CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_PLL=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_IMX21_HCD=m
+# CONFIG_USB_IMX21_HCD is not set
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_MXC=m
 CONFIG_RTC_MXC=m
diff --git a/freed-ora/current/f15/config-arm-kirkwood b/freed-ora/current/f15/config-arm-kirkwood
index 415e822dc..5eb6a3db3 100644
--- a/freed-ora/current/f15/config-arm-kirkwood
+++ b/freed-ora/current/f15/config-arm-kirkwood
@@ -39,5 +39,3 @@ CONFIG_LEDS_NETXBIG=m
 CONFIG_RTC_DRV_MV=m
 CONFIG_MV_XOR=y
 CONFIG_CRYPTO_DEV_MV_CESA=m
-
-# CONFIG_TOUCHSCREEN_EETI is not set
diff --git a/freed-ora/current/f15/config-arm-tegra b/freed-ora/current/f15/config-arm-tegra
index 495e91e65..11f060d06 100644
--- a/freed-ora/current/f15/config-arm-tegra
+++ b/freed-ora/current/f15/config-arm-tegra
@@ -68,6 +68,7 @@ CONFIG_KEYBOARD_NVEC=y
 CONFIG_SERIO_NVEC_PS2=y
 CONFIG_NVEC_POWER=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_NVEC_LEDS=y
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_DEBUG=y
diff --git a/freed-ora/current/f15/config-debug b/freed-ora/current/f15/config-debug
index 19ae4656f..e3c1e6e44 100644
--- a/freed-ora/current/f15/config-debug
+++ b/freed-ora/current/f15/config-debug
@@ -104,3 +104,8 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=1024
+# CONFIG_DEBUG_KMEMLEAK_TEST is not set
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
diff --git a/freed-ora/current/f15/config-generic b/freed-ora/current/f15/config-generic
index 91db05d48..5f4d743c6 100644
--- a/freed-ora/current/f15/config-generic
+++ b/freed-ora/current/f15/config-generic
@@ -174,7 +174,7 @@ CONFIG_INFINIBAND_QIB=m
 CONFIG_BINFMT_ELF=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
+CONFIG_BINFMT_MISC=y
 
 #
 # Device Drivers
@@ -363,7 +363,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=16384
 CONFIG_BLK_DEV_INITRD=y
@@ -2511,31 +2511,25 @@ CONFIG_AGP_SIS=y
 CONFIG_AGP_SWORKS=y
 CONFIG_AGP_VIA=y
 CONFIG_AGP_EFFICEON=y
-
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
-
-# CONFIG_STUB_POULSBO is not set
-
+CONFIG_STUB_POULSBO=m
+# CONFIG_DRM_PSB is not set
 CONFIG_DRM=m
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_SIS is not set
-# CONFIG_DRM_SAVAGE is not set
+CONFIG_DRM_I810=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
-# CONFIG_DRM_VIA is not set
+CONFIG_DRM_VIA=m
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
-CONFIG_DRM_PSB=m
-# CONFIG_DRM_PSB_MRST is not set
-# CONFIG_DRM_PSB_MFLD is not set
-# CONFIG_DRM_PSB_CDV is not set
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_VMWGFX=m
@@ -3573,14 +3567,25 @@ CONFIG_MFD_WM8400=m
 #
 CONFIG_MISC_FILESYSTEMS=y
 
-# ext4 is used for ext2 and ext3 filesystems
-# CONFIG_EXT2_FS is not set
-# CONFIG_EXT3_FS is not set
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+
 CONFIG_EXT4_FS=y
-CONFIG_EXT4_USE_FOR_EXT23=y
 CONFIG_EXT4_FS_XATTR=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_USE_FOR_EXT23 is not set
+
 CONFIG_JBD2=y
 CONFIG_FS_MBCACHE=y
 CONFIG_REISERFS_FS=m
@@ -4102,12 +4107,14 @@ CONFIG_PM_RUNTIME=y
 # CONFIG_PM_OPP is not set
 
 CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_TABLE=y
 CONFIG_CPU_FREQ_STAT=m
 CONFIG_CPU_FREQ_STAT_DETAILS=y
diff --git a/freed-ora/current/f15/config-x86-generic b/freed-ora/current/f15/config-x86-generic
index fec30ea87..c57aa12d3 100644
--- a/freed-ora/current/f15/config-x86-generic
+++ b/freed-ora/current/f15/config-x86-generic
@@ -86,10 +86,10 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_CUSTOM_METHOD=m
 
-CONFIG_X86_ACPI_CPUFREQ=y
-CONFIG_X86_PCC_CPUFREQ=y
-CONFIG_X86_POWERNOW_K8=y
-CONFIG_X86_P4_CLOCKMOD=y
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_P4_CLOCKMOD=m
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 
 #
diff --git a/freed-ora/current/f15/kernel.spec b/freed-ora/current/f15/kernel.spec
index a3ad242aa..20eb439d7 100644
--- a/freed-ora/current/f15/kernel.spec
+++ b/freed-ora/current/f15/kernel.spec
@@ -55,7 +55,7 @@ Summary: The Linux kernel
 #define librev
 
 # To be inserted between "patch" and "-2.6.".
-#define stablelibre -libre
+%define stablelibre -libre
 #define rcrevlibre -libre
 #define gitrevlibre -libre
 
@@ -65,7 +65,7 @@ Summary: The Linux kernel
 #define libres .
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -678,6 +678,9 @@ Patch20000: utrace.patch
 # Flattened devicetree support
 Patch21000: arm-omap-dt-compat.patch
 Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
+Patch21002: arm-build-bug-on.patch
+Patch21003: arm-stmmac-mmc-core.patch
+Patch21004: arm-tegra-nvec-kconfig.patch
 
 #rhbz 717735
 Patch21045: nfs-client-freezer.patch
@@ -685,9 +688,6 @@ Patch21045: nfs-client-freezer.patch
 #rhbz 590880
 Patch21046: alps.patch
 
-#rhbz 746097
-Patch21049: tpm_tis-delay-after-aborting-cmd.patch
-
 Patch21070: ext4-Support-check-none-nocheck-mount-options.patch
 Patch21071: ext4-Fix-error-handling-on-inode-bitmap-corruption.patch
 Patch21072: ext3-Fix-error-handling-on-inode-bitmap-corruption.patch
@@ -713,6 +713,9 @@ Patch21084: proc-fix-null-pointer-deref-in-proc_pid_permission.patch
 #rhbz 783211
 Patch21087: fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch
 
+# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
+Patch21091: bcma-brcmsmac-compat.patch
+
 #rhbz 771058
 Patch21100: msi-irq-sysfs-warning.patch
 
@@ -721,13 +724,6 @@ Patch21101: hpsa-add-irqf-shared.patch
 
 Patch21225: pci-Rework-ASPM-disable-code.patch
 
-Patch21227: mac80211-fix-work-removal-on-deauth-request.patch
-
-#rhbz 718790
-Patch21230: rds-Make-rds_sock_lock-BH-rather-than-IRQ-safe.patch
-
-Patch22000: rcu-reintroduce-missing-calls.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1178,6 +1174,9 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 #
 ApplyPatch arm-omap-dt-compat.patch
 ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
+ApplyPatch arm-build-bug-on.patch
+ApplyPatch arm-stmmac-mmc-core.patch
+ApplyPatch arm-tegra-nvec-kconfig.patch
 
 ApplyPatch taint-vbox.patch
 #
@@ -1312,17 +1311,12 @@ ApplyPatch hpsa-add-irqf-shared.patch
 
 ApplyPatch pci-Rework-ASPM-disable-code.patch
 
-ApplyPatch mac80211-fix-work-removal-on-deauth-request.patch
-
 #rhbz 717735
 ApplyPatch nfs-client-freezer.patch
 
 #rhbz 590880
 ApplyPatch alps.patch
 
-#rhbz 746097
-ApplyPatch tpm_tis-delay-after-aborting-cmd.patch
-
 #rhbz 771058
 ApplyPatch msi-irq-sysfs-warning.patch
 
@@ -1342,14 +1336,12 @@ ApplyPatch procfs-parse-mount-options.patch
 ApplyPatch procfs-add-hidepid-and-gid-mount-options.patch
 ApplyPatch proc-fix-null-pointer-deref-in-proc_pid_permission.patch
 
-ApplyPatch rcu-reintroduce-missing-calls.patch
-
-#rhbz 718790
-ApplyPatch rds-Make-rds_sock_lock-BH-rather-than-IRQ-safe.patch
-
 #rhbz 783211
 ApplyPatch fs-Inval-cache-for-parent-block-device-if-fsync-called-on-part.patch
 
+# Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
+ApplyPatch bcma-brcmsmac-compat.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1997,7 +1989,42 @@ fi
 # and build.
 
 %changelog
-* Tue Jan 31 2012 Alexandre Oliva <lxoliva@fsfla.org> -libre
+* Sat Feb 04 2012 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- Use patch-3.2-libre-3.2.3-libre as patch-libre-3.2.3.
+
+* Fri Feb 03 2012 Dave Jones <davej@redhat.com>
+- Linux 3.2.3
+
+* Thu Feb 02 2012 Dennis Gilmore <dennis@ausil.us>
+- add patch to ensure that mfd-core is builtin when building nvec on tegra
+- build nvec-leds on tegra kernel
+
+* Wed Feb 01 2012 Dave Jones <davej@redhat.com>
+- Revert more f16 config changes that shouldn't be in f15.
+
+* Wed Feb 01 2012 Dave Jones <davej@redhat.com>
+- Revert the f16 use-ext4-for-ext2/ext3 change.
+
+* Tue Jan 31 2012 Dennis Gilmore <dennis@ausil.us>
+- diable TOUCHSCREEN_EETI on all arm arches 
+- add patch for arm mtd
+- add patch for stmmac on arm
+- disable USB_IMX21_HCD pn imx
+- enable CACHE_L2X0 on imx
+
+* Mon Jan 30 2012 Dave Jones <davej@redhat.com>
+- Enable kmemleak (off by default) in kernel-debug (rhbz 782419)
+
+* Mon Jan 30 2012 Dave Jones <davej@redhat.com>
+- Test fix for realtek_async_autopm oops from Stanislaw Gruszka (rhbz 784345)
+
+* Mon Jan 30 2012 Dave Jones <davej@redhat.com>
+- Restore the Savage DRM and several others that were accidentally early-deprecated.
+
+* Mon Jan 30 2012 John W. Linville <linville@redhat.com>
+- Reinstate patch to remove overlap between bcma/b43 and brcmsmac
+
+* Mon Jan 30 2012 Alexandre Oliva <lxoliva@fsfla.org> -libre Tue Jan 31
 - Linux 3.2.2-libre
 
 * Mon Jan 30 2012 Dave Jones <davej@redhat.com> 2.6.42.2-1
diff --git a/freed-ora/current/f15/mac80211-fix-work-removal-on-deauth-request.patch b/freed-ora/current/f15/mac80211-fix-work-removal-on-deauth-request.patch
deleted file mode 100644
index 60b91d3cf..000000000
--- a/freed-ora/current/f15/mac80211-fix-work-removal-on-deauth-request.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Path: news.gmane.org!not-for-mail
-From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
-Newsgroups: gmane.linux.kernel.wireless.general
-Subject: [PATCH 3.3] mac80211: fix work removal on deauth request
-Date: Wed, 18 Jan 2012 14:10:25 +0100
-Lines: 107
-Approved: news@gmane.org
-Message-ID: <1326892225.4778.5.camel@jlt3.sipsolutions.net>
-NNTP-Posting-Host: lo.gmane.org
-Mime-Version: 1.0
-Content-Type: text/plain; charset="UTF-8"
-Content-Transfer-Encoding: 7bit
-X-Trace: dough.gmane.org 1326892249 18013 80.91.229.12 (18 Jan 2012 13:10:49 GMT)
-X-Complaints-To: usenet@dough.gmane.org
-NNTP-Posting-Date: Wed, 18 Jan 2012 13:10:49 +0000 (UTC)
-Cc: linux-wireless <linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
-	Pontus Fuchs <pontus.fuchs-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-To: John Linville <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
-Original-X-From: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Wed Jan 18 14:10:44 2012
-Return-path: <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
-Envelope-to: glkwg-linux-wireless-1dZseelyfdZg9hUCZPvPmw@public.gmane.org
-Original-Received: from vger.kernel.org ([209.132.180.67])
-	by lo.gmane.org with esmtp (Exim 4.69)
-	(envelope-from <linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>)
-	id 1RnVHo-00044l-Aq
-	for glkwg-linux-wireless-1dZseelyfdZg9hUCZPvPmw@public.gmane.org; Wed, 18 Jan 2012 14:10:44 +0100
-Original-Received: (majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org) by vger.kernel.org via listexpand
-	id S1757410Ab2ARNK3 (ORCPT
-	<rfc822;glkwg-linux-wireless@m.gmane.org>);
-	Wed, 18 Jan 2012 08:10:29 -0500
-Original-Received: from he.sipsolutions.net ([78.46.109.217]:45023 "EHLO
-	sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
-	with ESMTP id S1754365Ab2ARNK2 (ORCPT
-	<rfc822;linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>);
-	Wed, 18 Jan 2012 08:10:28 -0500
-Original-Received: by sipsolutions.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32)
-	(Exim 4.77)
-	(envelope-from <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>)
-	id 1RnVHW-0004hf-Lx; Wed, 18 Jan 2012 14:10:26 +0100
-X-Mailer: Evolution 2.30.3 
-Original-Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-Precedence: bulk
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-Xref: news.gmane.org gmane.linux.kernel.wireless.general:84095
-Archived-At: <http://permalink.gmane.org/gmane.linux.kernel.wireless.general/84095>
-
-From: Johannes Berg <johannes.berg-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-
-When deauth is requested while an auth or assoc
-work item is in progress, we currently delete it
-without regard for any state it might need to
-clean up. Fix it by cleaning up for those items.
-
-In the case Pontus found, the problem manifested
-itself as such:
-
-authenticate with 00:23:69:aa:dd:7b (try 1)
-authenticated
-failed to insert Dummy STA entry for the AP (error -17)
-deauthenticating from 00:23:69:aa:dd:7b by local choice (reason=2)
-
-It could also happen differently if the driver
-uses the tx_sync callback.
-
-We can't just call the ->done() method of the work
-items because that will lock up due to the locking
-in cfg80211. This fix isn't very clean, but that
-seems acceptable since I have patches pending to
-remove this code completely.
-
-Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-Reported-by: Pontus Fuchs <pontus.fuchs-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-Tested-by: Pontus Fuchs <pontus.fuchs-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-Signed-off-by: Johannes Berg <johannes.berg-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
----
- net/mac80211/mlme.c |   38 +++++++++++++++++++++++++++-----------
- 1 file changed, 27 insertions(+), 11 deletions(-)
-
---- a/net/mac80211/mlme.c	2012-01-18 14:04:33.000000000 +0100
-+++ b/net/mac80211/mlme.c	2012-01-18 14:04:34.000000000 +0100
-@@ -2750,7 +2750,6 @@ int ieee80211_mgd_deauth(struct ieee8021
- {
- 	struct ieee80211_local *local = sdata->local;
- 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
--	struct ieee80211_work *wk;
- 	u8 bssid[ETH_ALEN];
- 	bool assoc_bss = false;
- 
-@@ -2763,30 +2762,47 @@ int ieee80211_mgd_deauth(struct ieee8021
- 		assoc_bss = true;
- 	} else {
- 		bool not_auth_yet = false;
-+		struct ieee80211_work *tmp, *wk = NULL;
- 
- 		mutex_unlock(&ifmgd->mtx);
- 
- 		mutex_lock(&local->mtx);
--		list_for_each_entry(wk, &local->work_list, list) {
--			if (wk->sdata != sdata)
-+		list_for_each_entry(tmp, &local->work_list, list) {
-+			if (tmp->sdata != sdata)
- 				continue;
- 
--			if (wk->type != IEEE80211_WORK_DIRECT_PROBE &&
--			    wk->type != IEEE80211_WORK_AUTH &&
--			    wk->type != IEEE80211_WORK_ASSOC &&
--			    wk->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
-+			if (tmp->type != IEEE80211_WORK_DIRECT_PROBE &&
-+			    tmp->type != IEEE80211_WORK_AUTH &&
-+			    tmp->type != IEEE80211_WORK_ASSOC &&
-+			    tmp->type != IEEE80211_WORK_ASSOC_BEACON_WAIT)
- 				continue;
- 
--			if (memcmp(req->bss->bssid, wk->filter_ta, ETH_ALEN))
-+			if (memcmp(req->bss->bssid, tmp->filter_ta, ETH_ALEN))
- 				continue;
- 
--			not_auth_yet = wk->type == IEEE80211_WORK_DIRECT_PROBE;
--			list_del_rcu(&wk->list);
--			free_work(wk);
-+			not_auth_yet = tmp->type == IEEE80211_WORK_DIRECT_PROBE;
-+			list_del_rcu(&tmp->list);
-+			synchronize_rcu();
-+			wk = tmp;
- 			break;
- 		}
- 		mutex_unlock(&local->mtx);
- 
-+		if (wk && wk->type == IEEE80211_WORK_ASSOC) {
-+			/* clean up dummy sta & TX sync */
-+			sta_info_destroy_addr(wk->sdata, wk->filter_ta);
-+			if (wk->assoc.synced)
-+				drv_finish_tx_sync(local, wk->sdata,
-+						   wk->filter_ta,
-+						   IEEE80211_TX_SYNC_ASSOC);
-+		} else if (wk && wk->type == IEEE80211_WORK_AUTH) {
-+			if (wk->probe_auth.synced)
-+				drv_finish_tx_sync(local, wk->sdata,
-+						   wk->filter_ta,
-+						   IEEE80211_TX_SYNC_AUTH);
-+		}
-+		kfree(wk);
-+
- 		/*
- 		 * If somebody requests authentication and we haven't
- 		 * sent out an auth frame yet there's no need to send
-
-
---
-To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
-the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-
diff --git a/freed-ora/current/f15/patch-libre-3.2.3.xz.sign b/freed-ora/current/f15/patch-libre-3.2.3.xz.sign
new file mode 100644
index 000000000..9e004afd9
--- /dev/null
+++ b/freed-ora/current/f15/patch-libre-3.2.3.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEABECAAYFAk8sn3gACgkQvLfPh359R6ez4QCdGUeEL8L5aLacGY3tc9ihVfLs
+bdkAoKUqPaYwvs8oGYW23cvAeW+bSyYa
+=rVCg
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f15/rds-Make-rds_sock_lock-BH-rather-than-IRQ-safe.patch b/freed-ora/current/f15/rds-Make-rds_sock_lock-BH-rather-than-IRQ-safe.patch
deleted file mode 100644
index 0946aad6b..000000000
--- a/freed-ora/current/f15/rds-Make-rds_sock_lock-BH-rather-than-IRQ-safe.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From efc3dbc37412c027e363736b4f4c74ee5e8ecffc Mon Sep 17 00:00:00 2001
-From: "David S. Miller" <davem@davemloft.net>
-Date: Tue, 24 Jan 2012 17:03:44 -0500
-Subject: [PATCH] rds: Make rds_sock_lock BH rather than IRQ safe.
-
-rds_sock_info() triggers locking warnings because we try to perform a
-local_bh_enable() (via sock_i_ino()) while hardware interrupts are
-disabled (via taking rds_sock_lock).
-
-There is no reason for rds_sock_lock to be a hardware IRQ disabling
-lock, none of these access paths run in hardware interrupt context.
-
-Therefore making it a BH disabling lock is safe and sufficient to
-fix this bug.
-
-Reported-by: Kumar Sanghvi <kumaras@chelsio.com>
-Reported-by: Josh Boyer <jwboyer@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- net/rds/af_rds.c |   20 ++++++++------------
- 1 files changed, 8 insertions(+), 12 deletions(-)
-
-diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
-index bb6ad81..424ff62 100644
---- a/net/rds/af_rds.c
-+++ b/net/rds/af_rds.c
-@@ -68,7 +68,6 @@ static int rds_release(struct socket *sock)
- {
- 	struct sock *sk = sock->sk;
- 	struct rds_sock *rs;
--	unsigned long flags;
- 
- 	if (!sk)
- 		goto out;
-@@ -94,10 +93,10 @@ static int rds_release(struct socket *sock)
- 	rds_rdma_drop_keys(rs);
- 	rds_notify_queue_get(rs, NULL);
- 
--	spin_lock_irqsave(&rds_sock_lock, flags);
-+	spin_lock_bh(&rds_sock_lock);
- 	list_del_init(&rs->rs_item);
- 	rds_sock_count--;
--	spin_unlock_irqrestore(&rds_sock_lock, flags);
-+	spin_unlock_bh(&rds_sock_lock);
- 
- 	rds_trans_put(rs->rs_transport);
- 
-@@ -409,7 +408,6 @@ static const struct proto_ops rds_proto_ops = {
- 
- static int __rds_create(struct socket *sock, struct sock *sk, int protocol)
- {
--	unsigned long flags;
- 	struct rds_sock *rs;
- 
- 	sock_init_data(sock, sk);
-@@ -426,10 +424,10 @@ static int __rds_create(struct socket *sock, struct sock *sk, int protocol)
- 	spin_lock_init(&rs->rs_rdma_lock);
- 	rs->rs_rdma_keys = RB_ROOT;
- 
--	spin_lock_irqsave(&rds_sock_lock, flags);
-+	spin_lock_bh(&rds_sock_lock);
- 	list_add_tail(&rs->rs_item, &rds_sock_list);
- 	rds_sock_count++;
--	spin_unlock_irqrestore(&rds_sock_lock, flags);
-+	spin_unlock_bh(&rds_sock_lock);
- 
- 	return 0;
- }
-@@ -471,12 +469,11 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len,
- {
- 	struct rds_sock *rs;
- 	struct rds_incoming *inc;
--	unsigned long flags;
- 	unsigned int total = 0;
- 
- 	len /= sizeof(struct rds_info_message);
- 
--	spin_lock_irqsave(&rds_sock_lock, flags);
-+	spin_lock_bh(&rds_sock_lock);
- 
- 	list_for_each_entry(rs, &rds_sock_list, rs_item) {
- 		read_lock(&rs->rs_recv_lock);
-@@ -492,7 +489,7 @@ static void rds_sock_inc_info(struct socket *sock, unsigned int len,
- 		read_unlock(&rs->rs_recv_lock);
- 	}
- 
--	spin_unlock_irqrestore(&rds_sock_lock, flags);
-+	spin_unlock_bh(&rds_sock_lock);
- 
- 	lens->nr = total;
- 	lens->each = sizeof(struct rds_info_message);
-@@ -504,11 +501,10 @@ static void rds_sock_info(struct socket *sock, unsigned int len,
- {
- 	struct rds_info_socket sinfo;
- 	struct rds_sock *rs;
--	unsigned long flags;
- 
- 	len /= sizeof(struct rds_info_socket);
- 
--	spin_lock_irqsave(&rds_sock_lock, flags);
-+	spin_lock_bh(&rds_sock_lock);
- 
- 	if (len < rds_sock_count)
- 		goto out;
-@@ -529,7 +525,7 @@ out:
- 	lens->nr = rds_sock_count;
- 	lens->each = sizeof(struct rds_info_socket);
- 
--	spin_unlock_irqrestore(&rds_sock_lock, flags);
-+	spin_unlock_bh(&rds_sock_lock);
- }
- 
- static void rds_exit(void)
--- 
-1.7.7.6
-
diff --git a/freed-ora/current/f15/sources b/freed-ora/current/f15/sources
index 3b4971e72..e72ced802 100644
--- a/freed-ora/current/f15/sources
+++ b/freed-ora/current/f15/sources
@@ -1,2 +1,2 @@
 27c641c4f6785fc647cdd3e44963a55c  linux-3.2-libre.tar.xz
-5e53edbf75fcaa3a8d1697f3a053102d  patch-3.2.2.xz
+569763d5fbdf08a6e4b7e68b910a0c6d  patch-libre-3.2.3.xz
diff --git a/freed-ora/current/f15/tpm_tis-delay-after-aborting-cmd.patch b/freed-ora/current/f15/tpm_tis-delay-after-aborting-cmd.patch
deleted file mode 100644
index 315284f50..000000000
--- a/freed-ora/current/f15/tpm_tis-delay-after-aborting-cmd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch adds a delay after aborting a command. Some TPMs need
-this and will not process the subsequent command correctly otherwise.
-
-Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
-
---- linux-3.1.noarch/drivers/char/tpm/tpm_tis.c~	2011-12-20 18:08:01.654464487 -0500
-+++ linux-3.1.noarch/drivers/char/tpm/tpm_tis.c	2011-12-20 18:08:23.476380364 -0500
-@@ -432,6 +432,9 @@ static int probe_itpm(struct tpm_chip *c
- out:
- 	itpm = rem_itpm;
- 	tpm_tis_ready(chip);
-+	/* some TPMs need a break here otherwise they will not work
-+	 * correctly on the immediately subsequent command */
-+	msleep(chip->vendor.timeout_b);
- 	release_locality(chip, chip->vendor.locality, 0);
- 
- 	return rc;