commit 75fa67706cce5272bcfc51ed646f2da21f3bdb6e
Merge: 4edfd20... bbb770e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Nov 4 08:30:12 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      xfrm: Fix xfrm_policy_gc_lock handling.
      niu: Use pci_ioremap_bar().
      bnx2x: Version Update
      bnx2x: Calling netif_carrier_off at the end of the probe
      bnx2x: PCI configuration bug on big-endian
      bnx2x: Removing the PMF indication when unloading
      mv643xx_eth: fix SMI bus access timeouts
      net: kconfig cleanup
      fs_enet: fix polling
      XFRM: copy_to_user_kmaddress() reports local address twice
      SMC91x: Fix compilation on some platforms.
      udp: Fix the SNMP counter of UDP_MIB_INERRORS
      udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMS
      drivers/net/smc911x.c: Fix lockdep warning on xmit.

commit 4edfd20fafae41d77f210417b43d1416a733f48c
Merge: 54074d5... 299246f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Nov 4 08:19:01 2008 -0800

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      libata: mask off DET when restoring SControl for detach
      libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply it
      libata: Fix a potential race condition in ata_scsi_park_show()
      sata_nv: fix generic, nf2/3 detection regression
      sata_via: restore vt*_prepare_host error handling
      sata_promise: add ATA engine reset to reset ops

commit 54074d59320581a6d7e4f4dd405e8cac1d174b75
Author: Jianjun Kong <jianjun@zeuux.org>
Date:   Tue Nov 4 21:47:07 2008 +0800

    drivers: remove duplicated #include
    
    Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 299246f9a2a4c5c531863d72bad7ebd0de213de9
Author: Tejun Heo <tj@kernel.org>
Date:   Mon Nov 3 19:27:07 2008 +0900

    libata: mask off DET when restoring SControl for detach
    
    libata restores SControl on detach; however, trying to restore
    non-zero DET can cause undeterministic behavior including PMP device
    going offline till power cycling.  Mask off DET when restoring
    SControl.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 6a87e42e955ff27e07a77f65f8f077dc7c4171e1
Author: Tejun Heo <tj@kernel.org>
Date:   Mon Nov 3 19:01:09 2008 +0900

    libata: implement ATA_HORKAGE_ATAPI_MOD16_DMA and apply it
    
    libata always uses PIO for ATAPI commands when the number of bytes to
    transfer isn't multiple of 16 but quantum DAT72 chokes on odd bytes
    PIO transfers.  Implement a horkage to skip the mod16 check and apply
    it to the quantum device.
    
    This is reported by John Clark in the following thread.
    
      http://thread.gmane.org/gmane.linux.ide/34748
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: John Clark <clarkjc@runbox.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a464189de350b050aa8f334bd4cc53ed406e56dd
Author: Elias Oltmanns <eo@nebensachen.de>
Date:   Mon Nov 3 19:01:08 2008 +0900

    libata: Fix a potential race condition in ata_scsi_park_show()
    
    Peter Moulder has pointed out that there is a slight chance that a
    negative value might be passed to jiffies_to_msecs() in
    ata_scsi_park_show(). This is fixed by saving the value of jiffies in a
    local variable, thus also reducing code since the volatile variable
    jiffies is accessed only once.
    
    Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
    Signed-off-by: Tejun Heo <tj.kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 3c324283e6cdb79210cf7975c3e40d3ba3e672b2
Author: Tejun Heo <tj@kernel.org>
Date:   Mon Nov 3 12:37:49 2008 +0900

    sata_nv: fix generic, nf2/3 detection regression
    
    All three flavors of sata_nv's are different in how their hardreset
    behaves.
    
    * generic: Hardreset is not reliable.  Link often doesn't come online
      after hardreset.
    
    * nf2/3: A little bit better - link comes online with longer debounce
      timing.  However, nf2/3 can't reliable wait for the first D2H
      Register FIS, so it can't wait for device readiness or classify the
      device after hardreset.  Follow-up SRST required.
    
    * ck804: Hardreset finally works.
    
    The core layer change to prefer hardreset and follow up changes
    exposed the above issues and caused various detection regressions for
    all three flavors.  This patch, hopefully, fixes all the known issues
    and should make sata_nv error handling more reliable.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 554d491de112a378b4d1a705bb93b58bcd444a70
