]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Wed, 12 Oct 2011 04:13:04 +0000 (15:13 +1100)]
Merge remote-tracking branch 'edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Wed, 12 Oct 2011 04:10:06 +0000 (15:10 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 04:08:42 +0000 (15:08 +1100)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 04:02:15 +0000 (15:02 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
Stephen Rothwell [Wed, 12 Oct 2011 03:57:58 +0000 (14:57 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/PCI/pci.txt
arch/arm/mach-nuc93x/time.c
drivers/net/Kconfig
Stephen Rothwell [Wed, 12 Oct 2011 03:50:48 +0000 (14:50 +1100)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 03:44:49 +0000 (14:44 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 12 Oct 2011 03:43:27 +0000 (14:43 +1100)]
Merge remote-tracking branch 'dwmw2-iommu/master'
Stephen Rothwell [Wed, 12 Oct 2011 03:43:17 +0000 (14:43 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 12 Oct 2011 03:42:35 +0000 (14:42 +1100)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Wed, 12 Oct 2011 03:35:55 +0000 (14:35 +1100)]
Merge remote-tracking branch 'security/next'
Conflicts:
fs/ocfs2/xattr.c
Stephen Rothwell [Wed, 12 Oct 2011 03:34:28 +0000 (14:34 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 03:33:07 +0000 (14:33 +1100)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
drivers/video/omap/lcd_apollon.c
drivers/video/omap/lcd_ldp.c
drivers/video/omap/lcd_overo.c
Stephen Rothwell [Wed, 12 Oct 2011 03:26:43 +0000 (14:26 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Conflicts:
drivers/video/Kconfig
Stephen Rothwell [Wed, 12 Oct 2011 03:25:12 +0000 (14:25 +1100)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
arch/arm/mach-imx/mach-mx31moboard.c
arch/arm/mach-u300/include/mach/irqs.h
Stephen Rothwell [Wed, 12 Oct 2011 03:23:44 +0000 (14:23 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 03:17:13 +0000 (14:17 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 03:17:03 +0000 (14:17 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 12 Oct 2011 03:15:40 +0000 (14:15 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Conflicts:
drivers/mmc/core/core.c
drivers/mmc/core/sd.c
drivers/mmc/host/au1xmmc.c
Stephen Rothwell [Wed, 12 Oct 2011 02:58:14 +0000 (13:58 +1100)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Wed, 12 Oct 2011 02:56:23 +0000 (13:56 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:54:52 +0000 (13:54 +1100)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Wed, 12 Oct 2011 02:52:40 +0000 (13:52 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 02:50:48 +0000 (13:50 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 12 Oct 2011 02:49:28 +0000 (13:49 +1100)]
Merge branch 'quilt/rr'
Stephen Rothwell [Wed, 12 Oct 2011 02:48:08 +0000 (13:48 +1100)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Wed, 12 Oct 2011 02:46:41 +0000 (13:46 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 02:44:24 +0000 (13:44 +1100)]
Merge remote-tracking branch 'sound/for-next'
Conflicts:
arch/arm/plat-omap/devices.c
arch/mips/alchemy/devboards/db1x00/platform.c
sound/mips/Kconfig
Stephen Rothwell [Wed, 12 Oct 2011 02:38:43 +0000 (13:38 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:37:21 +0000 (13:37 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
arch/arm/mach-at91/board-usb-a9260.c
drivers/mtd/maps/lantiq-flash.c
Stephen Rothwell [Wed, 12 Oct 2011 02:36:15 +0000 (13:36 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Conflicts:
net/bluetooth/hci_core.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/bluetooth/smp.c
Stephen Rothwell [Wed, 12 Oct 2011 02:13:23 +0000 (13:13 +1100)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:06:37 +0000 (13:06 +1100)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
drivers/s390/cio/qdio_main.c
Stephen Rothwell [Wed, 12 Oct 2011 02:03:53 +0000 (13:03 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 12 Oct 2011 02:01:43 +0000 (13:01 +1100)]
Merge remote-tracking branch 'scsi/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:01:39 +0000 (13:01 +1100)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:01:33 +0000 (13:01 +1100)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Wed, 12 Oct 2011 02:00:13 +0000 (13:00 +1100)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:58:35 +0000 (12:58 +1100)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:57:17 +0000 (12:57 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Wed, 12 Oct 2011 01:57:13 +0000 (12:57 +1100)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:55:50 +0000 (12:55 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:54:05 +0000 (12:54 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:52:43 +0000 (12:52 +1100)]
Merge remote-tracking branch 'docs/docs-move'
Stephen Rothwell [Wed, 12 Oct 2011 01:51:31 +0000 (12:51 +1100)]
Merge branch 'quilt/kernel-doc'
Stephen Rothwell [Wed, 12 Oct 2011 01:50:11 +0000 (12:50 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:48:59 +0000 (12:48 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Wed, 12 Oct 2011 01:47:40 +0000 (12:47 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 12 Oct 2011 01:46:29 +0000 (12:46 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Wed, 12 Oct 2011 01:45:10 +0000 (12:45 +1100)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/hid-wacom.c
Stephen Rothwell [Wed, 12 Oct 2011 01:43:41 +0000 (12:43 +1100)]
Merge remote-tracking branch 'xfs/master'
Conflicts:
fs/xfs/xfs_aops.c
fs/xfs/xfs_super.c
Stephen Rothwell [Wed, 12 Oct 2011 01:42:27 +0000 (12:42 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:40:58 +0000 (12:40 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:34:53 +0000 (12:34 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:33:39 +0000 (12:33 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:32:24 +0000 (12:32 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:30:56 +0000 (12:30 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 12 Oct 2011 01:29:40 +0000 (12:29 +1100)]
Merge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:28:21 +0000 (12:28 +1100)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:27:08 +0000 (12:27 +1100)]
Merge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:25:56 +0000 (12:25 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 12 Oct 2011 01:24:41 +0000 (12:24 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 12 Oct 2011 01:23:28 +0000 (12:23 +1100)]
Merge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Wed, 12 Oct 2011 01:22:16 +0000 (12:22 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 12 Oct 2011 01:15:48 +0000 (12:15 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 12 Oct 2011 01:14:30 +0000 (12:14 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 12 Oct 2011 01:08:04 +0000 (12:08 +1100)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 12 Oct 2011 01:06:53 +0000 (12:06 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:05:31 +0000 (12:05 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:04:12 +0000 (12:04 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:03:01 +0000 (12:03 +1100)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 01:01:49 +0000 (12:01 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Wed, 12 Oct 2011 01:00:29 +0000 (12:00 +1100)]
Merge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 12 Oct 2011 00:59:11 +0000 (11:59 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:52:44 +0000 (11:52 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:51:33 +0000 (11:51 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 12 Oct 2011 00:50:15 +0000 (11:50 +1100)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:46:56 +0000 (11:46 +1100)]
Merge remote-tracking branch 's5p/for-next'
Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile
Stephen Rothwell [Wed, 12 Oct 2011 00:45:32 +0000 (11:45 +1100)]
Merge remote-tracking branch 'i.MX/for-next'
Conflicts:
arch/arm/mach-mx5/mm.c
Stephen Rothwell [Wed, 12 Oct 2011 00:44:06 +0000 (11:44 +1100)]
Merge remote-tracking branch 'at91/at91-next'
Conflicts:
arch/arm/mach-at91/at91sam9g45.c
Stephen Rothwell [Wed, 12 Oct 2011 00:38:08 +0000 (11:38 +1100)]
Merge remote-tracking branch 'arm-soc/for-next'
Conflicts:
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h
Stephen Rothwell [Wed, 12 Oct 2011 00:30:18 +0000 (11:30 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c
Stephen Rothwell [Wed, 12 Oct 2011 00:29:01 +0000 (11:29 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:37 +0000 (11:22 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:36 +0000 (11:22 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:36 +0000 (11:22 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:34 +0000 (11:22 +1100)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Wed, 12 Oct 2011 00:22:33 +0000 (11:22 +1100)]
Merge remote-tracking branch 'arm-current/fixes'
Felix Fietkau [Sat, 8 Oct 2011 20:02:59 +0000 (22:02 +0200)]
ath9k: only send FCS-fail packets to mac80211 if requested
Prevents lots of broken frames from showing up on monitor interfaces
by default.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau [Sat, 8 Oct 2011 20:02:58 +0000 (22:02 +0200)]
ath9k_hw: fix a regression in key miss handling
The commit "ath9k_hw: Fix incorrect key_miss handling" changed the code
to only report key miss errors if a MIC error wasn't reported.
When checking the flags in that order in the MAC code, it might miss some
real events, because the value of the MIC error flag is undefined under
some conditions.
The primary issue addressed by the previous commit is making sure that
MIC errors are properly reported on the STA side. This can be fixed in
a better way by adding a separate rx status flag for key miss and
ignoring it for multicast frames.
This fix slightly improves stability in AP mode on some older hardware,
like AR9132.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau [Sat, 8 Oct 2011 18:06:22 +0000 (20:06 +0200)]
ath9k_hw: remove EEP_REG_1
It was previously used for current_rd_ext
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau [Sat, 8 Oct 2011 18:06:21 +0000 (20:06 +0200)]
ath: remove ath_regulatory::current_rd_ext
It is unused since the previous dead code that was using it had been
removed earlier.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau [Sat, 8 Oct 2011 18:06:20 +0000 (20:06 +0200)]
ath9k_hw: clean up tx power handling
The code for handling various restrictions concerning regulatory limits,
antenna gain, etc. is very convoluted and duplicated across various
EEPROM parsing implementations, making it hard to review.
This patch partially cleans up the mess by unifying regulatory limit
handling in one function and simplifying handling of antenna gain.
It also removes unused transmit power scaling arrays from the EEPROM code,
which belonged to an unimplemented API that isn't supposed to be in
the driver anyway.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau [Sat, 8 Oct 2011 18:06:19 +0000 (20:06 +0200)]
ath9k_hw: make ath9k_hw_set_interrupts use ah->imask by default
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Felix Fietkau [Sat, 8 Oct 2011 13:49:57 +0000 (15:49 +0200)]
ath9k: disable unnecessary PHY error reporting
PHY errors relevant for ANI are always tracked by hardware counters, the
bits that allow them to pass through the rx filter are independent of that.
Enabling PHY errors in the rx filter often creates lots of useless DMA traffic
and might be responsible for some of the rx dma stop failure warnings.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Rafał Miłecki [Fri, 7 Oct 2011 20:39:35 +0000 (22:39 +0200)]
b43: trivial: do not report any link quality instead of invalid one
We don't want to report random quality info (new PHYs are affected).
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Larry Finger [Fri, 7 Oct 2011 16:27:33 +0000 (11:27 -0500)]
rtlwifi: Change debug parameter to apply to individual drivers
The current debug parameter is applied to rtlwifi, which means that all
loaded drivers have the same level of debugging applied. In addition,
the previous method requires a two-step load process to enable debugging.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg [Fri, 7 Oct 2011 12:55:40 +0000 (14:55 +0200)]
mac80211: dont orphan TX skb
This was another workaround for truesize "bugs".
The reason we did this was that when we orphaned
the SKB it wouldn't be truesize-checked later.
Now that the check is gone (and we just charge
the former smaller size to the socket) there's
no longer a reason to orphan the skb here.
Keep the skb charged to the socket until it is
really freed (or orphaned in TX status). This
helps flow control and allows us to get at the
socket later for other purposes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg [Fri, 7 Oct 2011 12:55:39 +0000 (14:55 +0200)]
mac80211: dont adjust truesize
There's no need to adjust truesize.
The history of this was that we always ran into
skb_truesize_bug (via skb_truesize_check) which
has since been removed in commit
92a0acce186cd .
skb_truesize_check() checked that truesize was
bigger or equal to the actual allocation, which
would trigger in mac80211 due to header adding.
The check no longer exists and we shouldn't be
messing with the truesize anwyay.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Johannes Berg [Fri, 7 Oct 2011 12:01:26 +0000 (14:01 +0200)]
mac80211: parse radiotap header earlier
We can now move the radiotap header parsing into
ieee80211_monitor_start_xmit(). This moves it out of
the hotpath, and also helps the code since now the
radiotap header will no longer be present in
ieee80211_xmit() etc. which is easier to understand.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>