commit bbeba4c35c252b2e961f09ce6ebe76b2cd5e7e3e
Merge: 6df944c... 2cbed89...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:45:44 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev:
      [PATCH] fix bogus argument of blkdev_put() in pktcdvd
      [PATCH 2/2] documnt FMODE_ constants
      [PATCH 1/2] kill FMODE_NDELAY_NOW
      [PATCH] clean up blkdev_get a little bit
      [PATCH] Fix block dev compat ioctl handling
      [PATCH] kill obsolete temporary comment in swsusp_close()

commit 6df944c5f8194a1010f7166bcdd48667637f1af8
Merge: 341e558... 0235439...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:44:40 2008 -0800

    Merge branch 'drm-gem-update' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
    
    * 'drm-gem-update' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/i915: Return error in i915_gem_set_to_gtt_domain if we're not in the GTT.
      drm/i915: Retry execbuffer pinning after clearing the GTT
      drm/i915: Move the execbuffer domain computations together
      drm/i915: Rename object_set_domain to object_set_to_gpu_domain
      drm/i915: Make a single set-to-cpu-domain path and use it wherever needed.
      drm/i915: Make a single set-to-gtt-domain path.
      drm/i915: If interrupted while setting object domains, still emit the flush.
      drm/i915: Move flushing list cleanup from flush request retire to request emit.
      drm/i915: Respect GM965/GM45 bit-17-instead-of-bit-11 option for swizzling.

commit 341e55805d671948c2a93d3d6c7e9babb47de5d8
Merge: aaad077... b2c2717...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:44:03 2008 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc:
      powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs

commit aaad077638be1a25871bcae5e43952d6b63abfca
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Fri Dec 5 01:07:51 2008 +0100

    ACPI: Fix ACPI battery regression introduced by commit 558073
    
    Commit 558073dd56707864f09d563b64e7c37c021e89d2 ("ACPI: battery: Convert
    discharge energy rate to current properly") caused the battery subsystem
    to report wrong values of the remaining time on battery power and the
    time until fully charged on Toshiba Portege R500 (and presumably on
    other boxes too).
    
    Fix the issue by correcting the conversion from mW to mA.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4857339d7c01cd81ce8872da2d1f9183b07b1c87
Merge: 0efcafb... 6c9bacb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:40:29 2008 -0800

    Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      time: catch xtime_nsec underflows and fix them
      posix-cpu-timers: fix clock_gettime with CLOCK_PROCESS_CPUTIME_ID

commit 0efcafb0fb7a163999a8821e8a5e7792fca90a2d
Merge: e948990... 410d2c8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:40:17 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Sync FPU state in VIS emulation handler.
      sparc64: Fix VIS emulation bugs
      sparc: asm/bitops.h should define __fls
      sparc64: Fix bug in PTRACE_SETFPREGS64 handling.

commit e948990f958c6c41036a99c8a6581e35e7e23d80
Merge: 2b218ae... 9adc138...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:40:08 2008 -0800

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86: fix early panic with boot option "nosmp"
      x86/oprofile: fix Intel cpu family 6 detection
      oprofile: fix CPU unplug panic in ppro_stop()
      AMD IOMMU: fix possible race while accessing iommu->need_sync
      AMD IOMMU: set device table entry for aliased devices
      AMD IOMMU: struct amd_iommu remove padding on 64 bit
      x86: fix broken flushing in GART nofullflush path
      x86: fix dma_mapping_error for 32bit x86

commit 2b218aea3674d7f8ac853f872b4042d9aa2e1130
Merge: 3b666ce... 4371453...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:39:55 2008 -0800

    Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      sched: don't export sched_mc_power_savings in laptops

commit 3b666ce6a246cb9b89d335738d84af36883b911d
Merge: 56d18e9... 2019554...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:39:41 2008 -0800

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      check_hung_task(): unsigned sysctl_hung_task_warnings cannot be less than 0
      documentation: local_ops fix on_each_cpu

commit 56d18e9932ebf4e8eca42d2ce509450e6c9c1666
Merge: 1cb434b... c6cb4df...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:39:21 2008 -0800

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere.
      MIPS: 64-bit: vmsplice needs to use the compat wrapper for o32 and N32.
      MIPS: o32: Fix number of arguments to splice(2).
      MIPS: Malta: Consolidate platform device code.
      MIPS: IP22, Fulong, Malta: Update defconfigs.
      MIPS: Malta: Add back RTC support
      MIPS: Fix potential DOS by untrusted user app.

commit 1cb434b20d85b90f2e5cf6cb80071069a052b1e1
Merge: 004b50f... 576a488...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Dec 4 21:38:55 2008 -0800

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
    
    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      [XFS] Fix hang after disallowed rename across directory quota domains

commit 576a488a27f267af203f3ea69c700a1612335e9f
Author: Dave Chinner <david@fromorbit.com>
Date:   Thu Dec 4 09:09:34 2008 +1100

    [XFS] Fix hang after disallowed rename across directory quota domains
    
    When project quota is active and is being used for directory tree
    quota control, we disallow rename outside the current directory
    tree. This requires a check to be made after all the inodes
    involved in the rename are locked. We fail to unlock the inodes
    correctly if we disallow the rename when the target is outside the
    current directory tree. This results in a hang on the next access
    to the inodes involved in failed rename.
    
    Reported-by: Arkadiusz Miskiewicz <arekm@maven.pl>
    Signed-off-by: Dave Chinner <david@fromorbit.com>
    Tested-by: Arkadiusz Miskiewicz <arekm@maven.pl>
    Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>

commit b2c2717bae3ad62f18a51ea10188176134bac79c
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Dec 4 20:52:31 2008 +0300

    powerpc/83xx: Enable FIXED_PHY in mpc834x_itx and mpc83xx defconfigs
    
    This is needed so that Vitesse 7385 5-port switch could work on
    MPC8349E-mITX boards.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Acked-by: Timur Tabi <timur@freescale.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit c6cb4df96fa22d1174d6fb6dfc2c7501d7afaeea
Author: David Daney <ddaney@caviumnetworks.com>
Date:   Fri Oct 31 11:23:09 2008 -0700

    MIPS: Return ENOSYS from sys32_syscall on 64bit kernels like elsewhere.
    
    When the o32 errno was changed to ENOSYS, we forgot to update the code
    for 64bit kernels.
    
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 8d13cb26cd3bf23946743a5b4af2fecd88fc4974
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Wed Dec 3 17:03:27 2008 +0000

    MIPS: 64-bit: vmsplice needs to use the compat wrapper for o32 and N32.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 08d30879a6d3ce399f48def7c494853b5b5f2062
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Wed Dec 3 16:33:17 2008 +0000

    MIPS: o32: Fix number of arguments to splice(2).
    
    The syscall code was assuming splice only takes 4 arguments so no stack
    arguments were being copied from the userspace stack to the kernel stack.
    As the result splice was likely to fail with EINVAL.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 566a3b95579c123f7711e2f98d078f370746046b
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Mon Dec 1 08:16:08 2008 +0000

    MIPS: Malta: Consolidate platform device code.
    
    After adding the RTC platform device to malta-platform.c malta-mtd.c should
    get unified with the rest of the platform device code.

commit 3e27cce60e434fc393fb261fb3ca455ba80a0b8b
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Mon Dec 1 08:09:10 2008 +0000

    MIPS: IP22, Fulong, Malta: Update defconfigs.
    
    These haven't seen much attention for too long but particularly important
    enable RTC_CLASS and CONFIG_RTC_HCTOSYS so the wall clock time is set on
    kernel startup.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 192cc7f0900a088e464635a59a63d974ee7a3e97
Author: Tiejun Chen <tiejun.chen@windriver.com>
Date:   Tue Nov 25 16:33:20 2008 +0800

    MIPS: Malta: Add back RTC support
    
    With the conversion of MIPS to RTC_LIB the old RTC driver CONFIG_RTC became
    unselectable.  Fix by setting up a platform device.  Also enable
    RTC_CLASS so system time gets set from RTC on kernel initialization.
    
    [Ralf: Original patch by Tiejun; polished nice and shiny by me]
    
    Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit e807f9574e37a3f202e677feaaad1b7c5d2c0db8
Author: Vlad Malov <Vlad.Malov@caviumnetworks.com>
Date:   Tue Nov 18 15:05:46 2008 -0800

    MIPS: Fix potential DOS by untrusted user app.
    
    On a 64 bit kernel if an o32 syscall was made with a syscall number less
    than 4000, we would read the function from outside of the bounds of the
    syscall table.  This led to non-deterministic behavior including system
    crashes.
    
    While we were at it we reworked the 32 bit version as well to use fewer
    instructions.  Both 32 and 64 bit versions are use the same code now.
    
    Signed-off-by: Vlad Malov <Vlad.Malov@caviumnetworks.com>
    Signed-off-by: David Daney <ddaney@caviumnetworks.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 410d2c8187ed969238ba98008c1d57307a56cfd8
Author: Hong H. Pham <hong.pham@windriver.com>
Date:   Thu Dec 4 09:12:57 2008 -0800

    sparc64: Sync FPU state in VIS emulation handler.
    
    Copy the FPU state to the task's thread_info->fpregs for the VIS emulation
    functions to access.
    
    Signed-off-by: Hong H. Pham <hong.pham@windriver.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9adc13867ec5fe0cd35434f92954d90e42381f0b
Author: Andi Kleen <andi@firstfloor.org>
Date:   Thu Dec 4 13:33:35 2008 +0100

    x86: fix early panic with boot option "nosmp"
    
    Impact: fix boot crash with numcpus=0 on certain systems
    
    Fix early exception in __get_smp_config with nosmp.
    
    Bail out early when there is no MP table.
    
    Reported-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Tested-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 2cbed8906fd1f3c6cc17cdf8aac1bfad2da7960c
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Sun Nov 30 01:33:57 2008 -0500

    [PATCH] fix bogus argument of blkdev_put() in pktcdvd
    
    final close of ->bdev should match the initial open, i.e.
    get FMODE_READ | FMODE_NDELAY; FMODE_READ|FMODE_WRITE has
    been a braino.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit fc9161e54d0dbf799beff9692ea1cc6237162b85
Author: Christoph Hellwig <hch@lst.de>
Date:   Wed Nov 5 14:58:46 2008 +0100

    [PATCH 2/2] documnt FMODE_ constants
    
    Make sure all FMODE_ constants are documents, and ensure a coherent
    style for the already existing comments.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit fd4ce1acd0f8558033b1a6968001552bd7671e6d
Author: Christoph Hellwig <hch@lst.de>
Date:   Wed Nov 5 14:58:42 2008 +0100

    [PATCH 1/2] kill FMODE_NDELAY_NOW
    
    Update FMODE_NDELAY before each ioctl call so that we can kill the
    magic FMODE_NDELAY_NOW.  It would be even better to do this directly
    in setfl(), but for that we'd need to have FMODE_NDELAY for all files,
    not just block special files.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit ebbefc011e56bd85b4745d01e5b8d7d05d95ed5d
Author: Christoph Hellwig <hch@lst.de>
Date:   Wed Nov 5 14:54:41 2008 +0100

    [PATCH] clean up blkdev_get a little bit
    
    The way the bd_claim for the FMODE_EXCL case is implemented is rather
    confusing.  Clean it up to the most logical style.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 1c925604e1038c7c65b91a92d14dc972b3a70a97
Author: Andreas Schwab <schwab@suse.de>
Date:   Fri Oct 31 22:39:46 2008 +0100

    [PATCH] Fix block dev compat ioctl handling
    
    Commit 33c2dca4957bd0da3e1af7b96d0758d97e708ef6 (trim file propagation
    in block/compat_ioctl.c) removed the handling of some ioctls from
    compat_blkdev_driver_ioctl.  That caused them to be rejected as unknown
    by the compat layer.
    
    Signed-off-by: Andreas Schwab <schwab@suse.de>
    Cc: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 50c396d38c1a7f0c693579ec88cb4be3c0b0645e
Author: Al Viro <viro@zeniv.linux.org.uk>
Date:   Sun Nov 30 01:47:12 2008 -0500

    [PATCH] kill obsolete temporary comment in swsusp_close()
    
    it had been put there to mark the call of blkdev_put() that
    needed proper argument propagated to it; later patch in the
    same series had done just that.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 6c9bacb41c10ba84ff68f238e234d96f35fb64f7
Author: john stultz <johnstul@us.ibm.com>
Date:   Mon Dec 1 18:34:41 2008 -0800

    time: catch xtime_nsec underflows and fix them
    
    Impact: fix time warp bug
    
    Alex Shi, along with Yanmin Zhang have been noticing occasional time
    inconsistencies recently. Through their great diagnosis, they found that
    the xtime_nsec value used in update_wall_time was occasionally going
    negative. After looking through the code for awhile, I realized we have
    the possibility for an underflow when three conditions are met in
    update_wall_time():
    
      1) We have accumulated a second's worth of nanoseconds, so we
         incremented xtime.tv_sec and appropriately decrement xtime_nsec.
         (This doesn't cause xtime_nsec to go negative, but it can cause it
          to be small).
    
      2) The remaining offset value is large, but just slightly less then
         cycle_interval.
    
      3) clocksource_adjust() is speeding up the clock, causing a
         corrective amount (compensating for the increase in the multiplier
         being multiplied against the unaccumulated offset value) to be
         subtracted from xtime_nsec.
    
    This can cause xtime_nsec to underflow.
    
    Unfortunately, since we notify the NTP subsystem via second_overflow()
    whenever we accumulate a full second, and this effects the error
    accumulation that has already occured, we cannot simply revert the
    accumulated second from xtime nor move the second accumulation to after
    the clocksource_adjust call without a change in behavior.
    
    This leaves us with (at least) two options:
    
    1) Simply return from clocksource_adjust() without making a change if we
       notice the adjustment would cause xtime_nsec to go negative.
    
    This would work, but I'm concerned that if a large adjustment was needed
    (due to the error being large), it may be possible to get stuck with an
    ever increasing error that becomes too large to correct (since it may
    always force xtime_nsec negative). This may just be paranoia on my part.
    
    2) Catch xtime_nsec if it is negative, then add back the amount its
       negative to both xtime_nsec and the error.
    
    This second method is consistent with how we've handled earlier rounding
    issues, and also has the benefit that the error being added is always in
    the oposite direction also always equal or smaller then the correction
    being applied. So the risk of a corner case where things get out of
    control is lessened.
    
    This patch fixes bug 11970, as tested by Yanmin Zhang
    http://bugzilla.kernel.org/show_bug.cgi?id=11970
    
    Reported-by: alex.shi@intel.com
    Signed-off-by: John Stultz <johnstul@us.ibm.com>
    Acked-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
    Tested-by: "Zhang, Yanmin" <yanmin_zhang@linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 726c12f57d7e3ff43693d88e13b1ff02464c75d3
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Dec 3 19:36:05 2008 -0800

    sparc64: Fix VIS emulation bugs
    
    This patch fixes some bugs in VIS emulation that cause the GCC test
    failure
    
    FAIL: gcc.target/sparc/pdist-3.c execution test
    
    for both 32-bit and 64-bit testing on hardware lacking these
    instructions.  The emulation code for the pdist instruction uses
    RS1(insn) for both source registers rs1 and rs2, which is obviously
    wrong and leads to the instruction doing nothing (the observed
    problem), and further inspection of the code shows that RS1 uses a
    shift of 24 and RD a shift of 25, which clearly cannot both be right;
    examining SPARC documentation indicates the correct shift for RS1 is
    14.
    
    This patch fixes the bug if single-stepping over the affected
    instruction in the debugger, but not if the testcase is run
    standalone.  For that, Wind River has another patch I hope they will
    send as a followup to this patch submission.
    
    Signed-off-by: Joseph Myers <joseph@codesourcery.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0235439232cb6f8a54f8976aa8330c1c98ebad0b