Author: Marcin Slusarz <marcin.slusarz@gmail.com>
Date:   Sun Nov 2 22:18:52 2008 +0100

    sata_via: restore vt*_prepare_host error handling
    
    commit b9d5b89b487517cbd4cb4702da829e07ef9e4432 (sata_via: fix support
    for 5287) accidently (?) removed vt*_prepare_host error handling - restore it
    
    catched by gcc:
    drivers/ata/sata_via.c: In function 'svia_init_one':
    drivers/ata/sata_via.c:567: warning: 'host' may be used uninitialized in this function
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Joseph Chan <JosephChan@via.com.tw>
    Cc: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit cadef677e4a9b9c1d069675043767df486782986
Author: Mikael Pettersson <mikpe@it.uu.se>
Date:   Fri Oct 31 08:03:55 2008 +0100

    sata_promise: add ATA engine reset to reset ops
    
    Promise ATA engines need to be reset when errors occur.
    That's currently done for errors detected by sata_promise itself,
    but it's not done for errors like timeouts detected outside of
    the low-level driver.
    
    The effect of this omission is that a timeout tends to result
    in a sequence of failed COMRESETs after which libata EH gives
    up and disables the port. At that point the port's ATA engine
    hangs and even reloading the driver will not resume it.
    
    To fix this, make sata_promise override ->hardreset on SATA
    ports with code which calls pdc_reset_port() on the port in
    question before calling libata's hardreset. PATA ports don't
    use ->hardreset, so for those we override ->softreset instead.
    
    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit bbb770e7ab9a436752babfc8765e422d7481be1f
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Mon Nov 3 19:11:29 2008 -0800

    xfrm: Fix xfrm_policy_gc_lock handling.
    
    From: Alexey Dobriyan <adobriyan@gmail.com>
    
    Based upon a lockdep trace by Simon Arlott.
    
    xfrm_policy_kill() can be called from both BH and
    non-BH contexts, so we have to grab xfrm_policy_gc_lock
    with BH disabling.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 19ecb6ba800765743bb4525c66562f0d30993f8d
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Nov 3 17:05:16 2008 -0800

    niu: Use pci_ioremap_bar().
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ca8eac55fa554043c57fd18d595ca356e752833e
Author: Eilon Greenstein <eilong@broadcom.com>
Date:   Mon Nov 3 16:46:58 2008 -0800

    bnx2x: Version Update
    
    Updating the version
    
    Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 12b56ea89e70d4b04f2f5199750310e82894ebbd
Author: Eilon Greenstein <eilong@broadcom.com>
Date:   Mon Nov 3 16:46:40 2008 -0800

    bnx2x: Calling netif_carrier_off at the end of the probe
    
    netif_carrier_off was called too early at the probe. In case of failure
    or simply bad timing, this can cause a fatal error since linkwatch_event
    might run too soon.
    
    Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7d96567ac0527703cf1b80043fc0ebd7f21a10ad
Author: Eilon Greenstein <eilong@broadcom.com>
Date:   Mon Nov 3 16:46:19 2008 -0800

    bnx2x: PCI configuration bug on big-endian
    
    The current code read nothing but zeros on big-endian (wrong part of the
    32bits). This caused poor performance on big-endian machines. Though this
    issue did not cause the system to crash, the performance is significantly
    better with the fix so I view it as critical bug fix.
    
    Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9a0354405feb0f8bd460349a93db05e4cca8d166
Author: Eilon Greenstein <eilong@broadcom.com>
Date:   Mon Nov 3 16:45:55 2008 -0800

    bnx2x: Removing the PMF indication when unloading
    
    When the PMF flag is set, the driver can access the HW freely. When the
    driver is unloaded, it should not access the HW. The problem caused fatal
    errors when "ethtool -i" was called after the calling instance was unloaded
    and another instance was already loaded
    
    Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ee04448d8871e71f55520d62cf6adbf5dd403c99
