GitHub/MotorolaMobilityLLC/kernel-slsi.git
13 years agostaging: rtl8192e: Convert typedef TS_COMMON_INFO to struct ts_common_info
Larry Finger [Tue, 19 Jul 2011 01:19:19 +0000 (20:19 -0500)]
staging: rtl8192e: Convert typedef TS_COMMON_INFO to struct ts_common_info

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Convert typedef RX_TS_RECORD to struct rx_ts_record
Larry Finger [Tue, 19 Jul 2011 01:11:56 +0000 (20:11 -0500)]
staging: rtl8192e: Convert typedef RX_TS_RECORD to struct rx_ts_record

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Convert typedef TX_TS_RECORD to struct tx_ts_record
Larry Finger [Tue, 19 Jul 2011 01:10:03 +0000 (20:10 -0500)]
staging: rtl8192e: Convert typedef TX_TS_RECORD to struct tx_ts_record

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Convert typedef BSS_QOS to struct bss_qos
Larry Finger [Tue, 19 Jul 2011 01:04:31 +0000 (20:04 -0500)]
staging: rtl8192e: Convert typedef BSS_QOS to struct bss_qos

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Fix compilation warnings
Larry Finger [Fri, 15 Jul 2011 21:01:32 +0000 (16:01 -0500)]
staging: rtl8192e: Fix compilation warnings

When the driver is compiled, the following messages result:

  CC [M]  drivers/staging/rtl8192e/r8192E_phy.o
drivers/staging/rtl8192e/r8192E_phy.c: In function ‘rtl8192_phy_ConfigRFWithHeaderFile’:
drivers/staging/rtl8192e/r8192E_phy.c:791:25: warning: array subscript is above array bounds
drivers/staging/rtl8192e/r8192E_phy.c:780:25: warning: array subscript is above array bounds

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Fix unload/reload problem
Larry Finger [Fri, 15 Jul 2011 17:32:41 +0000 (12:32 -0500)]
staging: rtl8192e: Fix unload/reload problem