Author: Eric Anholt <eric@anholt.net>
Date:   Wed Nov 26 13:58:13 2008 -0800

    drm/i915: Return error in i915_gem_set_to_gtt_domain if we're not in the GTT.
    
    It's only for flushing caches appropriately for GTT access, not for actually
    getting it there.  Prevents potential smashing of cpu read/write domains on
    unbound objects.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ac94a962b24a88ea5d00f4697550d9982f300751
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Nov 20 23:30:27 2008 -0800

    drm/i915: Retry execbuffer pinning after clearing the GTT
    
    If we fail to pin all of the buffers in an execbuffer request, go through
    and clear the GTT and try again to see if its just a matter of fragmentation
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 646f0f6e43bf6628b1f0f8ca6c0227ce72e8ef3c
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Nov 20 23:23:03 2008 -0800

    drm/i915: Move the execbuffer domain computations together
    
    This eliminates the dev_set_domain function and just in-lines it
    where its used, with the goal of moving the manipulation and use of
    invalidate_domains and flush_domains closer together. This also
    avoids calling add_request unless some domain has been flushed.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit c0d90829288942fa06d7483f9e84059a64605da5
Author: Keith Packard <keithp@keithp.com>
Date:   Thu Nov 20 23:11:08 2008 -0800

    drm/i915: Rename object_set_domain to object_set_to_gpu_domain
    
    Now that the CPU and GTT domain operations are isolated to their own
    functions, the previously general-purpose set_domain function is now used
    only to set GPU domains. It also has no failure cases, which is important as
    this eliminates any possible interruption of the computation of new object
    domains and subsequent emmission of the flushing instructions into the ring.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit e47c68e9c5d71e2faab8c2b82f57c6c73e6456fd
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Nov 14 13:35:19 2008 -0800

    drm/i915: Make a single set-to-cpu-domain path and use it wherever needed.
    
    This fixes several domain management bugs, including potential lack of cache
    invalidation for pread, potential failure to wait for set_domain(CPU, 0),
    and more, along with producing more intelligible code.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 2ef7eeaa553d88e78d9a4520271f26a7bc0e2968
Author: Eric Anholt <eric@anholt.net>
Date:   Mon Nov 10 10:53:25 2008 -0800

    drm/i915: Make a single set-to-gtt-domain path.
    
    This fixes failure to flush caches in the relocation update path, and
    failure to wait in the set_domain ioctl, each of which could lead to incorrect
    rendering.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit b670d8158283c35842ae1c650f75c375d8710607
Author: Eric Anholt <eric@anholt.net>
Date:   Fri Nov 14 16:27:47 2008 -0800

    drm/i915: If interrupted while setting object domains, still emit the flush.
    
    Otherwise, we would leave the objects in an inconsistent state, such as
    write_domain == 0 but on the flushing list.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit ce44b0ea3dc04236d852d78a06f850d1f7b03f3d
Author: Eric Anholt <eric@anholt.net>
Date:   Thu Nov 6 16:00:31 2008 -0800

    drm/i915: Move flushing list cleanup from flush request retire to request emit.
    
    obj_priv->write_domain is "write domain if the GPU went idle now", not
    "write domain at this moment."  By postponing the clear, we confused the
    concept, required more storage, and potentially emitted more flushes than
    are required.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit a7f014f2de04893f95cfe40fe35f15c8dae4b36e
Author: Eric Anholt <eric@anholt.net>
Date:   Tue Nov 25 14:02:05 2008 -0800

    drm/i915: Respect GM965/GM45 bit-17-instead-of-bit-11 option for swizzling.
    
    This fixes readpixels and buffer corruption when swapped out and in by
    disabling tiling on them.
    
    Now that we know that the bit 17 mode isn't just a mistake of older chipsets,
    we'll need to work on a clever fix so that we can get the performance of
    tiling on these chipsets, but that will require intrusive changes targeted
    at the next kernel release, not this one.
    
    Signed-off-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>

commit 004b50f4ed2accb56069d56714a32484f8b83ec0
Author: David Howells <dhowells@redhat.com>
Date:   Wed Dec 3 16:33:14 2008 +0000

    MN10300: Introduce barriers to replace removed volatiles in gdbstub 16550 driver
    
    Introduce into the MN10300 gdbstub 16550 driver a couple of barrier() calls to
    replace the removed volatility of the input/output index variables for the Rx
    ring buffer.  A previous patch added them into the on-chip serial port driver.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8711cca2251f1fc3beb870a75ff847bb55225490
Author: James Morris <jmorris@namei.org>
Date:   Thu Dec 4 03:19:45 2008 +1100

    MAINTAINERS: Add security subsystem maintainer
    
    Add myself as overall maintainer of the security subsystem (generally,
    components under the top-level security directory).  This addresses
    the lack of an official maintainer for the increasing number of
    security projects being incorporated into the kernel.
    
    Signed-off-by: James Morris <jmorris@namei.org>
    Acked-by: Chris Wright <chrisw@sous-sol.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit feaf3848a813a106f163013af6fcf6c4bfec92d9
Merge: a771132... 0e435ac...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Dec 3 16:45:56 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      block: fix setting of max_segment_size and seg_boundary mask
      block: internal dequeue shouldn't start timer
      block: set disk->node_id before it's being used
      When block layer fails to map iov, it calls bio_unmap_user to undo

commit a771132783d3f78a51597fdcee96c6dfbae3512e
Merge: 2433c41... dafdb61...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Dec 3 16:41:15 2008 -0800

    Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
    
    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
      powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts
      powerpc: Fix dma_map_sg() cache flushing on non coherent platforms

commit 2433c41789d6aa6797ca747707b7764e88e4fb6d
Merge: cd92a17... a8d82d9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Dec 3 16:40:37 2008 -0800

    Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
    
    * 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
      NLM: client-side nlm_lookup_host() should avoid matching on srcaddr
      nfsd: use of unitialized list head on error exit in nfs4recover.c
      Add a reference to sunrpc in svc_addsock
      nfsd: clean up grace period on early exit

commit cd92a17eec752f8c948c4b6ab93dc099ce55b8cb
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Dec 3 16:20:19 2008 -0800

    iTCO_wdt: fix typo when setting TCO_EN bit
    
    The code used '&= 0x00002000' when it tried to set the TCO_EN bit, which
    obviously didn't set that bit at all, but instead just reset all the
    other bits in the SMI_EN register.
    
    This bug seemingly caused various random behavior, with Frans Pop
    reporting that X.org just silently hung at startup and Rafael Wysocki
    reports the fan spinning with full speed.
    
    See
    	http://lkml.org/lkml/2008/12/3/178
    	http://bugzilla.kernel.org/show_bug.cgi?id=12162
    
    The problem seems to have been triggered by "[WATCHDOG] iTCO_wdt :
    problem with rebooting on new ICH9 based motherboards" (commit
    7cd5b08be3c489df11b559fef210b81133764ad4), but the bogus code existed
    before that too (in the "supermicro_old_pre_stop()" function), it just
    apparently never showed up due to different logic.
    
    In that commit the broken code got moved around and now gets executed
    much more.
    
    Reported-by: Rafael J. Wysocki <rjw@sisk.pl>
    Tested-by: Frans Pop <elendil@planet.nl>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e8e8e80ee047b131a0cd6a3e96e0f8dfa14f6d99
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Wed Dec 3 16:04:52 2008 -0800

    sparc: asm/bitops.h should define __fls
    
    bitops_64.h includes the generic one; pretty sure 32 should too.
    
    (Found by using __fls in generic code and breaking sparc defconfig build:
     thanks Stephen and linux-next!)
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 66a05d6b47a299b6bdeb645bc2d536109cd800b4
Merge: c36910c... 3d337c6...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Dec 3 18:52:46 2008 +0100

    Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent

commit 3d337c653c94be50f11a45fb14a2afa8a8a1a618
Author: William Cohen <wcohen@redhat.com>
Date:   Sun Nov 30 15:39:10 2008 -0500

    x86/oprofile: fix Intel cpu family 6 detection
    
    Alan Jenkins wrote:
    > This is on an EeePC 701, /proc/cpuinfo as attached.
    >
    > Is this expected?  Will the next release work?
    >
    > Thanks, Alan
    >
    > # opcontrol --setup --no-vmlinux
    > cpu_type 'unset' is not valid
    > you should upgrade oprofile or force the use of timer mode
    >
    > # opcontrol -v
    > opcontrol: oprofile 0.9.4 compiled on Nov 29 2008 22:44:10
    >
    > # cat /dev/oprofile/cpu_type
    > i386/p6
    > # uname -r
    > 2.6.28-rc6eeepc
    
    Hi Alan,
    
    Looking at the kernel driver code for oprofile it can return the "i386/p6" for
    the cpu_type. However, looking at the user-space oprofile code there isn't the
    matching entry in libop/op_cpu_type.c or the events/unit_mask files in
    events/i386 directory.
    
    The Intel AP-485 says this is a "Intel Pentium M processor model D". Seems like
    the oprofile kernel driver should be identifying the processor as "i386/p6_mobile"
    
    The driver identification code doesn't look quite right in nmi_init.c
    
    http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=blob;f=arch/x86/oprofile/nmi_int.c;h=022cd41ea9b4106e5884277096e80e9088a7c7a9;hb=HEAD
    
    has:
    
    409         case 10 ... 13:
    410                 *cpu_type = "i386/p6";
    411                 break;
    
    Referring to the Intel AP-485:
    case 10 and 11 should produce "i386/piii"
    case 13 should produce "i386/p6_mobile"
    
    I didn't see anything for case 12.
    
    Something like the attached patch. I don't have a celeron machine to verify that
    changes in this area of the kernel fix thing.
    
    -Will
    
    Signed-off-by: William Cohen <wcohen@redhat.com>
    Tested-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
    Acked-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Robert Richter <robert.richter@amd.com>

commit dafdb61313e80e20cfeef7bf4653dcb47cf28591
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Nov 27 20:36:45 2008 +0300

    powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts
    
    Just found the merge issue in 442746989d92afc125040e0f29b33602ad94da99
    ("powerpc/83xx: Add support for MCU microcontroller in .dts files"):
    the commit adds the MCU controller node into the DMA node, which is
    wrong because the MCU sits on the I2C bus. Fix this by moving the MCU
    node into the I2C controller node.
    
    The original patch[1] was OK though. ;-)
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