Author: Lennert Buytenhek <buytenh@wantstofly.org>
Date:   Sat Nov 1 06:32:20 2008 +0100

    mv643xx_eth: fix SMI bus access timeouts
    
    The mv643xx_eth mii bus implementation uses wait_event_timeout() to
    wait for SMI completion interrupts.
    
    If wait_event_timeout() would return zero, mv643xx_eth would conclude
    that the SMI access timed out, but this is not necessarily true --
    wait_event_timeout() can also return zero in the case where the SMI
    completion interrupt did happen in time but where it took longer than
    the requested timeout for the process performing the SMI access to be
    scheduled again.  This would lead to occasional SMI access timeouts
    when the system would be under heavy load.
    
    The fix is to ignore the return value of wait_event_timeout(), and
    to re-check the SMI done bit after wait_event_timeout() returns to
    determine whether or not the SMI access timed out.
    
    Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 1d19ecfc65ed01bac7a58f83004057ad704ee7cc
Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date:   Sun Nov 2 20:30:33 2008 -0800

    net: kconfig cleanup
    
    The bool kconfig option added to ixgbe and myri10ge for DCA is ambigous,
    so this patch adds a description to the kconfig option.
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 7385d595751874854a6729fbaaa7f793480bbb67
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Sun Nov 2 17:49:59 2008 +0300

    fs_enet: fix polling
    
    1. compile fix for irqreturn_t type change
    2. restore ->poll_controller after CONFIG_PPC_CPM_NEW_BINDING transition
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a75952b72a0fff3031124003e62118111aed42c1
Merge: 457d2ee... ae6884a...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 3 11:43:59 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: fix renaming one hardlink on top of another
      [CIFS] fix error in smb_send2
      [CIFS] Reduce number of socket retries in large write path

commit ae6884a9da56f8921e432e663b4ccb4a1851b2ea
Author: Jeff Layton <jlayton@redhat.com>
Date:   Mon Nov 3 14:05:08 2008 -0500

    cifs: fix renaming one hardlink on top of another
    
    cifs: fix renaming one hardlink on top of another
    
    POSIX says that renaming one hardlink on top of another to the same
    inode is a no-op. We had the logic mostly right, but forgot to clear
    the return code.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 457d2ee225801441e96f2e35894ec404572ad862
