staging: rtl8192e: Convert typedef phy_sts_ofdm_819xpci_t to struct phy_sts_ofdm_819xpci

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef phy_ofdm_rx_status_rxsc_sgien_exintfflag to struct phy_ofdm_rx_status_rxsc_sgien_exintfflag

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef LOG_INTERRUPT_8190_T to struct log_int_8190

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef TX_FWINFO_8190PCI to struct tx_fwinfo_8190pci

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef TX_FWINFO_T to struct tx_fwinfo

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef BB_REGISTER_DEFINITION_T to struct bb_reg_definition

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef FALSE_ALARM_STATISTICS to struct false_alarm_stats

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef MIMO_EVM to struct mimo_evm

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef BA_RECORD to struct ba_record

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef HT_CAPABILITY_ELE to struct ht_capab_ele

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef HT_INFORMATION_ELE to struct ht_info_ele

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef MIMOPS_CTRL to struct mimops_ctrl

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef MIMO_RSSI to struct mimo_rssi

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef BSS_HT to struct bss_ht

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef RT_HTINFO_STA_ENTRY to struct rt_htinfo_sta_entry

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Convert typedef RT_HIGH_THROUGHPUT to struct rt_hi_throughput

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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>

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>

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>

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>

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>

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>

staging: rtl8192e: Remove dead code associated with CONFIG_RTL_RFKILL

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove conditional code associated with EEPROM_OLD_FORMAT_SUPPORT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with EFUSE_REPG_WORKAROUND

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove LOOP_TEST as parameter

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_FW_SETCHAN

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_RTLWIFI_DEBUGFS

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with _RTL8192_EXT_PATCH_

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>

staging: rtl8192e: Remove dead code associated with RTL819x_DEBUG

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with _ENABLE_SW_BEACON

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_CRYPTO_HMAC

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_BT_30

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with ENABLE_NULL_PT_DEBUG

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_64BIT_DMA

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_RTLLIB_CRYPT_TKIP

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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>

staging: rtl8192e: Remove dead code associated with CONFIG_CFG_80211

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with BUILT_IN_CRYPTO

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: IEEE80211_RADIOTAP_F_BADFCS is defined in kernel, do not duplicate

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CUSTOMER_ID_INTEL_CMPC and CONFIG_CRDA

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with FOR_ANDROID_X86 and FOR_MOBLIN

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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>

staging: rtl8192e: Remove dead code associated with BUILT_IN_MSHCLASS

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with ADHOC_11N

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with WIFI_TEST

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with NOT_YET

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with RTK_DMP_PLATFORM

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with USB_RX_AGGREGATION_SUPPORT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with SUPPORT_USPD

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with TCP_CSUM_OFFLOAD_RX

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with USB_TX_DRIVER_AGGREGATION_ENABLE

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove code dependent of JOHN_DUMP

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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>

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>

staging: rtl8192e: Remove dead code from removal of ENABLE_TKIP11N

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with PF_SYNCTHREAD

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with COMPATIBLE_WITH_RALINK_MESH

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_ASPM_OR_D3

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with USB_USE_ALIGNMENT

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code involved with TO_DO

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code involved with TO_DO_LIST

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code inside 'ifdef MERGE_TO_DO'

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

staging: rtl8192e: Remove dead code associated with CONFIG_MP

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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>

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>

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>

staging: rtl8192e: Remove dead code associated with RTL8192U

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

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>

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>

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>

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>

rtl8192e: Add a TODO

Signed-off-by: Mike McCormack <mikem@ring3k.org>

rtl8192e: Remove unused debug code

Signed-off-by: Mike McCormack <mikem@ring3k.org>

rtl8192e: Remove occurences of #if 1

Signed-off-by: Mike McCormack <mikem@ring3k.org>

rtl8192e: Remove WIRELESS_EXT macro checks

Signed-off-by: Mike McCormack <mikem@ring3k.org>

rtl8192e: Remove CONFIG_RTL8192_IO_MAP

Signed-off-by: Mike McCormack <mikem@ring3k.org>

rtl8192e: Remove extra ifdefs

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

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>

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>
---

Merge branch 'master' of git://git./linux/kernel/git/gregkh/staging-2.6

Linux 3.1-rc3

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

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

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>

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>

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

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>

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

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

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>

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>

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>

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>

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

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

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>

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
  ...

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