commit 9ea84ad77d635bdb76c9a08f44f21a9af98359ee
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Tue Dec 2 07:21:21 2008 +0100

    oprofile: fix CPU unplug panic in ppro_stop()
    
    If oprofile statically compiled in kernel, a cpu unplug triggers
    a panic in ppro_stop(), because a NULL pointer is dereferenced.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Signed-off-by: Robert Richter <robert.richter@amd.com>

commit 0e435ac26e3f951d83338ed3d4ab7dc0fe0055bc
Author: Milan Broz <mbroz@redhat.com>
Date:   Wed Dec 3 12:55:08 2008 +0100

    block: fix setting of max_segment_size and seg_boundary mask
    
    Fix setting of max_segment_size and seg_boundary mask for stacked md/dm
    devices.
    
    When stacking devices (LVM over MD over SCSI) some of the request queue
    parameters are not set up correctly in some cases by default, namely
    max_segment_size and and seg_boundary mask.
    
    If you create MD device over SCSI, these attributes are zeroed.
    
    Problem become when there is over this mapping next device-mapper mapping
    - queue attributes are set in DM this way:
    
    request_queue   max_segment_size  seg_boundary_mask
    SCSI                65536             0xffffffff
    MD RAID1                0                      0
    LVM                 65536                 -1 (64bit)
    
    Unfortunately bio_add_page (resp.  bio_phys_segments) calculates number of
    physical segments according to these parameters.
    
    During the generic_make_request() is segment cout recalculated and can
    increase bio->bi_phys_segments count over the allowed limit.  (After
    bio_clone() in stack operation.)
    
    Thi is specially problem in CCISS driver, where it produce OOPS here
    
        BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
    
    (MAXSEGENTRIES is 31 by default.)
    
    Sometimes even this command is enough to cause oops:
    
      dd iflag=direct if=/dev/<vg>/<lv> of=/dev/null bs=128000 count=10
    
    This command generates bios with 250 sectors, allocated in 32 4k-pages
    (last page uses only 1024 bytes).
    
    For LVM layer, it allocates bio with 31 segments (still OK for CCISS),
    unfortunatelly on lower layer it is recalculated to 32 segments and this
    violates CCISS restriction and triggers BUG_ON().
    
    The patch tries to fix it by:
    
     * initializing attributes above in queue request constructor
       blk_queue_make_request()
    
     * make sure that blk_queue_stack_limits() inherits setting
    
     (DM uses its own function to set the limits because it
     blk_queue_stack_limits() was introduced later.  It should probably switch
     to use generic stack limit function too.)
    
     * sets the default seg_boundary value in one place (blkdev.h)
    
     * use this mask as default in DM (instead of -1, which differs in 64bit)
    
    Bugs related to this:
    https://bugzilla.redhat.com/show_bug.cgi?id=471639
    http://bugzilla.kernel.org/show_bug.cgi?id=8672
    
    Signed-off-by: Milan Broz <mbroz@redhat.com>
    Reviewed-by: Alasdair G Kergon <agk@redhat.com>
    Cc: Neil Brown <neilb@suse.de>
    Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: Tejun Heo <htejun@gmail.com>
    Cc: Mike Miller <mike.miller@hp.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit c36910c147fd7b129a8f1269c76b9767c99de5cd
Merge: 70d7d35... 09ee17e...
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Dec 3 12:54:45 2008 +0100

    Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

commit 53a08807c01989c6847bb135d8d43f61c5dfdda5
Author: Tejun Heo <tj@kernel.org>
Date:   Wed Dec 3 12:41:26 2008 +0100

    block: internal dequeue shouldn't start timer
    
    blkdev_dequeue_request() and elv_dequeue_request() are equivalent and
    both start the timeout timer.  Barrier code dequeues the original
    barrier request but doesn't passes the request itself to lower level
    driver, only broken down proxy requests; however, as the original
    barrier code goes through the same dequeue path and timeout timer is
    started on it.  If barrier sequence takes long enough, this timer
    expires but the low level driver has no idea about this request and
    oops follows.
    
    Timeout timer shouldn't have been started on the original barrier
    request as it never goes through actual IO.  This patch unexports
    elv_dequeue_request(), which has no external user anyway, and makes it
    operate on elevator proper w/o adding the timer and make
    blkdev_dequeue_request() call elv_dequeue_request() and add timer.
    Internal users which don't pass the request to driver - barrier code
    and end_that_request_last() - are converted to use
    elv_dequeue_request().
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Mike Anderson <andmike@linux.vnet.ibm.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit bf91db18ac2852a3ff39fe25ff56c5557c0fff78
Author: Cheng Renquan <crquan@gmail.com>
Date:   Thu Nov 20 08:37:37 2008 +0100

    block: set disk->node_id before it's being used
    
    disk->node_id will be refered in allocating in disk_expand_part_tbl, so we
    should set it before disk->node_id is refered.
    
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 53cc0b2948bcb8a084982e6c1f9bd7b337e0df38
Author: Petr Vandrovec <petr@vandrovec.name>
Date:   Wed Nov 19 11:12:14 2008 +0100

    When block layer fails to map iov, it calls bio_unmap_user to undo
    mapping.  Which is good if pages were mapped - but if they were provided
    by someone else and just copied then bad things happen - pages are
    released once here, and once by caller, leading to user triggerable BUG
    at include/linux/mm.h:246.
    
    Signed-off-by: Petr Vandrovec <petr@vandrovec.name>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 09ee17eb8ea89514c13980c4010bdbbaea8630c2
Author: Joerg Roedel <joerg.roedel@amd.com>
Date:   Wed Dec 3 12:19:27 2008 +0100

    AMD IOMMU: fix possible race while accessing iommu->need_sync
    
    The access to the iommu->need_sync member needs to be protected by the
    iommu->lock. Otherwise this is a possible race condition. Fix it with
    this patch.
    
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

commit f91ba190648be4ff127d6aaf3993ac19d66dc2c2
Author: Joerg Roedel <joerg.roedel@amd.com>
Date:   Tue Nov 25 12:56:12 2008 +0100

    AMD IOMMU: set device table entry for aliased devices
    
    In some rare cases a request can arrive an IOMMU with its originial
    requestor id even it is aliased. Handle this by setting the device table
    entry to the same protection domain for the original and the aliased
    requestor id.
    
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

commit eac9fbc6a90ab3440f4d98a8c52b15a724fc6f4f
Author: Richard Kennedy <richard@rsk.demon.co.uk>
Date:   Mon Nov 24 13:53:24 2008 +0000

    AMD IOMMU: struct amd_iommu remove padding on 64 bit
    
    Remove 16 bytes of padding from struct amd_iommu on 64bit builds
    reducing its size to 120 bytes, allowing it to span one fewer
    cachelines.
    
    Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

commit 201955463a5c1a70d3f70d1598b27e4c2c402642
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Tue Dec 2 22:55:38 2008 +0100

    check_hung_task(): unsigned sysctl_hung_task_warnings cannot be less than 0
    
    Impact: fix warnings-limit cutoff check for debug feature
    
    unsigned sysctl_hung_task_warnings cannot be less than 0
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 70d7d357578245f1993fd2d3ccd26088bcd38941
Author: Joerg Roedel <joerg.roedel@amd.com>
Date:   Tue Dec 2 20:16:03 2008 +0100

    x86: fix broken flushing in GART nofullflush path
    
    Impact: remove stale IOTLB entries
    
    In the non-default nofullflush case the GART is only flushed when
    next_bit wraps around. But it can happen that an unmap operation unmaps
    memory which is behind the current next_bit location. If these addresses
    are reused it may result in stale GART IO/TLB entries. Fix this by
    setting the GART next_bit always behind an unmapped location.
    
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit ee4ee527278a66321301d4f1f5ae22e49ab18fad
Author: Chris Torek <chris.torek@windriver.com>
Date:   Wed Dec 3 00:47:28 2008 -0800

    sparc64: Fix bug in PTRACE_SETFPREGS64 handling.
    
    From: Chris Torek <chris.torek@windriver.com>
    
    >The SPARC64 kernel code for PTRACE_SETFPREGS64 appears to be an exact copy
    >of that for PTRACE_GETFPREGS64.  This means that gdbserver and native
    >64-bit GDB cannot set floating-point registers.
    
    It looks like a simple typo.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2434bbb30e79468c49cff3cff6005236f55ed188
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date:   Sun Nov 30 18:53:40 2008 +0000

    powerpc: Fix dma_map_sg() cache flushing on non coherent platforms
    
    On PowerPC 4xx or other non cache-coherent platforms, we lost the
    appropriate cache flushing in dma_map_sg() when merging the 32 and
    64-bit DMA code (commit 4fc665b88a79a45bae8bbf3a05563c27c7337c3d,
    "powerpc: Merge 32 and 64-bit dma code").  This restores it.
    
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit f6f7b52e2f6149d2ee365717afff315b05720162
Merge: 51eaaa6... 290172e...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:58:20 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] hpwdt: Fix kdump when using hpwdt
      [WATCHDOG] hpwdt: set the mapped BIOS address space as executable
      [WATCHDOG] iTCO_wdt: add PCI ID's for ICH9 & ICH10 chipsets
      [WATCHDOG] iTCO_wdt : correct status clearing
      [WATCHDOG] iTCO_wdt : problem with rebooting on new ICH9 based motherboards
      [WATCHDOG] fix mtx1_wdt compilation failure

commit 51eaaa677691f8da526ce5a3d89e08ee2d2669ce
Merge: b7d6266... 3477d20...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:56:55 2008 -0800

    Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
    
    * 'linux-next' of git://git.infradead.org/ubifs-2.6:
      UBIFS: pre-allocate bulk-read buffer
      UBIFS: do not allocate too much
      UBIFS: do not print scary memory allocation warnings
      UBIFS: allow for gaps when dirtying the LPT
      UBIFS: fix compilation warnings
      MAINTAINERS: change UBI/UBIFS git tree URLs
      UBIFS: endian handling fixes and annotations
      UBIFS: remove printk

commit b7d626606201c397319b40721ca558b7e54040d5
Merge: e6d9f0f... 6c47535...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:56:17 2008 -0800

    Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
    
    * 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      KVM: MMU: avoid creation of unreachable pages in the shadow
      KVM: ppc: stop leaking host memory on VM exit
      KVM: MMU: fix sync of ptes addressed at owner pagetable
      KVM: ia64: Fix: Use correct calling convention for PAL_VPS_RESUME_HANDLER
      KVM: ia64: Fix incorrect kbuild CFLAGS override
      KVM: VMX: Fix interrupt loss during race with NMI
      KVM: s390: Fix problem state handling in guest sigp handler

commit e6d9f0fb5f9ceca5f4945f12cd3e71efd3382c13
Merge: e1825e7... b270ee8...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:55:43 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix offset calculation in compute_size()
      rtc: rtc-starfire fixes

commit e1825e7515010053e44287e6e78f9078cd1916a9
Merge: 5d279dc... 44ae98b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:55:05 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: (30 commits)
      MAINTAINERS: add netdev to ATM
      ATM: horizon, fix hrz_probe fail path
      pppol2tp: Add missing sock_put() in pppol2tp_release()
      net: Fix soft lockups/OOM issues w/ unix garbage collector
      macvlan: don't broadcast PAUSE frames to macvlan devices
      Phonet: fix oops in phonet_address_del() on non-Phonet device
      netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock
      sungem: Fix PCS_MIICTRL register write in gem_init_phy().
      net: make skb_truesize_bug() call WARN()
      net: hp-plus uses eip_poll
      net/wireless/reg.c: fix bad WARN_ON in if statement
      ath5k: disable beacon filter when station is not associated
      ath5k: fix Security issue in DebugFS part of ath5k
      ath9k: correct expected max RX buffer size
      ath9k: Fix SW-IOMMU bounce buffer starvation
      mac80211 : Fix setting ad-hoc mode and non-ibss channel
      iwlagn: fix DMA sync
      phylib: Add Vitesse VSC8221 SGMII PHY
      rose: zero length frame filtering in af_rose.c
      bridge: netfilter: fix update_pmtu crash with GRE
      ...

commit 5d279dcf98350ac3cbfa43c6aa62f4305408f2df
Merge: e2e2983... ae4e143...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:53:41 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
      m68k: Update defconfigs for 2.6.28-rc7
      macfb: Do not overflow fb_fix_screeninfo.id

commit e2e29831cc463f4be61d4e36b8699ae7e071a685
Merge: 9a689bc... 9596401...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:53:10 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      alim15x3: fix sparse warning
      ide: remove dead code from drive_is_ready()
      ide: fix build for DEBUG_PM
      ide: respect current DMA setting during resume
      ide: add SAMSUNG SP0822N with firmware WA100-10 to ivb_list[]
      amd74xx: workaround unreliable AltStatus register for nVidia controllers
      ide: fix the ide_release_lock imbalance