The driver is not releasing the memory region that was mapped. As a result,
the driver cannot be unloaded and reloaded.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL
Larry Finger [Fri, 15 Jul 2011 04:58:27 +0000 (23:58 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT
Larry Finger [Fri, 15 Jul 2011 03:06:21 +0000 (22:06 -0500)]
staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND
Larry Finger [Fri, 15 Jul 2011 03:03:46 +0000 (22:03 -0500)]
staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove LOOP_TEST as parameter
Larry Finger [Fri, 15 Jul 2011 03:01:47 +0000 (22:01 -0500)]
staging: rtl8192e: Remove LOOP_TEST as parameter

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN
Larry Finger [Fri, 15 Jul 2011 02:58:52 +0000 (21:58 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS
Larry Finger [Fri, 15 Jul 2011 00:03:29 +0000 (19:03 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_
Larry Finger [Thu, 14 Jul 2011 23:56:16 +0000 (18:56 -0500)]
staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_

13 years agostaging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG
Larry Finger [Thu, 14 Jul 2011 23:48:38 +0000 (18:48 -0500)]
staging: rtl8192e: Remove ifdefs for CONFIG_RTLLIB_DEBUG

This symbol is unconditionally defined in a header file, thus tests for it can be removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with RTL819x_DEBUG
Larry Finger [Thu, 14 Jul 2011 23:41:10 +0000 (18:41 -0500)]
staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON
Larry Finger [Thu, 14 Jul 2011 23:38:19 +0000 (18:38 -0500)]
staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC
Larry Finger [Thu, 14 Jul 2011 23:33:33 +0000 (18:33 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_BT_30
Larry Finger [Thu, 14 Jul 2011 22:24:17 +0000 (17:24 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_BT_30

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG
Larry Finger [Thu, 14 Jul 2011 22:22:17 +0000 (17:22 -0500)]
staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA
Larry Finger [Thu, 14 Jul 2011 22:20:32 +0000 (17:20 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP
Larry Finger [Thu, 14 Jul 2011 22:18:14 +0000 (17:18 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with IRQF_SHARED
Larry Finger [Thu, 14 Jul 2011 22:14:28 +0000 (17:14 -0500)]
staging: rtl8192e: Remove dead code associated with IRQF_SHARED

This symbol is defined in the kernel.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211
Larry Finger [Thu, 14 Jul 2011 22:08:46 +0000 (17:08 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO
Larry Finger [Thu, 14 Jul 2011 21:54:46 +0000 (16:54 -0500)]
staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: IEEE80211_RADIOTAP_F_BADFCS is defined in kernel, do not duplicate
Larry Finger [Thu, 14 Jul 2011 21:50:08 +0000 (16:50 -0500)]
staging: rtl8192e: IEEE80211_RADIOTAP_F_BADFCS is defined in kernel, do not duplicate

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG...
Larry Finger [Thu, 14 Jul 2011 15:19:49 +0000 (10:19 -0500)]
staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG_CRDA

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with FOR_ANDROID_X86 and FOR_MOBLIN
Larry Finger [Thu, 14 Jul 2011 14:58:36 +0000 (09:58 -0500)]
staging: rtl8192e: Remove dead code associated with FOR_ANDROID_X86 and FOR_MOBLIN

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with WMM_Hang_8187
Larry Finger [Thu, 14 Jul 2011 14:43:36 +0000 (09:43 -0500)]
staging: rtl8192e: Remove dead code associated with WMM_Hang_8187

This patch also removes an "#if 1 .... #endif" that survived an earlier
edit.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with BUILT_IN_MSHCLASS
Larry Finger [Thu, 14 Jul 2011 03:07:44 +0000 (22:07 -0500)]
staging: rtl8192e: Remove dead code associated with BUILT_IN_MSHCLASS

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with ADHOC_11N
Larry Finger [Thu, 14 Jul 2011 03:05:57 +0000 (22:05 -0500)]
staging: rtl8192e: Remove dead code associated with ADHOC_11N

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with WIFI_TEST
Larry Finger [Thu, 14 Jul 2011 03:04:15 +0000 (22:04 -0500)]
staging: rtl8192e: Remove dead code associated with WIFI_TEST

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with NOT_YET
Larry Finger [Thu, 14 Jul 2011 03:01:59 +0000 (22:01 -0500)]
staging: rtl8192e: Remove dead code associated with NOT_YET

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM
Larry Finger [Thu, 14 Jul 2011 02:58:46 +0000 (21:58 -0500)]
staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT
Larry Finger [Wed, 13 Jul 2011 23:54:50 +0000 (18:54 -0500)]
staging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with SUPPORT_USPD
Larry Finger [Wed, 13 Jul 2011 23:50:46 +0000 (18:50 -0500)]
staging: rtl8192e: Remove dead code associated with SUPPORT_USPD

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX
Larry Finger [Wed, 13 Jul 2011 23:47:44 +0000 (18:47 -0500)]
staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE
Larry Finger [Wed, 13 Jul 2011 14:43:35 +0000 (09:43 -0500)]
staging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove code dependent of JOHN_DUMP
Larry Finger [Wed, 13 Jul 2011 14:38:53 +0000 (09:38 -0500)]
staging: rtl8192e: Remove code dependent of JOHN_DUMP

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove ifdefs that depend on ENABLE_DOT11D
Larry Finger [Wed, 13 Jul 2011 14:35:45 +0000 (09:35 -0500)]
staging: rtl8192e: Remove ifdefs that depend on ENABLE_DOT11D

This configuration parameter is selected in the Makefile, thus the
conditional code can be removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove references to ENABLE_GPIO_RADIO_CTL
Larry Finger [Wed, 13 Jul 2011 05:16:54 +0000 (00:16 -0500)]
staging: rtl8192e: Remove references to ENABLE_GPIO_RADIO_CTL

This configuration variable is set in the make file.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N
Larry Finger [Wed, 13 Jul 2011 05:13:20 +0000 (00:13 -0500)]
staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with PF_SYNCTHREAD
Larry Finger [Wed, 13 Jul 2011 03:30:01 +0000 (22:30 -0500)]
staging: rtl8192e: Remove dead code associated with PF_SYNCTHREAD

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with COMPATIBLE_WITH_RALINK_MESH
Larry Finger [Wed, 13 Jul 2011 03:26:33 +0000 (22:26 -0500)]
staging: rtl8192e: Remove dead code associated with COMPATIBLE_WITH_RALINK_MESH

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_ASPM_OR_D3
Larry Finger [Wed, 13 Jul 2011 03:23:27 +0000 (22:23 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_ASPM_OR_D3

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with USB_USE_ALIGNMENT
Larry Finger [Wed, 13 Jul 2011 03:16:06 +0000 (22:16 -0500)]
staging: rtl8192e: Remove dead code associated with USB_USE_ALIGNMENT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code involved with TO_DO
Larry Finger [Wed, 13 Jul 2011 03:08:32 +0000 (22:08 -0500)]
staging: rtl8192e: Remove dead code involved with TO_DO

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code involved with TO_DO_LIST
Larry Finger [Wed, 13 Jul 2011 03:04:11 +0000 (22:04 -0500)]
staging: rtl8192e: Remove dead code involved with TO_DO_LIST

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO'
Larry Finger [Wed, 13 Jul 2011 02:54:48 +0000 (21:54 -0500)]
staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO'

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with CONFIG_MP
Larry Finger [Wed, 13 Jul 2011 02:46:30 +0000 (21:46 -0500)]
staging: rtl8192e: Remove dead code associated with CONFIG_MP

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Fix kernel panics due to RX skb allocation failures
Larry Finger [Wed, 13 Jul 2011 16:06:34 +0000 (11:06 -0500)]
staging: rtl8192e: Fix kernel panics due to RX skb allocation failures

This driver uses RX skb's of O(2), thus it is possible for memory fragmentation
to prevent the allocation of a new one to replace a newly-received buffer.
When such a failure occurs, the kernel panics.

The fix is to drop an incoming packet whenever such an allocation fails. This
fix matches the one done in rtlwifi for other Realtek PCI devices.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Fix edit error in removal of dead code associated with RTL8190P
Larry Finger [Wed, 13 Jul 2011 16:06:34 +0000 (11:06 -0500)]
staging: rtl8192e: Fix edit error in removal of dead code associated with RTL8190P

One too many lines were removed in an earlier patch. Rather than resubmit
as a V2, this line is added back here.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove internal references to RTL8192E
Larry Finger [Tue, 12 Jul 2011 16:12:56 +0000 (11:12 -0500)]
staging: rtl8192e: Remove internal references to RTL8192E

Now that the code can only generate a driver for RTL8192E, the internal
ifdef's are no longer needed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with RTL8192U
Larry Finger [Tue, 12 Jul 2011 03:52:12 +0000 (22:52 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192U

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with RTL8192SU
Larry Finger [Tue, 12 Jul 2011 03:43:02 +0000 (22:43 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192SU

The vendor code will generate several different drivers.  Eliminate
code used to generate code for the RTL8192SU devices.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with RTL8192CE
Larry Finger [Tue, 12 Jul 2011 03:37:27 +0000 (22:37 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192CE

The vendor code will generate several different drivers. As the RTL8192CE
is covered by a mac80211 driver in mainline, eliminate that code here.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove dead code associated with RTL8192SE
Larry Finger [Tue, 12 Jul 2011 03:25:07 +0000 (22:25 -0500)]
staging: rtl8192e: Remove dead code associated with RTL8192SE

The vendor code will generate several different drivers. As the RTL8192SE
is covered by a mac80211 driver in mainline, eliminate that code heere.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agostaging: rtl8192e: Remove code dependent on RTL8190P
Larry Finger [Mon, 11 Jul 2011 23:34:09 +0000 (18:34 -0500)]
staging: rtl8192e: Remove code dependent on RTL8190P

The vendor code can conditionally generate drivers for a number of
devices. Remove any code that depends on RTL8190P being set.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
13 years agortl8192e: Add a TODO
Mike McCormack [Sun, 10 Jul 2011 23:56:55 +0000 (08:56 +0900)]
rtl8192e: Add a TODO

Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agortl8192e: Remove unused debug code
Mike McCormack [Sun, 10 Jul 2011 23:56:37 +0000 (08:56 +0900)]
rtl8192e: Remove unused debug code

Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agortl8192e: Remove occurences of #if 1
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: Remove occurences of #if 1

Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agortl8192e: Remove WIRELESS_EXT macro checks
Mike McCormack [Sun, 10 Jul 2011 23:56:03 +0000 (08:56 +0900)]
rtl8192e: Remove WIRELESS_EXT macro checks

Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agortl8192e: Remove CONFIG_RTL8192_IO_MAP
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: Remove CONFIG_RTL8192_IO_MAP

Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agortl8192e: Remove extra ifdefs
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: Remove extra ifdefs

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agortl8192e: reject rtl8192se cards with same PCI ID
Mike McCormack [Sun, 10 Jul 2011 23:56:20 +0000 (08:56 +0900)]
rtl8192e: reject rtl8192se cards with same PCI ID

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
13 years agoFrom: wlanfae <wlanfae@realtek.com>
Larry Finger [Wed, 24 Aug 2011 00:00:42 +0000 (19:00 -0500)]
From: wlanfae <wlanfae@realtek.com>
[PATCH 1/8] rtl8192e: Import new version of driver from realtek

Signed-off-by: wlanfae <wlanfae@realtek.com>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

13 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
Larry Finger [Tue, 23 Aug 2011 22:19:00 +0000 (17:19 -0500)]
Merge branch 'master' of git://git./linux/kernel/git/gregkh/staging-2.6

13 years agoLinux 3.1-rc3
Linus Torvalds [Mon, 22 Aug 2011 18:42:53 +0000 (11:42 -0700)]
Linux 3.1-rc3

13 years agoMerge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 22 Aug 2011 18:26:56 +0000 (11:26 -0700)]
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Add group event scheduling option to perf record/stat
  MAINTAINERS: Fix list of perf events source files
  perf tools: Fix build against newer glibc
  perf tools: Fix error handling of unknown events
  perf evlist: Fix missing event name init for default event
  perf list: Fix exit value

13 years agoMerge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 22 Aug 2011 18:25:44 +0000 (11:25 -0700)]
Merge branch 'stable/bug.fixes' of git://git./linux/kernel/git/konrad/xen

* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/tracing: Fix tracing config option properly
  xen: Do not enable PV IPIs when vector callback not present
  xen/x86: replace order-based range checking of M2P table by linear one
  xen: xen-selfballoon.c needs more header files

13 years agoxen/tracing: Fix tracing config option properly
Jeremy Fitzhardinge [Thu, 11 Aug 2011 20:17:20 +0000 (13:17 -0700)]
xen/tracing: Fix tracing config option properly

Steven Rostedt says we should use CONFIG_EVENT_TRACING.

Cc:Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
13 years agoxen: Do not enable PV IPIs when vector callback not present
Stefano Stabellini [Wed, 17 Aug 2011 13:15:00 +0000 (15:15 +0200)]
xen: Do not enable PV IPIs when vector callback not present

Fix regression for HVM case on older (<4.1.1) hypervisors caused by

  commit 99bbb3a84a99cd04ab16b998b20f01a72cfa9f4f
  Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
  Date:   Thu Dec 2 17:55:10 2010 +0000

    xen: PV on HVM: support PV spinlocks and IPIs

This change replaced the SMP operations with event based handlers without
taking into account that this only works when the hypervisor supports
callback vectors. This causes unexplainable hangs early on boot for
HVM guests with more than one CPU.

BugLink: http://bugs.launchpad.net/bugs/791850
CC: stable@kernel.org
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Tested-and-Reported-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
13 years agoMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
Linus Torvalds [Mon, 22 Aug 2011 01:13:19 +0000 (18:13 -0700)]
Merge branch 'fixes' of git://git./linux/kernel/git/ieee1394/linux1394-2.6

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: core: handle ack_busy when fetching the Config ROM

13 years agoBtrfs: fix 64 bit divide problem
Josef Bacik [Sat, 20 Aug 2011 12:29:51 +0000 (08:29 -0400)]
Btrfs: fix 64 bit divide problem

This fixes a regression introduced by commit cdcb725c05fe ("Btrfs: check
if there is enough space for balancing smarter").  We can't do 64-bit
divides on 32-bit architectures.

In cases where we need to divide/multiply by 2 we should just left/right
shift respectively, and in cases where theres N number of devices use
do_div.  Also make the counters u64 to match up with rw_devices.
Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
Acked-and-tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Linus Torvalds [Sun, 21 Aug 2011 13:59:41 +0000 (06:59 -0700)]
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: flush any pending end_io requests before DIO reads w/dioread_nolock
  ext4: fix nomblk_io_submit option so it correctly converts uninit blocks
  ext4: Resolve the hang of direct i/o read in handling EXT4_IO_END_UNWRITTEN.
  ext4: call ext4_ioend_wait and ext4_flush_completed_IO in ext4_evict_inode
  ext4: Fix ext4_should_writeback_data() for no-journal mode

13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Sun, 21 Aug 2011 13:59:02 +0000 (06:59 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
  ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
  ALSA: hda - Don't spew too many ELD errors
  ALSA: usb-audio - Fix missing mixer dB information
  ALSA: hda - Add "PCM" volume to vmaster slave list
  ALSA: hda - Fix duplicated capture-volume creation for ALC268 models
  ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
  ALSA: snd_usb_caiaq: track submitted output urbs

13 years agopci: fix new kernel-doc warning in pci.c
Randy Dunlap [Sat, 20 Aug 2011 18:49:43 +0000 (11:49 -0700)]
pci: fix new kernel-doc warning in pci.c

Fix new kernel-doc warning in pci.c:

  Warning(drivers/pci/pci.c:3259): No description found for parameter 'mps'
  Warning(drivers/pci/pci.c:3259): Excess function parameter 'rq' description in 'pcie_set_mps'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
Julia Lawall [Sat, 20 Aug 2011 06:12:41 +0000 (08:12 +0200)]
ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree

The label outnodev is only used when kzalloc has not yet taken place or has
failed, so there is no need for the call for kfree under this label.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
identifier x;
expression E1!=0,E2,E3,E4;
statement S;
iterator I;
@@

(
if (...) { ... when != kfree(x)
               when != x = E3
               when != E3 = x
*  return ...;
 }
... when != x = E2
    when != I(...,x,...) S
if (...) { ... when != x = E4
 kfree(x); ... return ...; }
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
Takashi Iwai [Sat, 20 Aug 2011 07:19:59 +0000 (09:19 +0200)]
ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c

snd_hda_get_conn_index() returns a negative value while the current code
stores it in an unsigned int.  It must be stored in a signed integer.

Reported-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Don't spew too many ELD errors
Takashi Iwai [Sat, 20 Aug 2011 07:14:45 +0000 (09:14 +0200)]
ALSA: hda - Don't spew too many ELD errors

Currently HD-audio driver shows the all error ELD byte as an error
in the kernel message.  This is annoying when the video driver doesn't
set the correct ELD from the beginning. e.g. radeon sends a zero-byte
data, but we still check ELD with the fixed 128 byte as a workaround
for some broken devices, it spews 128-times errors.

For avoiding this, the driver aborts reading when the first byte is
invalid.  In such a case, the whole data is certainly invalid.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
Linus Torvalds [Sat, 20 Aug 2011 06:07:08 +0000 (23:07 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/drm-intel

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
  drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge

13 years agoext4: flush any pending end_io requests before DIO reads w/dioread_nolock
Jiaying Zhang [Fri, 19 Aug 2011 23:13:32 +0000 (19:13 -0400)]
ext4: flush any pending end_io requests before DIO reads w/dioread_nolock

There is a race between ext4 buffer write and direct_IO read with
dioread_nolock mount option enabled. The problem is that we clear
PageWriteback flag during end_io time but will do
uninitialized-to-initialized extent conversion later with dioread_nolock.
If an O_direct read request comes in during this period, ext4 will return
zero instead of the recently written data.

This patch checks whether there are any pending uninitialized-to-initialized
extent conversion requests before doing O_direct read to close the race.
Note that this is just a bandaid fix. The fundamental issue is that we
clear PageWriteback flag before we really complete an IO, which is
problem-prone. To fix the fundamental issue, we may need to implement an
extent tree cache that we can use to look up pending to-be-converted extents.

Signed-off-by: Jiaying Zhang <jiayingz@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
13 years agodrm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge
Jesse Barnes [Fri, 12 Aug 2011 22:28:32 +0000 (15:28 -0700)]
drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge

Prior to Ivybridge, the GFX_MODE would default to 0x800, meaning that
MI_FLUSH would flush the TLBs in addition to the rest of the caches
indicated in the MI_FLUSH command.  However starting with Ivybridge, the
register defaults to 0x2800 out of reset, meaning that to invalidate the
TLB we need to use PIPE_CONTROL.  Since we're not doing that yet, go
back to the old default so things work.

v2: don't forget to actually *clear* the new bit

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Tested-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
13 years agoMerge branch 'for-linus' of git://git.kernel.dk/linux-block
Linus Torvalds [Fri, 19 Aug 2011 17:47:07 +0000 (10:47 -0700)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-block

* 'for-linus' of git://git.kernel.dk/linux-block: (23 commits)
  Revert "cfq: Remove special treatment for metadata rqs."
  block: fix flush machinery for stacking drivers with differring flush flags
  block: improve rq_affinity placement
  blktrace: add FLUSH/FUA support
  Move some REQ flags to the common bio/request area
  allow blk_flush_policy to return REQ_FSEQ_DATA independent of *FLUSH
  xen/blkback: Make description more obvious.
  cfq-iosched: Add documentation about idling
  block: Make rq_affinity = 1 work as expected
  block: swim3: fix unterminated of_device_id table
  block/genhd.c: remove useless cast in diskstats_show()
  drivers/cdrom/cdrom.c: relax check on dvd manufacturer value
  drivers/block/drbd/drbd_nl.c: use bitmap_parse instead of __bitmap_parse
  bsg-lib: add module.h include
  cfq-iosched: Reduce linked group count upon group destruction
  blk-throttle: correctly determine sync bio
  loop: fix deadlock when sysfs and LOOP_CLR_FD race against each other
  loop: add BLK_DEV_LOOP_MIN_COUNT=%i to allow distros 0 pre-allocated loop devices
  loop: add management interface for on-demand device allocation
  loop: replace linked list of allocated devices with an idr index
  ...

13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
Linus Torvalds [Fri, 19 Aug 2011 17:02:37 +0000 (10:02 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: OF: Don't crash when bridge parent is NULL.
  PCI: export pcie_bus_configure_settings symbol
  PCI: code and comments cleanup
  PCI: make cardbus-bridge resources optional
  PCI: make SRIOV resources optional
  PCI : ability to relocate assigned pci-resources
  PCI: honor child buses add_size in hot plug configuration
  PCI: Set PCI-E Max Payload Size on fabric

13 years agoPCI: OF: Don't crash when bridge parent is NULL.
David Daney [Tue, 16 Aug 2011 18:24:37 +0000 (11:24 -0700)]
PCI: OF: Don't crash when bridge parent is NULL.

In pcibios_get_phb_of_node(), we will crash while booting if
bus->bridge->parent is NULL.

Check for this case and avoid dereferencing the NULL pointer.

Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
13 years agoRevert "cfq: Remove special treatment for metadata rqs."
Jens Axboe [Fri, 19 Aug 2011 06:34:48 +0000 (08:34 +0200)]
Revert "cfq: Remove special treatment for metadata rqs."

We have a kernel build regression since 3.1-rc1, which is about 10%
regression. The kernel source is in an ext3 filesystem.
Alex Shi bisect it to commit:
commit a07405b7802691d29ab3b23bdc76ee6d006aad0b
Author: Justin TerAvest <teravest@google.com>
Date:   Sun Jul 10 22:09:19 2011 +0200

    cfq: Remove special treatment for metadata rqs.

Apparently this is caused by lack metadata preemption, where ext3/ext4
do use READ_META. I didn't see a way to fix the issue, so suggest
reverting the patch.

This reverts commit a07405b7802691d29ab3b23bdc76ee6d006aad0b.

Reported-by: Alex Shi<alex.shi@intel.com>
Reported-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
13 years agoALSA: usb-audio - Fix missing mixer dB information
Takashi Iwai [Fri, 19 Aug 2011 05:55:10 +0000 (07:55 +0200)]
ALSA: usb-audio - Fix missing mixer dB information

The recent fix for testing dB range at the mixer creation time seems
to cause regressions in some devices.  In such devices, reading the dB
info at probing time gives an error, thus both dBmin and dBmax are still
zero, and TLV flag isn't set although the later read of dB info succeeds.

This patch adds a workaround for such a case by assuming that the later
read will succeed.  In future, a similar test should be performed in a
case where a wrong dB range is seen even in the later read.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Linus Torvalds [Fri, 19 Aug 2011 05:49:34 +0000 (22:49 -0700)]
Merge git://git./linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: fix array bounds error setting up PCIC NMI trap

13 years agoMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
Linus Torvalds [Fri, 19 Aug 2011 05:48:30 +0000 (22:48 -0700)]
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  drivers/ata/sata_dwc_460ex.c: add missing kfree
  ata: Add iMX pata support
  pata_via: disable ATAPI DMA on AVERATEC 3200
  [libata] sata_sil: fix used-uninit warning

13 years agoMerge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Linus Torvalds [Fri, 19 Aug 2011 05:47:13 +0000 (22:47 -0700)]
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets
  NFSv4.1: Fix the callback 'highest_used_slotid' behaviour
  pnfs-obj: Fix the comp_index != 0 case
  pnfs-obj: Bug when we are running out of bio
  nfs: add missing prefetch.h include

13 years agosparc: fix array bounds error setting up PCIC NMI trap
Ian Campbell [Wed, 17 Aug 2011 22:14:57 +0000 (22:14 +0000)]
sparc: fix array bounds error setting up PCIC NMI trap

  CC      arch/sparc/kernel/pcic.o
arch/sparc/kernel/pcic.c: In function 'pcic_probe':
arch/sparc/kernel/pcic.c:359:33: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:359:8: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:360:33: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:360:8: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:361:33: error: array subscript is above array bounds [-Werror=array-bounds]
arch/sparc/kernel/pcic.c:361:8: error: array subscript is above array bounds [-Werror=array-bounds]
cc1: all warnings being treated as errors

I'm not particularly familiar with sparc but t_nmi (defined in head_32.S via
the TRAP_ENTRY macro) and pcic_nmi_trap_patch (defined in entry.S) both appear
to be 4 instructions long and I presume from the usage that instructions are
int sized.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agodrivers/ata/sata_dwc_460ex.c: add missing kfree
Julia Lawall [Mon, 8 Aug 2011 11:17:57 +0000 (13:17 +0200)]
drivers/ata/sata_dwc_460ex.c: add missing kfree

Currently, error handling code in this function calls the function
sata_dwc_port_stop, but this function has essentially no effect if hsdevp
has not been stored in ap, which is the case throughout this function.  The
only effect is to print a debugging message including ap->print_id.

The code is rewritten to not call sata_dwc_port_stop, but instead to jump
to a local label that prints the original error message and the print_id
information.  In the case where hsdevp has been already allocated (but not
yet stored in ap), this value is freed as well.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@exists@
local idexpression x;
statement S,S1;
expression E;
identifier fl;
expression *ptr != NULL;
@@

x = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...kfree(x)...+> }
     when any
     when != true x == NULL
x->fl
...>
(
if (x == NULL) S1
|
if (...) { ... when != x
               when forall
(
 return \(0\|<+...x...+>\|ptr\);
|
* return ...;
)
}
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
13 years agoata: Add iMX pata support
Arnaud Patard (Rtp) [Tue, 26 Jul 2011 14:58:19 +0000 (16:58 +0200)]
ata: Add iMX pata support

Add basic support for pata on iMX. It has been tested only on imx51.
SDMA support will probably be added later so this version supports only
PIO.

v2:
  - enable only when needed IORDY
  - use dev_get_drvdata
v3:
  - add missing clk_put() calls
  - use platform_get_irq()
  - fix resume code to avoid disabling IORDY on resume
v4:
  - Remove EXPERIMENTAL and switch to depends on ARCH_MXC
  - Use devm_kzalloc()
  - make clock a must-have
  - Use only 1 ioremap

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
13 years agopata_via: disable ATAPI DMA on AVERATEC 3200
Tejun Heo [Thu, 4 Aug 2011 09:15:07 +0000 (11:15 +0200)]
pata_via: disable ATAPI DMA on AVERATEC 3200

On AVERATEC 3200, pata_via causes memory corruption with ATAPI DMA,
which often leads to random kernel oops.  The cause of the problem is
not well understood yet and only small subset of machines using the
controller seem affected.  Blacklist ATAPI DMA on the machine.

Signed-off-by: Tejun Heo <tj@kernel.org>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=11426
Reported-and-tested-by: Jim Bray <jimsantelmo@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: stable@kernel.org
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
13 years ago[libata] sata_sil: fix used-uninit warning
Jeff Garzik [Fri, 19 Aug 2011 03:52:36 +0000 (23:52 -0400)]
[libata] sata_sil: fix used-uninit warning

Init 'serror' to silence the following warning:

drivers/ata/sata_sil.c: In function ‘sil_interrupt’:
drivers/ata/sata_sil.c:453:14: warning: ‘serror’ may be used uninitialized in
this function [-Wuninitialized]

This is not a 'can never happen' but is nonetheless extremely unlikely.
The easiest and cleanest warning fix is simply to init the var,
rather than worry about marking the var uninit-ok.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
Linus Torvalds [Thu, 18 Aug 2011 21:20:00 +0000 (14:20 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/btrfs-unstable

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: set i_size properly when fallocating and we already
  btrfs: unlock on error in btrfs_file_llseek()
  btrfs: btrfs_permission's RO check shouldn't apply to device nodes
  Btrfs: truncate pages from clone ioctl target range
  Btrfs: fix uninitialized sync_pending
  Btrfs: fix wrong free space information
  btrfs: memory leak in btrfs_add_inode_defrag()
  Btrfs: use plain page_address() in header fields setget functions
  Btrfs: forced readonly when btrfs_drop_snapshot() fails
  Btrfs: check if there is enough space for balancing smarter
  Btrfs: fix a bug of balance on full multi-disk partitions
  Btrfs: fix an oops of log replay
  Btrfs: detect wether a device supports discard
  Btrfs: force unplugs when switching from high to regular priority bios

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Linus Torvalds [Thu, 18 Aug 2011 21:19:36 +0000 (14:19 -0700)]
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  update cifs version to 1.75
  [CIFS] possible memory corruption on mount
  cifs: demote cERROR in build_path_from_dentry to cFYI

13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
Linus Torvalds [Thu, 18 Aug 2011 21:18:55 +0000 (14:18 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/iser: Support iSCSI PDU padding
  IBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long)
  IPoIB: Fix possible NULL dereference in ipoib_start_xmit()

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
Linus Torvalds [Thu, 18 Aug 2011 21:16:13 +0000 (14:16 -0700)]
Merge git://git./linux/kernel/git/hirofumi/fatfs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
  fat: fat16 support maximum 4GB file/vol size as WinXP or 7.
  fat: fix utf8 iocharset warning message
  fat: fix build warning

13 years agoirqdesc: fix new kernel-doc warning
Randy Dunlap [Thu, 18 Aug 2011 19:19:27 +0000 (12:19 -0700)]
irqdesc: fix new kernel-doc warning

Fix kernel-doc warning in irqdesc.c:

  Warning(kernel/irq/irqdesc.c:353): No description found for parameter 'owner'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>