Merge: da4a22c... 818e3dd...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 3 10:21:40 2008 -0800

    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      tracing, ring-buffer: add paranoid checks for loops
      ftrace: use kretprobe trampoline name to test in output
      tracing, alpha: undefined reference to `save_stack_trace'

commit da4a22cba7cb2d922691214aed6b1977f04efaff
Merge: 20ebc00... e5beae1...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 3 10:15:40 2008 -0800

    Merge branch 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'io-mappings-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      io mapping: clean up #ifdefs
      io mapping: improve documentation
      i915: use io-mapping interfaces instead of a variety of mapping kludges
      resources: add io-mapping functions to dynamically map large device apertures
      x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps

commit 20ebc0073b0fb63ce4a27ca761418ecfdecaadb7
Merge: c8126cc... 7aeb6d7...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 3 10:14:59 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: hda: make a STAC_DELL_EQ option
      ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy models
      ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)
      ALSA: remove direct access of dev->bus_id in sound/isa/*
      sound: struct device - replace bus_id with dev_name(), dev_set_name()
      ALSA: Fix PIT lockup on some chipsets when using the PC-Speaker
      ALSA: rawmidi - Add open check in rawmidi callbacks
      ALSA: hda - Add digital-mic for ALC269 auto-probe mode
      ALSA: hda - Disable broken mic auto-muting in Realtek codes

commit c8126cc6025972629044cde750cec97f175792f7
Merge: 30ef898... 6c87df3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 3 09:59:01 2008 -0800

    Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
    
    * 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc:
      proc: revert /proc/uptime to ->read_proc hook

commit 30ef898c535bffd105c1a9b9b6563969b3deb31e
Merge: 45beca0... 5a125c3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 3 09:58:40 2008 -0800

    Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      i915: Add GEM ioctl to get available aperture size.
      drm/radeon: fixup further bus mastering confusion.
      build fix: CONFIG_DRM_I915=y && CONFIG_ACPI=n

commit e5beae16901795223d677f15aa2fe192976278ee
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Nov 3 18:21:45 2008 +0100

    io mapping: clean up #ifdefs
    
    Impact: cleanup
    
    clean up ifdefs: change #ifdef CONFIG_X86_32/64 to
    CONFIG_HAVE_ATOMIC_IOMAP.
    
    flip around the #ifdef sections to clean up the structure.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 8d5c6603c408d91ecf543f244f10ccb8b500ad95
Author: Keith Packard <keithp@keithp.com>
Date:   Mon Nov 3 18:21:44 2008 +0100

    io mapping: improve documentation
    
    Impact: add documentation
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d
Merge: 71c21b4... 55e03a6... 6b3ab21...
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Nov 3 16:28:24 2008 +0100

    Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

commit 6b3ab21ef1ac15db4b053ce0ba8eae0ef9361c8a
Author: Matthew Ranostay <mranostay@embeddedalley.com>
Date:   Mon Nov 3 08:12:43 2008 -0500

    ALSA: hda: make a STAC_DELL_EQ option
    
    Add support for explicitly enabling the EQ distortion hack for
    systems without software biquad support.
    
    Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
    Cc: stable@kernel.org
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 818e3dd30a4ff34fff6d90e87ae59c73f6a53691
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Fri Oct 31 09:58:35 2008 -0400

    tracing, ring-buffer: add paranoid checks for loops
    
    While writing a new tracer, I had a bug where I caused the ring-buffer
    to recurse in a bad way. The bug was with the tracer I was writing
    and not the ring-buffer itself. But it took a long time to find the
    problem.
    
    This patch adds paranoid checks into the ring-buffer infrastructure
    that will catch bugs of this nature.
    
    Note: I put the bug back in the tracer and this patch showed the error
          nicely and prevented the lockup.
    
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit b3aa557722b3d5858f14ca559e03461c24125aaf
Author: Steven Rostedt <rostedt@goodmis.org>
Date:   Fri Oct 31 15:44:07 2008 -0400

    ftrace: use kretprobe trampoline name to test in output
    
    Impact: ia64+tracing build fix
    
    When a function is kprobed, the return address is set to the
    kprobe_trampoline, or something similar. This caused the output
    of the trace to look confusing when the parent seemed to be this
    "kprobe_trampoline" function.
    
    To fix this, Abhishek Sagar added a test of the instruction pointer
    of the parent to see if it matched the kprobe_trampoline. If it
    did, the output would print a "[unknown/kretprobe'd]" instead.
    
    Unfortunately, not all archs do this the same way, and the trampoline
    function may not be exported, which causes failures in builds.
    
    This patch will compare the name instead of the pointer to see
    if it matches. This prevents us from depending on a function from
    being exported, and should work on all archs. The worst that can
    happen is that an arch might use a different name and then we
    go back to the confusing output. At least the arch will still build.
    
    Reported-by: Abhishek Sagar <sagar.abhishek@gmail.com>
    Signed-off-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Tested-by: Abhishek Sagar <sagar.abhishek@gmail.com>
    Acked-by: Abhishek Sagar <sagar.abhishek@gmail.com>

commit a1caa32295d67284ecba18cd8db692c7166f0706
Author: Arnaud Ebalard <arno@natisbad.org>
Date:   Mon Nov 3 01:30:23 2008 -0800

    XFRM: copy_to_user_kmaddress() reports local address twice
    
    While adding support for MIGRATE/KMADDRESS in strongSwan (as specified
    in draft-ebalard-mext-pfkey-enhanced-migrate-00), Andreas Steffen
    noticed that XFRMA_KMADDRESS attribute passed to userland contains the
    local address twice (remote provides local address instead of remote
    one).
    
    This bug in copy_to_user_kmaddress() affects only key managers that use
    native XFRM interface (key managers that use PF_KEY are not affected).
    
    For the record, the bug was in the initial changeset I posted which
    added support for KMADDRESS (13c1d18931ebb5cf407cb348ef2cd6284d68902d
    'xfrm: MIGRATE enhancements (draft-ebalard-mext-pfkey-enhanced-migrate)').
    
    Signed-off-by: Arnaud Ebalard <arno@natisbad.org>
    Reported-by: Andreas Steffen <andreas.steffen@strongswan.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 55e03a68d2489d116a5c5e8111ecef3f69831ed6
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Nov 3 10:21:36 2008 +0100

    ALSA: emu10k1 - Add more invert_shared_spdif flag to Audigy models
    
    Reported in Novell bnc#440862:
        https://bugzilla.novell.com/show_bug.cgi?id=440862
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit c2c80529460095035752bf0ecc1af82c1e0f6e0f
Author: Al Viro <viro@ZenIV.linux.org.uk>
Date:   Fri Oct 31 19:50:41 2008 +0000

    tracing, alpha: undefined reference to `save_stack_trace'
    
    Impact: build fix on !stacktrace architectures
    
    only select STACKTRACE on architectures that have STACKTRACE_SUPPORT
    
    ... since we also need to ifdef out the guts of ftrace_trace_stack().
    We also want to disallow setting TRACE_ITER_STACKTRACE in trace_flags
    on such configs, but that can wait.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Acked-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 69e50282b726bab75c8050c4836dc89b7eb7bf1a
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Nov 3 10:07:43 2008 +0100

    ALSA: hda - Add a quirk for another Acer Aspire (1025:0090)
    
    Added a quirk for another Acer Aspier laptop (1025:0090) with ALC883
    codec.  Reported in Novell bnc#426935:
        https://bugzilla.novell.com/show_bug.cgi?id=426935
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 55c8eb6c8eaa5009eed1557b296da5d4ea9c369a
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Nov 3 00:04:24 2008 -0800

    SMC91x: Fix compilation on some platforms.
    
    This reverts 51ac3beffd4afaea4350526cf01fe74aaff25eff ('SMC91x: delete
    unused local variable "lp"') and adds __maybe_unused markers to these
    (potentially) unused variables.
    
    The issue is that in some configurations SMC_IO_SHIFT evaluates
    to '(lp->io_shift)', but in some others it's plain '0'.
    
    Based upon a build failure report from Manuel Lauss.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0418ff0c8e48aae4e5e0cbcd3e19a057bea2e55a
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Nov 3 08:51:33 2008 +0100

    ALSA: remove direct access of dev->bus_id in sound/isa/*
    
    Removed the direct accesses of dev->bus_id in sound/isa/* by replacement
    with dev_err() or dev_warn() functions.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit bb072bf0980abbe4fc905df91857a8ad34ca673c
Author: Kay Sievers <kay.sievers@vrfy.org>
Date:   Sun Nov 2 03:50:35 2008 +0100

    sound: struct device - replace bus_id with dev_name(), dev_set_name()
    
    [stripped sound/isa/* changes, replaced with the next patch -- tiwai]
    
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit b02555c3845f02924b8224ff1fd9a44f2c144dbb
Author: Zoltan Devai <zdevai@gmail.com>
Date:   Mon Nov 3 00:30:28 2008 +0100

    ALSA: Fix PIT lockup on some chipsets when using the PC-Speaker
    
    Fix PIT lockup on some chipsets when using the PC-Speaker.
    
    Signed-off-by: Zoltan Devai <zdevai@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 219df32faec97349516c29f33008fea59a46e99a
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Nov 3 08:17:05 2008 +0100

    ALSA: rawmidi - Add open check in rawmidi callbacks
    
    The drivers (e.g. mtpav) may call rawmidi functions in irq handlers
    even though the streams are not opened.  This results in Oops or panic.
    
    This patch adds the rawmidi state check before actually operating the
    rawmidi buffers.
    
    Tested-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 0856f93958c488f0cc656be53c26dfd20663bdb3
Author: Wei Yongjun <yjwei@cn.fujitsu.com>
Date:   Sun Nov 2 16:14:27 2008 +0000

    udp: Fix the SNMP counter of UDP_MIB_INERRORS
    
    UDP packets received in udpv6_recvmsg() are not only IPv6 UDP packets, but
    also have IPv4 UDP packets, so when do the counter of UDP_MIB_INERRORS in
    udpv6_recvmsg(), we should check whether the packet is a IPv6 UDP packet
    or a IPv4 UDP packet.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f26ba1751145edbf52b2c89a40e389f2fbdfc1af
Author: Wei Yongjun <yjwei@cn.fujitsu.com>
Date:   Sun Nov 2 16:11:01 2008 +0000

    udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMS
    
    If UDP echo is sent to xinetd/echo-dgram, the UDP reply will be received
    at the sender. But the SNMP counter of UDP_MIB_INDATAGRAMS will be not
    increased, UDP6_MIB_INDATAGRAMS will be increased instead.
    
      Endpoint A                      Endpoint B
      UDP Echo request ----------->
      (IPv4, Dst port=7)
                       <----------    UDP Echo Reply
                                      (IPv4, Src port=7)
    
    This bug is come from this patch cb75994ec311b2cd50e5205efdcc0696abd6675d.
    
    It do counter UDP[6]_MIB_INDATAGRAMS until udp[v6]_recvmsg. Because
    xinetd used IPv6 socket to receive UDP messages, thus, when received
    UDP packet, the UDP6_MIB_INDATAGRAMS will be increased in function
    udpv6_recvmsg() even if the packet is a IPv4 UDP packet.
    
    This patch fixed the problem.
    
    Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5a125c3c79167e78ba44efef03af7090ef28eeaf
Author: Eric Anholt <eric@anholt.net>
Date:   Wed Oct 22 21:40:13 2008 -0700

    i915: Add GEM ioctl to get available aperture size.
    
    This will let userland know when to submit its batchbuffers, before they get
    too big to fit in the aperture.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 70d9d15833864e7120c3ffcfdbd6fa61f5f9726a
Author: Will Newton <will.newton@gmail.com>
Date:   Tue Oct 28 10:52:36 2008 +0000

    drivers/net/smc911x.c: Fix lockdep warning on xmit.
    
    dev_kfree_skb should not be called with irqs disabled, use dev_kfree_skb_irq
    instead. The warning caused looks like this:
    
    ======================================================
    [ INFO: hard-safe -> hard-unsafe lock order detected ]
    2.6.28-rc1 #273
    ------------------------------------------------------
    swapper/0 [HC0[0]:SC1[2]:HE0:SE0] is trying to acquire:
     (clock-AF_INET){-..+}, at: [<4015c17c>] _sock_def_write_space+0x28/0xd8
    
    and this task is already holding:
     (&lp->lock){++..}, at: [<4013f230>] _smc911x_hard_start_xmit+0x30/0x4b8
    which would create a new lock dependency:
     (&lp->lock){++..} -> (clock-AF_INET){-..+}
    
    Signed-off-by: Will Newton <will.newton@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit ee956e090e114ede6542c76a7465ed6ce118ad52
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Oct 31 17:16:31 2008 +0100

    ALSA: hda - Add digital-mic for ALC269 auto-probe mode
    
    The digital mic wasn't detected properly for ALC269 auto-probing mode
    because of its widget number.  Fixed now.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 4605b718e8b8f0dd3d811ddf90f630fd0835b7bf
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Oct 31 14:18:24 2008 +0100

    ALSA: hda - Disable broken mic auto-muting in Realtek codes
    
    The recent addition of automatic mic-muting is broken in some cases.
    The code assumes that the pin nids <= 0x18, but the digital pins can
    be less than 0x18.
    Also, it assumes the front-mic being the internal mic, but it depends
    on the hardware implementation actually.
    
    Instead of complex case-fixes, better to disable the code as now.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 0839ccb8ac6a9e2d5e175a4ae9c82b5c574d510d
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Oct 30 19:38:48 2008 -0700

    i915: use io-mapping interfaces instead of a variety of mapping kludges
    
    Impact: optimize/clean-up the IO mapping implementation of the i915 DRM driver
    
    Switch the i915 device aperture mapping to the io-mapping interface, taking
    advantage of the cleaner API to extend it across all of the mapping uses,
    including both pwrite and relocation updates.
    
    This dramatically improves performance on 64-bit kernels which were using
    the same slow path as 32-bit non-HIGHMEM kernels prior to this patch.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 9663f2e6a6cf3f82b06d8fb699b11b80f92553ba
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Oct 30 19:38:18 2008 -0700

    resources: add io-mapping functions to dynamically map large device apertures
    
    Impact: add new generic io_map_*() APIs
    
    Graphics devices have large PCI apertures which would consume a significant
    fraction of a 32-bit address space if mapped during driver initialization.
    Using ioremap at runtime is impractical as it is too slow.
    
    This new set of interfaces uses atomic mappings on 32-bit processors and a
    large static mapping on 64-bit processors to provide reasonable 32-bit
    performance and optimal 64-bit performance.
    
    The current implementation sits atop the io_map_atomic fixmap-based
    mechanism for 32-bit processors.
    
    This includes some editorial suggestions from Randy Dunlap for
    Documentation/io-mapping.txt
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit fd9409343521eac22b6ed51686128a643c7c976b
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Oct 30 19:37:09 2008 -0700

    x86: add iomap_atomic*()/iounmap_atomic() on 32-bit using fixmaps
    
    Impact: introduce new APIs, separate kmap code from CONFIG_HIGHMEM
    
    This takes the code used for CONFIG_HIGHMEM memory mappings except that
    it's designed for dynamic IO resource mapping.
    
    These fixmaps are available even with CONFIG_HIGHMEM turned off.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 61de800d33af585cb7e6f27b5cdd51029c6855cb
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu Oct 30 20:15:22 2008 +0000

    [CIFS] fix error in smb_send2
    
    smb_send2 exit logic was strange, and with the previous change
    could cause us to fail large
    smb writes when all of the smb was not sent as one chunk.
    
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit edf1ae403896cb7750800508b14996ba6be39a53
Author: Steve French <sfrench@us.ibm.com>
Date:   Wed Oct 29 00:47:57 2008 +0000

    [CIFS] Reduce number of socket retries in large write path
    
    CIFS in some heavy stress conditions cifs could get EAGAIN
    repeatedly in smb_send2 which led to repeated retries and eventually
    failure of large writes which could lead to data corruption.
    
    There are three changes that were suggested by various network
    developers:
    
    1) convert cifs from non-blocking to blocking tcp sendmsg
    (we left in the retry on failure)
    2) change cifs to not set sendbuf and rcvbuf size for the socket
    (let tcp autotune the buffer sizes since that works much better
    in the TCP stack now)
    3) if we have a partial frame sent in smb_send2, mark the tcp
    session as invalid (close the socket and reconnect) so we do
    not corrupt the remaining part of the SMB with the beginning
    of the next SMB.
    
    This does not appear to hurt performance measurably and has
    been run in various scenarios, but it definately removes
    a corruption that we were seeing in some high stress
    test cases.
    
    Acked-by: Shirish Pargaonkar <shirishp@us.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 4e270e9b8a9d246290f3901f1fb6c5efdb734ddf
Author: Alex Deucher <alexdeucher@gmail.com>
Date:   Tue Oct 28 07:48:34 2008 +1000

    drm/radeon: fixup further bus mastering confusion.
    
    rs400/480 are like previous chips not like rs6xx chips.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 65e082c9a33a6e9f24e9a713a7d38d11206d3c3d
Author: Len Brown <len.brown@intel.com>
Date:   Fri Oct 24 17:18:10 2008 -0400

    build fix: CONFIG_DRM_I915=y && CONFIG_ACPI=n
    
    drivers/gpu/drm/i915/i915_opregion.c:340: error: implicit declaration of function ‘register_acpi_notifier’
    drivers/gpu/drm/i915/i915_opregion.c:361: error: implicit declaration of function ‘unregister_acpi_notifier’
    
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 6c87df37dcb9c6c33923707fa5191e0a65874d60
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Mon Oct 27 22:38:27 2008 +0300

    proc: revert /proc/uptime to ->read_proc hook
    
    Turned out some VMware userspace does pread(2) on /proc/uptime, but
    seqfiles currently don't allow pread() resulting in -ESPIPE.
    
    Seqfiles in theory can do pread(), but this can be a long story,
    so revert to ->read_proc until then.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=11856
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>