commit 9a689bc4f09f8b89f88e65b1b0a2ea780b4f28de
Merge: 1122b19... dc5c49b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Dec 2 15:52:28 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] stex: switch to block timeout
      [SCSI] make scsi_eh_try_stu use block timeout
      [SCSI] megaraid_sas: switch to block timeout
      [SCSI] ibmvscsi: switch to block timeout
      [SCSI] aacraid: switch to block timeout
      [SCSI] zfcp: prevent double decrement on host_busy while being busy
      [SCSI] zfcp: fix deadlock between wq triggered port scan and ERP
      [SCSI] zfcp: eliminate race between validation and locking
      [SCSI] zfcp: verify for correct rport state before scanning for SCSI devs
      [SCSI] zfcp: returning an ERR_PTR where a NULL value is expected
      [SCSI] zfcp: Fix opening of wka ports
      [SCSI] zfcp: fix remote port status check
      [SCSI] fc_transport: fix old bug on bitflag definitions
      [SCSI] Fix hang in starved list processing

commit 1122b19b8f4da2ee6d6b21780f86bea7957f641e
Author: Mark Salter <msalter@redhat.com>
Date:   Tue Dec 2 14:38:09 2008 +0000

    MN10300: Fix application of kernel module relocations
    
    This fixes the MN10300 kernel module linking to match the toolchain.  RELA
    relocs don't use the value at the location being relocated.  This has been
    working because the tools always leave the value at the target location
    cleared.
    
    Signed-off-by: Mark Salter <msalter@redhat.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 026bde120a161d9035502a47dd311bd572f6d31f
Author: Dean Nelson <dcn@sgi.com>
Date:   Tue Dec 2 08:06:01 2008 -0600

    sgi-gru: call fs_initcall() if statically linked
    
    If xpc.ko and gru.ko are both statically linked into the kernel, then
    xpc_init() can get called before gru_init() and make a call to one of the
    gru's exported functions before the gru has initialized itself. The end
    result is a NULL dereference.
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7a0d7940e7c7c143520e38900ddd4e217d3c6640
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Tue Dec 2 13:37:01 2008 -0600

    powerpc: Use physical cpu id when setting the processor affinity
    
    In the CONFIG_SMP case the irq_choose_cpu() code was returning back
    a logical cpu id not the physical id.  We were writing that directly
    into the HW register.
    
    We need to be calling get_hard_smp_processor_id() so irq_choose_cpu()
    always returns a physical cpu id.
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9ff473b9a72942c5ac0ad35607cae28d8d59ed7a
Author: Rik van Riel <riel@redhat.com>
Date:   Tue Dec 2 10:31:52 2008 -0800

    vmscan: evict streaming IO first
    
    Count the insertion of new pages in the statistics used to drive the
    pageout scanning code.  This should help the kernel quickly evict
    streaming file IO.
    
    We count on the fact that new file pages start on the inactive file LRU
    and new anonymous pages start on the active anon list.  This means
    streaming file IO will increment the recent scanned file statistic, while
    leaving the recent rotated file statistic alone, driving pageout scanning
    to the file LRUs.
    
    Pageout activity does its own list manipulation.
    
    Signed-off-by: Rik van Riel <riel@redhat.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Tested-by: Gene Heskett <gene.heskett@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f1d0b063d993527754f062c589b73f125024d216
Author: Kay Sievers <kay.sievers@vrfy.org>
Date:   Tue Dec 2 10:31:50 2008 -0800

    bdi: register sysfs bdi device only once per queue
    
    Devices which share the same queue, like floppies and mtd devices, get
    registered multiple times in the bdi interface, but bdi accounts only the
    last registered device of the devices sharing one queue.
    
    On remove, all earlier registered devices leak, stay around in sysfs, and
    cause "duplicate filename" errors if the devices are re-created.
    
    This prevents the creation of multiple bdi interfaces per queue, and the
    bdi device will carry the dev_t name of the block device which is the
    first one registered, of the pool of devices using the same queue.
    
    [akpm@linux-foundation.org: add a WARN_ON so we know which drivers are misbehaving]
    Tested-by: Peter Korsgaard <jacmet@sunsite.dk>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Cc: David Woodhouse <dwmw2@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 1b79cd04fab80be61dcd2732e2423aafde9a4c1c
Author: Junjiro R. Okajima <hooanon05@yahoo.co.jp>
Date:   Tue Dec 2 10:31:46 2008 -0800

    nfsd: fix vm overcommit crash fix #2
    
    The previous patch from Alan Cox ("nfsd: fix vm overcommit crash",
    commit 731572d39fcd3498702eda4600db4c43d51e0b26) fixed the problem where
    knfsd crashes on exported shmemfs objects and strict overcommit is set.
    
    But the patch forgot supporting the case when CONFIG_SECURITY is
    disabled.
    
    This patch copies a part of his fix which is mainly for detecting a bug
    earlier.
    
    Acked-by: James Morris <jmorris@namei.org>
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Junjiro R. Okajima <hooanon05@yahoo.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ae4e1434a03207661b4331ea715d3f18cb479123
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Tue Dec 2 20:58:26 2008 +0100

    m68k: Update defconfigs for 2.6.28-rc7
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

commit 95964018d53f479529dfdc2b46fe30c0a14a00e0
Author: Hannes Eder <hannes@hanneseder.net>
Date:   Tue Dec 2 20:40:04 2008 +0100

    alim15x3: fix sparse warning
    
    Fix this sparse warning:
    
      drivers/ide/alim15x3.c:594:2: warning: returning void-valued expression
    
    Signed-off-by: Hannes Eder <hannes@hanneseder.net>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit a3663801b1bb1b6f6e2be5198cc81bc16f1558fd
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Tue Dec 2 20:40:04 2008 +0100

    ide: remove dead code from drive_is_ready()
    
    We guarantee 400ns delay at the time of issuing the command.
    
    Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 6b7d8fc36272169d1d07a07174f2c8a7909c025e
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Tue Dec 2 20:40:03 2008 +0100

    ide: fix build for DEBUG_PM
    
    Also while at it:
    
    * Drop unused arguments from ide_complete_power_step().
    
    * Move DEBUG_PM printk() from ide_end_drive_cmd() to
      ide_complete_power_step().
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit e9eb8388306364295308132265c00bea685f409f
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Tue Dec 2 20:40:03 2008 +0100

    ide: respect current DMA setting during resume
    
    Respect current DMA setting during resume, otherwise PIO timings
    may get destroyed if host uses shared PIO/MWDMA timings.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit c7b997b372e8b6e7ee8d91696c74a556754f5fdb
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Tue Dec 2 20:40:03 2008 +0100

    ide: add SAMSUNG SP0822N with firmware WA100-10 to ivb_list[]
    
    Should fix kernel.org bug #10225:
    http://bugzilla.kernel.org/show_bug.cgi?id=10225
    
    Reported-by: Matthias B. <haferfrost@web.de>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Acked-by: Sergei Shtyltov <sshtylyov@ru.mvista.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 6636487e8dc49a1c43fed336bdc4a2f3d7ce6881
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Tue Dec 2 20:40:03 2008 +0100

    amd74xx: workaround unreliable AltStatus register for nVidia controllers
    
    It seems that on some nVidia controllers using AltStatus register
    can be unreliable so default to Status register if the PCI device
    is in Compatibility Mode.  In order to achieve this:
    
    * Add ide_pci_is_in_compatibility_mode() inline helper to <linux/ide.h>.
    
    * Add IDE_HFLAG_BROKEN_ALTSTATUS host flag and set it in amd74xx host
      driver for nVidia controllers in Compatibility Mode.
    
    * Teach actual_try_to_identify() and drive_is_ready() about the new flag.
    
    This fixes the regression caused by removal of CONFIG_IDEPCI_SHARE_IRQ
    config option in 2.6.25 and using AltStatus register unconditionally when
    available (kernel.org bugs #11659 and #10216).
    
    [ Moreover for CONFIG_IDEPCI_SHARE_IRQ=y (which is what most people
      and distributions use) it never worked correctly. ]
    
    Thanks to Remy LABENE and Lars Winterfeld for help with debugging the problem.
    
    More info at:
    http://bugzilla.kernel.org/show_bug.cgi?id=11659
    http://bugzilla.kernel.org/show_bug.cgi?id=10216
    
    Reported-by: Remy LABENE <remy.labene@free.fr>
    Tested-by: Remy LABENE <remy.labene@free.fr>
    Tested-by: Lars Winterfeld <lars.winterfeld@tu-ilmenau.de>
    Acked-by: Borislav Petkov <petkovbb@gmail.com>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit f9e3326dce0ef117308872cd234b903aa19aa40f
Author: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
Date:   Tue Dec 2 20:40:02 2008 +0100

    ide: fix the ide_release_lock imbalance
    
    ide_release_lock() spits out lots of:
    
    	ide_release_lock: bug
    
    warnings on Atari Falcon.
    
    Fix the ide_release_lock imbalance.
    
    Signed-off-by: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

commit 89c223a616cddd9eab792b860f61f99cec53c4e8
Author: Finn Thain <fthain@telegraphics.com.au>
Date:   Tue Nov 18 20:40:40 2008 +0100

    macfb: Do not overflow fb_fix_screeninfo.id
    
    Don't overflow the 16-character fb_fix_screeninfo id string (fixes some
    console erasing and blanking artifacts). Have the ID default to "Unknown"
    on machines with no built-in video and no nubus devices. Check for
    fb_alloc_cmap failure.
    
    Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

commit dc5c49bff34e5b5a4334560dc7f7dfeae91d8962
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun Nov 30 10:38:08 2008 -0600

    [SCSI] stex: switch to block timeout
    
    stex sets the timeout in its slave configure routine for all devices.
    This now needs to update the request queue timeout in block.
    
    Cc: Ed Lin <ed.lin@promise.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 9728c0814ecb505546696a659858fdb761375544
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun Nov 30 10:32:26 2008 -0600

    [SCSI] make scsi_eh_try_stu use block timeout
    
    scsi_eh_try_stu() was still using the timeout parameter in the device
    which is now not set (i.e. zero filled) meaning that it waited no time
    at all for the start unit command to complete (leading the routine to
    conclude failure every time).  This lead to a 2.6.27 regression:
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12120
    
    Where firewire devices that were non spec compliant wouldn't spin up.
    
    Fix this by using the block queue timeout value instead.
    
    Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit ee1ab9e945803a607ba5c2a96b69e4820a806552
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun Nov 30 10:27:51 2008 -0600

    [SCSI] megaraid_sas: switch to block timeout
    
    megaraid_sas sets the timeout in its slave configure routine for devices
    on special channels.  This now needs to update the request queue timeout
    in block.
    
    Cc: "Yang, Bo" <Bo.Yang@lsi.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 97b5648a8bc2aef980645ee39d31bba0933a6112
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun Nov 30 10:20:37 2008 -0600

    [SCSI] ibmvscsi: switch to block timeout
    
    ibmvscsi sets the timeout in its slave configure routine for disk
    devices.  This now needs to update the request queue timeout in block.
    
    Cc: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 8fbd64e2eeb81d4b94be935a15d6d4829ec62aa2
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun Nov 30 10:15:37 2008 -0600

    [SCSI] aacraid: switch to block timeout
    
    aacraid updates the timeout in its slave configure routine if it is too
    small.  This now needs to update the request queue timeout in block.
    
    Cc: AACRAID list <aacraid@adaptec.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit f7a65e92e4bef3ccf9e008ed8cd52d914b6a4adb
Author: Swen Schillig <swen@vnet.ibm.com>
Date:   Thu Nov 27 11:44:07 2008 +0100

    [SCSI] zfcp: prevent double decrement on host_busy while being busy
    
    The zfcp_scsi_queuecommand was not acting according to the standard
    when the respective unit was not available. In this case an -EBUSY was
    returned, which is not valid in itself, and in addition scsi_done
    was called. This combination is not allowed and was leading to a
    double finish of the request and therefor double decrement of the
    host_busy counter.
    
    Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit fca55b6fb587e42c7761ee30bd1a6c313a9270c9
Author: Swen Schillig <swen@vnet.ibm.com>
Date:   Wed Nov 26 18:07:40 2008 +0100

    [SCSI] zfcp: fix deadlock between wq triggered port scan and ERP
    
    Waiting for the ERP to be finished in a task running in the global
    kernel work-queue is a bad idea, especially if the ERP needs to run
    another job in this work-queue before it can finish. -> deadlock.
    
    This patch removes the necessity to wait for a finished ERP from the
    scan task and moves the job scheduling to the end of the ERP.
    
    Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 0ac55aa90f2c3bd08e57e52a513b82b18ce0a5bc
Author: Swen Schillig <swen@vnet.ibm.com>
Date:   Wed Nov 26 18:07:39 2008 +0100

    [SCSI] zfcp: eliminate race between validation and locking
    
    The check of having a valid pointer was performed before the
    processing was secured by the lock. Between those two steps the
    pointer can turn invalid.  During further processing another value is
    used (referenced by the pointer described above) as a function pointer
    which is never verified to be valid either, resulting under some
    circumstances in an invalid function call.  This patch is fixing both
    issues.
    
    Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 26871c97d52e50dc574bd01967926650643b142a
Author: Swen Schillig <swen@vnet.ibm.com>
Date:   Wed Nov 26 18:07:38 2008 +0100

    [SCSI] zfcp: verify for correct rport state before scanning for SCSI devs
    
    Prevent a SCSI target scan for a rport which have turned invalid
    in the meantime.
    
    Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 633528c304f20b5c2e3e04d48f620548ce08b12e
Author: Swen Schillig <swen@vnet.ibm.com>
Date:   Wed Nov 26 18:07:37 2008 +0100

    [SCSI] zfcp: returning an ERR_PTR where a NULL value is expected
    
    Aborting a SCSI cmnd might requrie to send a abort_fsf_cmnd. If the
    creation of this fsf_req fails an ERR_PTR is returned where a NULL
    value would be expected as an error indicator. This ERR_PTR is
    dereferenced as valid fsf_req in succeeding processing leading to
    an error.
    
    Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 1c1cba17a9078c83a80a099bc207b208d664a13a
Author: Christof Schmitt <christof.schmitt@de.ibm.com>
Date:   Wed Nov 26 18:07:36 2008 +0100

    [SCSI] zfcp: Fix opening of wka ports
    
    Running two wka_port_get calls in parallel could issue two open_port
    requests, overwriting the port handle. Don't issue an open_port
    for the state PORT_OPENING, and only read the data from GOOD
    responses.
    
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Acked-by: Swen Schillig <swen@vnet.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit bce02614cd1b3d669af1195695e503e818b60fae
Author: Martin Petermann <martin@linux.vnet.ibm.com>
Date:   Wed Nov 26 18:07:35 2008 +0100

    [SCSI] zfcp: fix remote port status check
    
    For an incoming RSCN it was checked by the ZFCP_STATUS_PORT_DID_DID
    define to re-open a remote port or to test the connection. Since this
    define was re-used it was also necessary to replace that define with
    ZFCP_STATUS_PORT_PHYS_OPEN.
    
    Signed-off-by: Martin Petermann <martin@linux.vnet.ibm.com>
    Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 290172e79036fc25a22aaf3da4835ee634886183
Author: Bernhard Walle <bwalle@suse.de>
Date:   Sun Oct 26 15:59:37 2008 +0100

    [WATCHDOG] hpwdt: Fix kdump when using hpwdt
    
    When the "hpwdt" module is loaded (even if the /dev/watchdog device is not
    opened), then kdump does not work. The panic kernel either does not start at
    all or crash in various places.
    
    The problem is that hpwdt_pretimeout is registered with register_die_notifier()
    with the highest possible priority. Because it returns NOTIFY_STOP, the
    crash_nmi_callback which is also registered with register_die_notifier()
    is never executed. This causes the shutdown of other CPUs to fail.
    
    Reverting the order is no option: The crash_nmi_callback executes HLT
    and so never returns normally. Because of that, it must be executed as
    last notifier, which currently is done.
    
    So, that patch returns NOTIFY_OK to keep the crash_nmi_callback executed.
    
    Signed-off-by: Bernhard Walle <bwalle@suse.de>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
    Cc: Vivek Goyal <vgoyal@redhat.com>

commit 02d43b1d13a0a55a75bb5c5f98d2b13dbe71ecf9
Author: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date:   Mon Dec 1 05:46:38 2008 -0500

    documentation: local_ops fix on_each_cpu
    
    Impact: update code example in documentation
    
    * Dr. David Alan Gilbert (dave@treblig.org) wrote:
    [...]
    >  I noticed while looking at something else that the example in
    >  local_ops.txt still has the 4 operand on_each_cpu in the latest git;
    >  I don't know the rest of the code around there very well so I thought
    >  it best to mention it rather than post a patch.
    
    Reported-by: Dr. David Alan Gilbert <dave@treblig.org>
    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit b270ee8a9fc9547eb781ce9ccd379450bcf9a204
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Dec 1 02:48:26 2008 -0800

    sparc64: Fix offset calculation in compute_size()
    
    The fault address is somewhere inside of the buffer, not
    before it.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 43714539eab42b2fa3653ea7bd667b36c2291b11
Author: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Date:   Sat Nov 29 16:50:12 2008 +0530

    sched: don't export sched_mc_power_savings in laptops
    
    Impact: do not expose a control that has no effect
    
    Fix to prevent sched_mc_power_saving from being exported through sysfs
    on single-socket systems. (Say multicore single socket (Laptop))
    
    CPU core map of the boot cpu should be equal to possible number
    of cpus for single socket system.
    
    This fix has been developed at FOSS.in kernel workout.
    
    Signed-off-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
    Acked-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit 44ae98b53961e7c8c1d47bbffaf08c4f7bf29249
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Sun Nov 30 23:27:11 2008 -0800

    MAINTAINERS: add netdev to ATM
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit aac725cf1649d593a13be1edc99ed489f8050a99
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Sat Nov 29 20:42:28 2008 -0800

    ATM: horizon, fix hrz_probe fail path
    
    One fail path in hrz_probe omitted device disable. Fix it.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sat Nov 29 13:46:27 2008 +0100

    x86: fix dma_mapping_error for 32bit x86
    
    Devices like b44 ethernet can't dma from addresses above 1GB. The driver
    handles this cases by falling back to GFP_DMA allocation. But for detecting
    the problem it needs to get an indication from dma_mapping_error.
    The bug is triggered by using a VMSPLIT option of 2G/2G.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>

commit e6358135147807351db3b7782d3e198a1bba8b62
Author: Frédéric Moulins <frederic.moulins@alsatis.com>
Date:   Fri Nov 28 22:12:02 2008 -0800

    pppol2tp: Add missing sock_put() in pppol2tp_release()
    
    pppol2tp_sock_to_session() do sock_hold() if the session to release is
    not NULL.
    
    Signed-off-by: Frédéric Moulins <frederic.moulins@alsatis.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5f23b734963ec7eaa3ebcd9050da0c9b7d143dd3
Author: dann frazier <dannf@hp.com>
Date:   Wed Nov 26 15:32:27 2008 -0800

    net: Fix soft lockups/OOM issues w/ unix garbage collector
    
    This is an implementation of David Miller's suggested fix in:
      https://bugzilla.redhat.com/show_bug.cgi?id=470201
    
    It has been updated to use wait_event() instead of
    wait_event_interruptible().
    
    Paraphrasing the description from the above report, it makes sendmsg()
    block while UNIX garbage collection is in progress. This avoids a
    situation where child processes continue to queue new FDs over a
    AF_UNIX socket to a parent which is in the exit path and running
    garbage collection on these FDs. This contention can result in soft
    lockups and oom-killing of unrelated processes.
    
    Signed-off-by: dann frazier <dannf@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit efbbced361f3ff4ff9e85310ccff894185c4d904
Author: Patrick McHardy <kaber@trash.net>
Date:   Wed Nov 26 15:30:48 2008 -0800

    macvlan: don't broadcast PAUSE frames to macvlan devices
    
    PAUSE frames are only relevant for the real device, broadcasting them
    to all macvlan devices can cause a significant load increase.
    
    Reported-by: Ben Greear <greearb@candelatech.com>
    Tested-by: Ben Greear <greearb@candelatech.com>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 7e5ab54296a41f590c9cbc976e1c86272f3a7e00
Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date:   Wed Nov 26 15:26:43 2008 -0800

    Phonet: fix oops in phonet_address_del() on non-Phonet device
    
    A NULL dereference would occur when trying to delete an addres from a
    network device that does not have any Phonet address.
    
    Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3ec192559033ed457f0d7856838654c100fc659f
Author: Patrick McHardy <kaber@trash.net>
Date:   Wed Nov 26 03:57:44 2008 -0800

    netfilter: ctnetlink: fix GFP_KERNEL allocation under spinlock
    
    The previous fix for the conntrack creation race (netfilter: ctnetlink:
    fix conntrack creation race) missed a GFP_KERNEL allocation that is
    now performed while holding a spinlock. Switch to GFP_ATOMIC.
    
    Reported-and-tested-by: Zoltan Borbely <bozo@andrews.hu>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6c475352e87224a8f0b8cc6f6cc96b30563dc5b4
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Tue Nov 25 15:33:10 2008 +0100

    KVM: MMU: avoid creation of unreachable pages in the shadow
    
    It is possible for a shadow page to have a parent link
    pointing to a freed page. When zapping a high level table,
    kvm_mmu_page_unlink_children fails to remove the parent_pte link.
    For that to happen, the child must be unreachable via the shadow
    tree, which can happen in shadow_walk_entry if the guest pte was
    modified in between walk() and fetch(). Remove the parent pte
    reference in such case.
    
    Possible cause for oops in bug #2217430.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit bd51126957eeac96d056c670545ff798c89f63f5
Author: David S. Miller <davem@davemloft.net>
Date:   Wed Nov 26 01:17:01 2008 -0800

    sungem: Fix PCS_MIICTRL register write in gem_init_phy().
    
    Use writel not writeb.
    
    Noticed by Hermann Lauer.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8f480c0e4e120911a673ed7385359bf76ae01963
Author: Arjan van de Ven <arjan@linux.intel.com>
Date:   Tue Nov 25 21:08:13 2008 -0800

    net: make skb_truesize_bug() call WARN()
    
    The truesize message check is important enough to make it print "BUG"
    to the user console... lets also make it important enough to spit a
    backtrace/module list etc so that kerneloops.org can track them.
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1d71da164d7fb40fac72c0406a4a531265916fc8
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Tue Nov 25 21:05:51 2008 -0800

    net: hp-plus uses eip_poll
    
    hp-plus uses 8390p.c, so it should use eip_poll(), not ei_poll().
    
    drivers/built-in.o: In function `hpp_probe1':
    hp-plus.c:(.init.text+0x9cbd): undefined reference to `ei_poll'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d7713ccc7bec64fbe0e4e39f93b17dfec711db7f
Merge: 11c6dd2... 020cf6b...
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Nov 25 14:27:58 2008 -0800

    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 020cf6ba7a91ccc5db359f91e9abba175fd3a0aa
Author: Ingo Molnar <mingo@elte.hu>
Date:   Sun Nov 23 20:09:54 2008 +0100

    net/wireless/reg.c: fix bad WARN_ON in if statement
    
    fix:
    
      net/wireless/reg.c:348:29: error: macro "if" passed 2 arguments, but takes just 1
    
    triggered by the branch-tracer.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 02969b38e6f7cef80e71d673d1e512e029a7009f
Author: Martin Xu <martin.xu@intel.com>
Date:   Mon Nov 24 10:49:27 2008 +0800

    ath5k: disable beacon filter when station is not associated
    
    Ath5k driver has too many interrupts per second at idle
    http://bugzilla.kernel.org/show_bug.cgi?id=11749
    
    Signed-off-by: Martin Xu <martin.xu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 33ab625f2a23e743161f7ccd8e774ce3d3891339
Author: Cheng Renquan <crquan@gmail.com>
Date:   Sat Nov 22 11:22:49 2008 +0800

    ath5k: fix Security issue in DebugFS part of ath5k
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12076
    
    Remove any write access to groups and others, only keep write permission
    to its owner, usually only root user.
    
    Reported-by: Jérôme Poulin <jeromepoulin@gmail.com>
    Signed-off-by: Cheng Renquan <crquan@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b4b6cda2298b0c9a0af902312184b775b8867c65
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date:   Thu Nov 20 17:15:13 2008 -0800

    ath9k: correct expected max RX buffer size
    
    We should only tell the hardware its capable of DMA'ing
    to us only what we asked dev_alloc_skb(). Prior to this
    it is possible a large RX'd frame could have corrupted
    DMA data but for us but we were saved only because we
    were previously also pci_map_single()'ing the same large
    value. The issue prior to this though was we were unmapping
    a smaller amount which the prior DMA patch fixed.
    
    Signed-off-by: Bennyam Malavazi <Bennyam.Malavazi@atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ca0c7e5101fd4f37fed8e851709f08580b92fbb3
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date:   Thu Nov 20 17:15:12 2008 -0800

    ath9k: Fix SW-IOMMU bounce buffer starvation
    
    This should fix the SW-IOMMU bounce buffer starvation
    seen ok kernel.org bugzilla 11811:
    
    http://bugzilla.kernel.org/show_bug.cgi?id=11811
    
    Users on MacBook Pro 3.1/MacBook v2 would see something like:
    
    DMA: Out of SW-IOMMU space for 4224 bytes at device 0000:0b:00.0
    
    Unfortunately its only easy to trigger on MacBook Pro 3.1/MacBook v2
    so far so its difficult to debug (even with swiotlb=force).
    
    We were pci_unmap_single()'ing less bytes than what we called
    for with pci_map_single() and as such we were starving
    the swiotlb from its 64MB amount of bounce buffers. We remain
    consistent and now always use sc->rxbufsize for RX. While at
    it we update the beacon DMA maps as well to only use the data
    portion of the skb, previous to this we were pci_map_single()'ing
    more data for beaconing than what we tell the hardware it can use,
    therefore pushing more iotlb abuse.
    
    Still not sure why this is so easily triggerable on
    MacBook Pro 3.1, it may be the hardware configuration
    tends to use more memory > 3GB mark for DMA.
    
    Signed-off-by: Maciej Zenczykowski <zenczykowski@gmail.com>
    Signed-off-by: Bennyam Malavazi <Bennyam.Malavazi@atheros.com>
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3dd3b79aeadc6f6abc5cc78724d7df3dfcc1bd0b
Author: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Date:   Thu Nov 20 10:20:31 2008 -0800

    mac80211 : Fix setting ad-hoc mode and non-ibss channel
    
    Patch fixes the kernel trace when user tries to set
    ad-hoc mode on non IBSS channel.
    e.g iwconfig wlan0 chan 36 mode ad-hoc
    
    Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e91af0af8677198346d5d29f09ab39bb3b0e3faf
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Wed Nov 19 01:22:51 2008 +0100

    iwlagn: fix DMA sync
    
    For the RX DMA fix for iwlwifi ("iwlagn: fix RX skb alignment") Luis
    pointed out:
    
    > aligned_dma_addr can obviously be > real_dma_addr at this point, what
    > guarantees we can use it on our own whim?
    
    I asked around, and he's right, there may be platforms that do not allow
    passing such such an address to the DMA API functions. This patch
    changes it by using the proper dma_sync_single_range_for_cpu API
    invented for this purpose.
    
    Cc: Luis R. Rodriguez <mcgrof@gmail.com>
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit c30f8a6c6d74f67bc2107726cc61a1e7c71e9740
Author: Hollis Blanchard <hollisb@us.ibm.com>
Date:   Mon Nov 24 11:37:38 2008 -0600

    KVM: ppc: stop leaking host memory on VM exit
    
    When the VM exits, we must call put_page() for every page referenced in the
    shadow TLB.
    
    Without this patch, we usually leak 30-50 host pages (120 - 200 KiB with 4 KiB
    pages). The maximum number of pages leaked is the size of our shadow TLB, 64
    pages.
    
    Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 11c6dd2c723a9ff9bdd4ee11b2798a08abc94e98
Author: Trent Piepho <tpiepho@freescale.com>
Date:   Tue Nov 25 01:00:47 2008 -0800

    phylib: Add Vitesse VSC8221 SGMII PHY
    
    PHY is mostly compatible with the existing VSC8244 PHY.  The init sequence
    is different and the interrupt mask lacks some bits present in the VSC8244.
    
    Rather than making a copy of the existing VSC234x config_intr function and
    change one constant, I modify it to select the interrupt mask based on
    which driver is calling it.  This lets it be used by both drivers.
    
    Signed-off-by: Trent Piepho <tpiepho@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b
Author: Bernard Pidoux <bernard.pidoux@upmc.fr>
Date:   Mon Nov 24 11:49:40 2008 +0000

    rose: zero length frame filtering in af_rose.c
    
    Since changeset e79ad711a0108475c1b3a03815527e7237020b08 from  mainline,
    >From David S. Miller,
    empty packet can be transmitted on connected socket for datagram protocols.
    
    However, this patch broke a high level application using ROSE network protocol with connected datagram.
    
    Bulletin Board Stations perform bulletins forwarding between BBS stations via ROSE network using a forward protocol.
    Now, if for some reason, a buffer in the application software happens to be empty at a specific moment,
    ROSE sends an empty packet via unfiltered packet socket.
    When received, this ROSE packet introduces perturbations of data exchange of BBS forwarding,
    for the application message forwarding protocol is waiting for something else.
    We agree that a more careful programming of the application protocol would avoid this situation and we are
    willing to debug it.
    But, as an empty frame is no use and does not have any meaning for ROSE protocol,
    we may consider filtering zero length data both when sending and receiving socket data.
    
    The proposed patch repaired BBS data exchange through ROSE network that were broken since 2.6.22.11 kernel.
    
    Signed-off-by: Bernard Pidoux <f6bvp@amsat.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 631339f1e544a4d39a63cfe6708c5bddcd5a2c48
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Mon Nov 24 16:06:50 2008 -0800

    bridge: netfilter: fix update_pmtu crash with GRE
    
    As GRE tries to call the update_pmtu function on skb->dst and
    bridge supplies an skb->dst that has a NULL ops field, all is
    not well.
    
    This patch fixes this by giving the bridge device an ops field
    with an update_pmtu function.  For the moment I've left all
    other fields blank but we can fill them in later should the
    need arise.
    
    Based on report and patch by Philip Craig.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f79fca55f9a6fe54635ad32ddc8a38f92a94ec30
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon Nov 24 16:06:17 2008 -0800

    netfilter: xtables: add missing const qualifier to xt_tgchk_param
    
    When entryinfo was a standalone parameter to functions, it used to be
    "const void *". Put the const back in.
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b54ad409fd09a395b839fb81f300880d76861c0e
Author: Patrick McHardy <kaber@trash.net>
Date:   Mon Nov 24 15:56:17 2008 -0800

    netfilter: ctnetlink: fix conntrack creation race
    
    Conntrack creation through ctnetlink has two races:
    
    - the timer may expire and free the conntrack concurrently, causing an
      invalid memory access when attempting to put it in the hash tables
    
    - an identical conntrack entry may be created in the packet processing
      path in the time between the lookup and hash insertion
    
    Hold the conntrack lock between the lookup and insertion to avoid this.
    
    Reported-by: Zoltan Borbely <bozo@andrews.hu>
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a8d82d9b950213b66b22c9e7c63a058841de2394
Author: Chuck Lever <chuck.lever@oracle.com>
Date:   Mon Nov 24 12:51:55 2008 -0500

    NLM: client-side nlm_lookup_host() should avoid matching on srcaddr
    
    Since commit c98451bd, the loop in nlm_lookup_host() unconditionally
    compares the host's h_srcaddr field to the incoming source address.
    For client-side nlm_host entries, both are always AF_UNSPEC, so this
    check is unnecessary.
    
    Since commit 781b61a6, which added support for AF_INET6 addresses to
    nlm_cmp_addr(), nlm_cmp_addr() now returns FALSE for AF_UNSPEC
    addresses, which causes nlm_lookup_host() to create a fresh nlm_host
    entry every time it is called on the client.
    
    These extra entries will eventually expire once the server is
    unmounted, so the impact of this regression, introduced with lockd
    IPv6 support in 2.6.28, should be minor.
    
    We could fix this by adding an arm in nlm_cmp_addr() for AF_UNSPEC
    addresses, but really, nlm_lookup_host() shouldn't be matching on the
    srcaddr field for client-side nlm_host lookups.
    
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

commit e4625eb826de4f6774ee602c442ba23b686bdcc7
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Mon Nov 24 10:32:46 2008 -0600

    nfsd: use of unitialized list head on error exit in nfs4recover.c
    
    Thanks to Matthew Dodd for this bug report:
    
    A file label issue while running SELinux in MLS mode provoked the
    following bug, which is a result of use before init on a 'struct list_head'.
    
    In nfsd4_list_rec_dir() if the call to dentry_open() fails the 'goto
    out' skips INIT_LIST_HEAD() which results in the normally improbable
    case where list_entry() returns NULL.
    
    Trace follows.
    
    NFSD: Using /var/lib/nfs/v4recovery as the NFSv4 state recovery directory
    SELinux:  Context unconfined_t:object_r:var_lib_nfs_t:s0 is not valid
    (left unmapped).
    type=1400 audit(1227298063.609:282): avc:  denied  { read } for
    pid=1890 comm="rpc.nfsd" name="v4recovery" dev=dm-0 ino=148726
    scontext=system_u:system_r:nfsd_t:s0-s15:c0.c1023
    tcontext=system_u:object_r:unlabeled_t:s15:c0.c1023 tclass=dir
    BUG: unable to handle kernel NULL pointer dereference at 00000004
    IP: [<c050894e>] list_del+0x6/0x60
    *pde = 0d9ce067 *pte = 00000000
    Oops: 0000 [#1] SMP
    Modules linked in: nfsd lockd nfs_acl auth_rpcgss exportfs autofs4
    sunrpc ipv6 dm_multipath scsi_dh ppdev parport_pc sg parport floppy
    ata_piix pata_acpi ata_generic libata pcnet32 i2c_piix4 mii pcspkr
    i2c_core dm_snapshot dm_zero dm_mirror dm_log dm_mod BusLogic sd_mod
    scsi_mod crc_t10dif ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd [last
    unloaded: microcode]
    
    Pid: 1890, comm: rpc.nfsd Not tainted (2.6.27.5-37.fc9.i686 #1)
    EIP: 0060:[<c050894e>] EFLAGS: 00010217 CPU: 0
    EIP is at list_del+0x6/0x60
    EAX: 00000000 EBX: 00000000 ECX: 00000000 EDX: cd99e480
    ESI: cf9caed8 EDI: 00000000 EBP: cf9caebc ESP: cf9caeb8
      DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
    Process rpc.nfsd (pid: 1890, ti=cf9ca000 task=cf4de580 task.ti=cf9ca000)
    Stack: 00000000 cf9caef0 d0a9f139 c0496d04 d0a9f217 fffffff3 00000000
    00000000
            00000000 00000000 cf32b220 00000000 00000008 00000801 cf9caefc
    d0a9f193
            00000000 cf9caf08 d0a9b6ea 00000000 cf9caf1c d0a874f2 cf9c3004
    00000008
    Call Trace:
      [<d0a9f139>] ? nfsd4_list_rec_dir+0xf3/0x13a [nfsd]
      [<c0496d04>] ? do_path_lookup+0x12d/0x175
      [<d0a9f217>] ? load_recdir+0x0/0x26 [nfsd]
      [<d0a9f193>] ? nfsd4_recdir_load+0x13/0x34 [nfsd]
      [<d0a9b6ea>] ? nfs4_state_start+0x2a/0xc5 [nfsd]
      [<d0a874f2>] ? nfsd_svc+0x51/0xff [nfsd]
      [<d0a87f2d>] ? write_svc+0x0/0x1e [nfsd]
      [<d0a87f48>] ? write_svc+0x1b/0x1e [nfsd]
      [<d0a87854>] ? nfsctl_transaction_write+0x3a/0x61 [nfsd]
      [<c04b6a4e>] ? sys_nfsservctl+0x116/0x154
      [<c04975c1>] ? putname+0x24/0x2f
      [<c04975c1>] ? putname+0x24/0x2f
      [<c048d49f>] ? do_sys_open+0xad/0xb7
      [<c048d337>] ? filp_close+0x50/0x5a
      [<c048d4eb>] ? sys_open+0x1e/0x26
      [<c0403cca>] ? syscall_call+0x7/0xb
      [<c064007b>] ? init_cyrix+0x185/0x490
      =======================
    Code: 75 e1 8b 53 08 8d 4b 04 8d 46 04 e8 75 00 00 00 8b 53 10 8d 4b 0c
    8d 46 0c e8 67 00 00 00 5b 5e 5f 5d c3 90 90 55 89 e5 53 89 c3 <8b> 40
    04 8b 00 39 d8 74 16 50 53 68 3e d6 6f c0 6a 30 68 78 d6
    EIP: [<c050894e>] list_del+0x6/0x60 SS:ESP 0068:cf9caeb8
    ---[ end trace a89c4ad091c4ad53 ]---
    
    Cc: Matthew N. Dodd <Matthew.Dodd@spart.com>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>

commit 2da2c21d7508d34bc6d600df665d84871b65d2b9
Author: Tom Tucker <tom@opengridcomputing.com>
Date:   Sun Nov 23 09:58:08 2008 -0600

    Add a reference to sunrpc in svc_addsock
    
    The svc_addsock function adds transport instances without taking a
    reference on the sunrpc.ko module, however, the generic transport
    destruction code drops a reference when a transport instance
    is destroyed.
    
    Add a try_module_get call to the svc_addsock function for transport
    instances added by this function.
    
    Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Tested-by: Jeff Moyer <jmoyer@redhat.com>

commit 2c5e76158fcea6e3b9536a74efa7b5e2e846d374
Author: J. Bruce Fields <bfields@citi.umich.edu>
Date:   Thu Nov 20 14:36:17 2008 -0600

    nfsd: clean up grace period on early exit
    
    If nfsd was shut down before the grace period ended, we could end up
    with a freed object still on grace_list.  Thanks to Jeff Moyer for
    reporting the resulting list corruption warnings.
    
    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Tested-by: Jeff Moyer <jmoyer@redhat.com>

commit eccdaeafaea3ed115068ba55d01f22e486e5437d
Author: Petr Tesarik <ptesarik@suse.cz>
Date:   Mon Nov 24 15:46:31 2008 +0100

    posix-cpu-timers: fix clock_gettime with CLOCK_PROCESS_CPUTIME_ID
    
    Since CLOCK_PROCESS_CPUTIME_ID is in fact translated to -6, the switch
    statement in cpu_clock_sample_group() must first mask off the irrelevant
    bits, similar to cpu_clock_sample().
    
    Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    
    --
     posix-cpu-timers.c |    2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)

commit 5147d14e995c097571d383fe1287fb33345a51ee
Author: Qinghuang Feng <qhfeng.kernel@gmail.com>
Date:   Sun Nov 23 15:47:24 2008 -0800

    drivers/net/chelsio/sge.c: remove redundant argument comments
    
    remove redundant argument comments
    
    Signed-off-by: Qinghuang Feng <qhfeng.kernel@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ece4af18e07a5cea592ca095844783db4a349cb2
Author: Qinghuang Feng <qhfeng.kernel@gmail.com>
Date:   Sun Nov 23 15:46:55 2008 -0800

    driver/net/*: remove redundant argument comments
    
    remove redundant argument comments in files of drivers/net/*
    
    Signed-off-by: Qinghuang Feng <qhfeng.kernel@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0c0f40bdbe4ddb48ebecfb5c2b56eeb175a57c45
Author: Marcelo Tosatti <mtosatti@redhat.com>
Date:   Fri Nov 21 19:13:58 2008 +0100

    KVM: MMU: fix sync of ptes addressed at owner pagetable
    
    During page sync, if a pagetable contains a self referencing pte (that
    points to the pagetable), the corresponding spte may be marked as
    writable even though all mappings are supposed to be write protected.
    
    Fix by clearing page unsync before syncing individual sptes.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit ce50b91d0f7b0b90e3960a6f306b4027378c7c27
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Fri Nov 21 10:56:08 2008 +0800

    KVM: ia64: Fix: Use correct calling convention for PAL_VPS_RESUME_HANDLER
    
    PAL_VPS_RESUME_HANDLER should use r26 to hold vac fields according to SDM.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 547567c67774d872eb344d21e0f2d7a76eb1e9c5
Author: Xiantao Zhang <xiantao.zhang@intel.com>
Date:   Thu Nov 20 10:35:35 2008 +0800

    KVM: ia64: Fix incorrect kbuild CFLAGS override
    
    Use CFLAGS_vcpu.o, not EXTRA_CFLAGS, to provide fixed register information
    to the compiler.
    
    Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit bd2b3ca7686d9470b1b58df631daa03179486182
Author: Avi Kivity <avi@redhat.com>
Date:   Thu Nov 20 11:47:18 2008 +0200

    KVM: VMX: Fix interrupt loss during race with NMI
    
    If an interrupt cannot be injected for some reason (say, page fault
    when fetching the IDT descriptor), the interrupt is marked for
    reinjection.  However, if an NMI is queued at this time, the NMI
    will be injected instead and the NMI will be lost.
    
    Fix by deferring the NMI injection until the interrupt has been
    injected successfully.
    
    Analyzed by Jan Kiszka.
    
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 3eb77d5116d78cce5b9fa9eb19d012bc636116b6
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Mon Nov 17 14:50:35 2008 +0100

    KVM: s390: Fix problem state handling in guest sigp handler
    
    We can get an exit for instructions starting with 0xae, even if the guest is
    in userspace. Lets make sure, that the signal processor handler is only called
    in guest supervisor mode. Otherwise, send a program check.
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>

commit 7e56b5d698707a9934833c47b24d78fb0bcaf764
Author: Catalin Marinas <catalin.marinas@arm.com>
Date:   Fri Nov 21 16:45:22 2008 -0800

    net: Fix memory leak in the proto_register function
    
    If the slub allocator is used, kmem_cache_create() may merge two or more
    kmem_cache's into one but the cache name pointer is not updated and
    kmem_cache_name() is no longer guaranteed to return the pointer passed
    to the former function. This patch stores the kmalloc'ed pointers in the
    corresponding request_sock_ops and timewait_sock_ops structures.
    
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Reviewed-by: Christoph Lameter <cl@linux-foundation.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 33cf71cee14743185305c61625c4544885055733
Author: Petr Tesarik <ptesarik@suse.cz>
Date:   Fri Nov 21 16:42:58 2008 -0800

    tcp: Do not use TSO/GSO when there is urgent data
    
    This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=12014
    
    Since most (if not all) implementations of TSO and even the in-kernel
    software GSO do not update the urgent pointer when splitting a large
    segment, it is necessary to turn off TSO/GSO for all outgoing traffic
    with the URG pointer set.
    
    Looking at tcp_current_mss (and the preceding comment) I even think
    this was the original intention. However, this approach is insufficient,
    because TSO/GSO is turned off only for newly created frames, not for
    frames which were already pending at the arrival of a message with
    MSG_OOB set. These frames were created when TSO/GSO was enabled,
    so they may be large, and they will have the urgent pointer set
    in tcp_transmit_skb().
    
    With this patch, such large packets will be fragmented again before
    going to the transmit routine.
    
    As a side note, at least the following NICs are known to screw up
    the urgent pointer in the TCP header when doing TSO:
    
    	Intel 82566MM (PCI ID 8086:1049)
    	Intel 82566DC (PCI ID 8086:104b)
    	Intel 82541GI (PCI ID 8086:1076)
    	Broadcom NetXtreme II BCM5708 (PCI ID 14e4:164c)
    
    Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 38ae07e44bb2dc86770555a1acafcb937ec74478
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Fri Nov 21 16:33:25 2008 -0800

    net/hp-plus: fix link errors
    
    Fix hp-plus driver link errors.
    Builds as loadable module and kernel image driver.
    All drivers that use 8390.o or 8390p.o that will build on
    i386 with MCA/PCI/EISA/ISA were built successfully both
    =m and =y.
    
    drivers/built-in.o: In function `hpp_open':
    hp-plus.c:(.text+0xac06c): undefined reference to `eip_interrupt'
    hp-plus.c:(.text+0xac0d7): undefined reference to `eip_open'
    drivers/built-in.o: In function `hpp_close':
    hp-plus.c:(.text+0xac1bb): undefined reference to `eip_close'
    drivers/built-in.o: In function `hpp_probe1':
    hp-plus.c:(.init.text+0xa98a): undefined reference to `NS8390p_init'
    drivers/built-in.o: In function `hp_plus_probe':
    (.init.text+0xa9fe): undefined reference to `__alloc_eip_netdev'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 208fbec5bec1de4fce48aab41efde11ba25ab04c
Author: Cord Walter <cord.walter@gmx.de>
Date:   Thu Nov 20 13:46:57 2008 +0000

    axnet_cs / pcnet_cs: moving PCMCIA_DEVICE_PROD_ID for Netgear FA411
    
    Hi,
    
    after noticing that my Netgear FA411 (PCMCIA-NIC) [1] stopped working with
    the release of the 2.6.25 kernel (sidux-version), I checked the
    respective driver sources and noticed that the pcnet_cs driver bailed
    out with "use axnet_cs instead" for the Netgear FA411, but axnet_cs
    doesn't claim this ID.
    
    I compiled a kernel with the PCMCIA-ID for the netgear card moved to
    axnet_cs from pcnet_cs which worked. I then contacted sidux-kernel
    maintainer Stefan Lippers-Hollmann who turned the info into this patch
    and integrated it into the kernel:
    
    <http://svn.berlios.de/svnroot/repos/fullstory/linux-sidux-2.6/trunk/debian/patches/features/2.6.27.4_PCMCIA_move-PCMCIA-ID-for-Netgear-FA411-from-pcnet_cs-to-axnet_cs.patch>
    
    This works for me and AFAIK there were no reports of any breakage for
    other devices on sidux-support.
    
    This looks like a trivial patch, but since I have very limited
    experience with kernel modifications  I might be woefully wrong there.
    But if there are no side effects of this patch, is it possible to get it
    into the official kernel?
    
    I can provide more detailed information on the affected hardware if
    necessary.
    
    -cord
    
    [1]
    Socket 1 Device 0:      [axnet_cs]              (bus ID: 1.0)
            Configuration:  state: on
            Product Name:   NETGEAR FA411 Fast Ethernet
            Identification: manf_id: 0x0149 card_id: 0x0411
                            function: 6 (network)
                            prod_id(1): "NETGEAR" (0x9aa79dc3)
                            prod_id(2): "FA411" (0x40fad875)
                            prod_id(3): "Fast Ethernet" (0xb4be14e3)
                            prod_id(4): --- (---)
    
    From: Stefan Lippers-Hollmann <s.l-h@gmx.de>
    Date: Sat, 1 Nov 2008 23:53:04 +0000
    Subject: PCMCIA: move PCMCIA ID for Netgear FA411 from pcnet_cs to axnet_cs:
    
    Since kernel 2.6.25, commit 61da96be07ec860e260ca4af0199b9d48d000b80
    (pcnet_cs: if AX88190-based card, printk "use axnet_cs instead" message.),
    pcnet_cs bails out with "use axnet_cs instead" for the Netgear FA411, but
    axnet_cs doesn't claim this ID.
    
    Socket 1 Device 0:      [axnet_cs]              (bus ID: 1.0)
            Configuration:  state: on
            Product Name:   NETGEAR FA411 Fast Ethernet
            Identification: manf_id: 0x0149 card_id: 0x0411
                            function: 6 (network)
                            prod_id(1): "NETGEAR" (0x9aa79dc3)
                            prod_id(2): "FA411" (0x40fad875)
                            prod_id(3): "Fast Ethernet" (0xb4be14e3)
                            prod_id(4): --- (---)
    
    Cc: stable <stable@kernel.org> [2.6.25, 2.6.26, 2.6.27]
    Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
    Signed-off-by: Cord Walter <qord@cwalter.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3477d204658733aa3a87d3ae03b0327c1e599517
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Wed Nov 19 11:53:15 2008 +0200

    UBIFS: pre-allocate bulk-read buffer
    
    To avoid memory allocation failure during bulk-read, pre-allocate
    a bulk-read buffer, so that if there is only one bulk-reader at
    a time, it would just use the pre-allocated buffer and would not
    do any memory allocation. However, if there are more than 1 bulk-
    reader, then only one reader would use the pre-allocated buffer,
    while the other reader would allocate the buffer for itself.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 6c0c42cdfd73fb161417403d8d077cb136e10bbf
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Tue Nov 18 20:20:05 2008 +0200

    UBIFS: do not allocate too much
    
    Bulk-read allocates 128KiB or more using kmalloc. The allocation
    starts failing often when the memory gets fragmented. UBIFS still
    works fine in this case, because it falls-back to standard
    (non-optimized) read method, though. This patch teaches bulk-read
    to allocate exactly the amount of memory it needs, instead of
    allocating 128KiB every time.
    
    This patch is also a preparation to the further fix where we'll
    have a pre-allocated bulk-read buffer as well. For example, now
    the @bu object is prepared in 'ubifs_bulk_read()', so we could
    path either pre-allocated or allocated information to
    'ubifs_do_bulk_read()' later. Or teaching 'ubifs_do_bulk_read()'
    not to allocate 'bu->buf' if it is already there.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 39ce81ce7168aa7226fb9f182c3a2b57060d0905
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Tue Nov 18 18:09:49 2008 +0200

    UBIFS: do not print scary memory allocation warnings
    
    Bulk-read allocates a lot of memory with 'kmalloc()', and when it
    is/gets fragmented 'kmalloc()' fails with a scarry warning. But
    because bulk-read is just an optimization, UBIFS keeps working fine.
    Supress the warning by passing __GFP_NOWARN option to 'kmalloc()'.
    
    This patch also introduces a macro for the magic 128KiB constant.
    This is just neater.
    
    Note, this is not really fixes the problem we had, but just hides
    the warnings. The further patches fix the problem.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit be1ffce3527d800ad50b955ede6eb44811cefd03
Author: Alessandro Zummo <a.zummo@towertech.it>
Date:   Fri Nov 21 01:24:38 2008 -0800

    rtc: rtc-starfire fixes
    
    Changes:
    
    - remove locks, rtc class provides them
    - remove unused include
    - if the rtc can't handle set_time, the driver should not fake it
    
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 060264133b946786b4b28a1ba79e6725eaf258f3
Author: Bernhard Walle <bwalle@suse.de>
Date:   Fri Nov 14 15:47:03 2008 +0100

    [WATCHDOG] hpwdt: set the mapped BIOS address space as executable
    
    The address provided by the SMBIOS/DMI CRU information is mapped via
    ioremap() in the virtual address space.  However, since the address is
    executed (i.e.  call'd), we need to set that pages as executable.
    
    Without that, I get following oops on a HP ProLiant DL385 G2
    machine with BIOS from 05/29/2008 when I trigger crashdump:
    
        BUG: unable to handle kernel paging request at ffffc20011090c00
        IP: [<ffffc20011090c00>] 0xffffc20011090c00
        PGD 12f813067 PUD 7fe6a067 PMD 7effe067 PTE 80000000fffd3173
        Oops: 0011 [1] SMP
        last sysfs file: /sys/devices/system/cpu/cpu3/cache/index2/shared_cpu_map
        CPU 1
        Modules linked in: autofs4 ipv6 af_packet cpufreq_conservative cpufreq_userspace
         cpufreq_powersave powernow_k8 fuse loop dm_mod rtc_cmos ipmi_si sg rtc_core i2c
        _piix4 ipmi_msghandler bnx2 sr_mod container button i2c_core hpilo joydev pcspkr
         rtc_lib shpchp hpwdt cdrom pci_hotplug usbhid hid ff_memless ohci_hcd ehci_hcd
        uhci_hcd usbcore edd ext3 mbcache jbd fan ide_pci_generic serverworks ide_core p
        ata_serverworks pata_acpi cciss ata_generic libata scsi_mod dock thermal process
        or thermal_sys hwmon
        Supported: Yes
        Pid: 0, comm: swapper Not tainted 2.6.27.5-HEAD_20081111100657-default #1
        RIP: 0010:[<ffffc20011090c00>]  [<ffffc20011090c00>] 0xffffc20011090c00
        RSP: 0018:ffff88012f6f9e68  EFLAGS: 00010046
        RAX: 0000000000000d02 RBX: 0000000000000000 RCX: 0000000000000000
        RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
        RBP: ffff88012f6f9e98 R08: 666666666666660a R09: ffffffffa1006fc0
        R10: 0000000000000000 R11: ffff88012f6f3ea8 R12: ffffc20011090c00
        R13: ffff88012f6f9ee8 R14: 000000000000000e R15: 0000000000000000
        FS:  00007ff70b29a6f0(0000) GS:ffff88012f6512c0(0000) knlGS:0000000000000000
        CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
        CR2: ffffc20011090c00 CR3: 0000000000201000 CR4: 00000000000006e0
        DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
        DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
        Process swapper (pid: 0, threadinfo ffff88012f6f2000, task ffff88007fa8a1c0)
        Stack:  ffffffffa0f8502b 0000000000000002 ffffffff80738d50 0000000000000000
         0000000000000046 0000000000000046 00000000fffffffe ffffffffa0f852ec
         0000000000000000 ffffffff804ad9a6 0000000000000000 0000000000000000
        Call Trace:
        Inexact backtrace:
    
         <NMI>  [<ffffffffa0f8502b>] ? asminline_call+0x2b/0x55 [hpwdt]
         [<ffffffffa0f852ec>] hpwdt_pretimeout+0x3c/0xa0 [hpwdt]
         [<ffffffff804ad9a6>] ? notifier_call_chain+0x29/0x4c
         [<ffffffff802587e4>] ? notify_die+0x2d/0x32
         [<ffffffff804abbdc>] ? default_do_nmi+0x53/0x1d9
         [<ffffffff804abd90>] ? do_nmi+0x2e/0x43
         [<ffffffff804ab552>] ? nmi+0xa2/0xd0
         [<ffffffff80221ef9>] ? native_safe_halt+0x2/0x3
         <<EOE>>  [<ffffffff8021345d>] ? default_idle+0x38/0x54
         [<ffffffff8021359a>] ? c1e_idle+0x118/0x11c
         [<ffffffff8020b3b5>] ? cpu_idle+0xa9/0xf1
    
        Code: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff <55> 50 e8 00 00 00 00 58 48 2d 07 10 40 00 48 8b e8 58 e9 68 02
        RIP  [<ffffc20011090c00>] 0xffffc20011090c00
         RSP <ffff88012f6f9e68>
        CR2: ffffc20011090c00
        Kernel panic - not syncing: Fatal exception
    
    Signed-off-by: Bernhard Walle <bwalle@suse.de>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Cc: Ingo Molnar <mingo@elte.hu>
    Acked-by: "H. Peter Anvin" <hpa@zytor.com>
    Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
    Cc: Alan Cox <alan@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

commit 28d41f53f05c51d4f445129de325b1072ee25b8b
Author: Wim Van Sebroeck <wim@iguana.be>
Date:   Wed Nov 19 22:25:53 2008 +0000

    [WATCHDOG] iTCO_wdt: add PCI ID's for ICH9 & ICH10 chipsets
    
    Add support for the following I/O controller hubs:
    ICH7DH, ICH9M, ICH9M-E, ICH10, ICH10R, ICH10D and ICH10DO.
    
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

commit c6904ddb976d99b77d91b78a0ce5bdfffb416c49
Author: Wim Van Sebroeck <wim@iguana.be>
Date:   Wed Nov 19 20:02:02 2008 +0000

    [WATCHDOG] iTCO_wdt : correct status clearing
    
    The iTCO_wdt code was not clearing the correct bits.
    It now clears the timeout status bit and then the
    SECOND_TO_STS bit and then the BOOT_STS bit.
    Note: we should first clear the SECOND_TO_STS bit
    before clearing the BOOT_STS bit.
    
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

commit 7cd5b08be3c489df11b559fef210b81133764ad4
Author: Wim Van Sebroeck <wim@iguana.be>
Date:   Wed Nov 19 19:39:58 2008 +0000

    [WATCHDOG] iTCO_wdt : problem with rebooting on new ICH9 based motherboards
    
    Bugzilla #9868: On Intel motherboards with the ICH9 based I/O controllers
    (Like DP35DP and DG33FB) the iTCO timer counts but it doesn't reboot the
    system after the counter expires.
    
    This patch fixes this by moving the enabling & disabling of the TCO_EN bit
    in the SMI_EN register into the start and stop code.
    
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

commit 21098c68df7115554fe041170899bdff709efd08
Author: James Smart <James.Smart@Emulex.Com>
Date:   Thu Nov 20 10:58:01 2008 -0500

    [SCSI] fc_transport: fix old bug on bitflag definitions
    
    When the fastfail flag was added, it did not account for the flags
    being bit fields. Correct the definition so there is no longer a
    conflict.
    
    Signed-off-by: James Smart <james.smart@emulex.com>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit f80e919bb42c191bbe60ab078a59b30336d11d3b
Author: Florian Fainelli <florian@openwrt.org>
Date:   Fri Oct 24 19:52:56 2008 +0200

    [WATCHDOG] fix mtx1_wdt compilation failure
    
    Using spin_lock_irqsave with a local variable called flags without
    declaring is a bad idea, fix this by declaring it.
    
    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

commit 6436cbcd735a11fc93bf3353c68914bc545e6d1e
Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Date:   Thu Nov 20 20:43:18 2008 -0800

    phy: fix phy_id detection also for broken hardware.
    
    This patch fixes the case when the phy_ids is mostly Fs and in some case 0x0
    due to broken hardware.
    
    Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 75e07fc3d87ba9b3255e1fcd735186a533ea0754
Author: Andreas Petlund <andreas@petlund.no>
Date:   Thu Nov 20 20:42:25 2008 -0800

    pci: Added quirk to disable msi for MCP55 NIC on Asus P5N32-SLI Premium
    
    Signed-off-by: Andreas Petlund <andreas@petlund.no>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 2a3a59e5c977654d3aad5bc11cc0aca2303a7f44
Author: Mike Christie <michaelc@cs.wisc.edu>
Date:   Tue Nov 11 13:42:35 2008 -0600

    [SCSI] Fix hang in starved list processing
    
    Close possible infinite loop with interrupts off when devices are
    added back to the starved list.
    
    Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=11898
    
    Reported-by: <alex.shi@intel.com>
    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 7e2d9bfa4eabee3e1919a40f20d2ef8b569bd07e
Author: Adrian Hunter <ext-adrian.hunter@nokia.com>
Date:   Wed Nov 5 16:09:04 2008 +0200

    UBIFS: allow for gaps when dirtying the LPT
    
    The LPT may have gaps in it because initially empty LEBs
    are not added by mkfs.ubifs - because it does not know how
    many there are.  Then UBIFS allocates empty LEBs in the
    reverse order that they are discovered i.e. they are
    added to, and removed from, the front of a list.  That
    creates a gap in the middle of the LPT.
    
    The function dirtying the LPT tree (for the purpose of
    small model garbage collection) assumed that a gap could
    only occur at the very end of the LPT and stopped dirtying
    prematurely, which in turn resulted in the LPT running
    out of space - something that is designed to be impossible.
    
    Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>

commit e84461ad9c4f0ff91ab8553596acdb7bf5522df4
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Wed Oct 29 12:08:43 2008 +0200

    UBIFS: fix compilation warnings
    
    We print 'ino_t' type using '%lu' printk() placeholder, but this
    results in many warnings when compiling for Alpha platform. Fix
    this by adding (unsingned long) casts.
    
    Fixes these warnings:
    
    fs/ubifs/journal.c:693: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/journal.c:1131: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/dir.c:163: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/tnc.c:2680: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/tnc.c:2700: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/replay.c:1066: warning: format '%lu' expects type 'long unsigned int', but argument 7 has type 'ino_t'
    fs/ubifs/orphan.c:108: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:135: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:142: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:154: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:159: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:451: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:539: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:612: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:843: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/orphan.c:856: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/recovery.c:1438: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/recovery.c:1443: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/recovery.c:1475: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/recovery.c:1495: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:105: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:105: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:110: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:114: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:114: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:118: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:118: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'ino_t'
    fs/ubifs/debug.c:1591: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1671: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1674: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/debug.c:1680: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1699: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/debug.c:1788: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/debug.c:1821: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/debug.c:1833: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/debug.c:1924: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1932: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1938: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1945: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1953: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1960: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1967: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1973: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1988: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'ino_t'
    fs/ubifs/debug.c:1991: warning: format '%lu' expects type 'long unsigned int', but argument 5 has type 'ino_t'
    fs/ubifs/debug.c:2009: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ino_t'
    
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit e2966cbe8901e3f1c120ef82d29c59db1b3bd882
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Sat Oct 25 18:54:04 2008 +0300

    MAINTAINERS: change UBI/UBIFS git tree URLs
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 0ecb9529a4d47825778e7b0d226eb36019252a9d
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Fri Oct 24 10:52:57 2008 -0700

    UBIFS: endian handling fixes and annotations
    
    Noticed by sparse:
    fs/ubifs/file.c:75:2: warning: restricted __le64 degrades to integer
    fs/ubifs/file.c:629:4: warning: restricted __le64 degrades to integer
    fs/ubifs/dir.c:431:3: warning: restricted __le64 degrades to integer
    
    This should be checked to ensure the ubifs_assert is working as
    intended, I've done the suggested annotation in this patch.
    
    fs/ubifs/sb.c:298:6: warning: incorrect type in assignment (different base types)
    fs/ubifs/sb.c:298:6:    expected int [signed] [assigned] tmp
    fs/ubifs/sb.c:298:6:    got restricted __le64 [usertype] <noident>
    fs/ubifs/sb.c:299:19: warning: incorrect type in assignment (different base types)
    fs/ubifs/sb.c:299:19:    expected restricted __le64 [usertype] atime_sec
    fs/ubifs/sb.c:299:19:    got int [signed] [assigned] tmp
    fs/ubifs/sb.c:300:19: warning: incorrect type in assignment (different base types)
    fs/ubifs/sb.c:300:19:    expected restricted __le64 [usertype] ctime_sec
    fs/ubifs/sb.c:300:19:    got int [signed] [assigned] tmp
    fs/ubifs/sb.c:301:19: warning: incorrect type in assignment (different base types)
    fs/ubifs/sb.c:301:19:    expected restricted __le64 [usertype] mtime_sec
    fs/ubifs/sb.c:301:19:    got int [signed] [assigned] tmp
    
    This looks like a bugfix as your tmp was a u32 so there was truncation in
    the atime, mtime, ctime value, probably not intentional, add a tmp_le64
    and use it here.
    
    fs/ubifs/key.h:348:9: warning: cast to restricted __le32
    fs/ubifs/key.h:348:9: warning: cast to restricted __le32
    fs/ubifs/key.h:419:9: warning: cast to restricted __le32
    
    Read from the annotated union member instead.
    
    fs/ubifs/recovery.c:175:13: warning: incorrect type in assignment (different base types)
    fs/ubifs/recovery.c:175:13:    expected unsigned int [unsigned] [usertype] save_flags
    fs/ubifs/recovery.c:175:13:    got restricted __le32 [usertype] flags
    fs/ubifs/recovery.c:186:13: warning: incorrect type in assignment (different base types)
    fs/ubifs/recovery.c:186:13:    expected restricted __le32 [usertype] flags
    fs/ubifs/recovery.c:186:13:    got unsigned int [unsigned] [usertype] save_flags
    
    Do byteshifting at compile time of the flag value.  Annotate the saved_flags
    as le32.
    
    fs/ubifs/debug.c:368:10: warning: cast to restricted __le32
    fs/ubifs/debug.c:368:10: warning: cast from restricted __le64
    
    Should be checked if the truncation was intentional, I've changed the
    printk to print the full width.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 069782a1ee55105220e5ae2db448495dac267cb1
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Tue Oct 21 12:56:31 2008 +0300

    UBIFS: remove printk
    
    Remove the "UBIFS background thread ubifs_bgd0_0 started" message.
    We kill the background thread when we switch to R/O mode, and
    start it again whan we switch to R/W mode. OLPC is doing this
    many times during boot, and we see this message many times as
    well, which is irritating. So just kill the message.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>