commit 9604006d283fb67dda5ee9e0e15b7cc6c62e1557
Merge: 25c55d9... af5741c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 11:24:51 2008 -0700

    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] qla1280: Fix queue depth problem
      [SCSI] aha152x: Fix oops on module removal
      [SCSI] aha152x: fix init suspiciously returned 1, it should follow 0/-E convention
      [SCSI] libiscsi regression in 2.6.25: fix setting of recv timer
      [SCSI] libiscsi regression in 2.6.25: fix nop timer handling
      [SCSI] gdth: fix Error: Driver 'gdth' is already registered, aborting...
      [SCSI] gdth: fix timer handling

commit 25c55d97209090db1a5f601815433f085bd1af78
Merge: 5dc93cf... c4e5fad...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 10:48:35 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      ACPI/PCI: another multiple _OSC memory leak fix
      x86/PCI: X86_PAT & mprotect
      PCI: enable nv_msi_ht_cap_quirk for ALi bridges
      PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
      ACPI/PCI: handle multiple _OSC
      ACPI/PCI: handle multiple _OSC
      x86/PCI: fix broken ISA DMA
      PCI ACPI: fix uninitialized variable in __pci_osc_support_set

commit af5741c6de4f4a1d8608b0f00867c77cb7123635
Author: Jeremy Higdon <jeremy@sgi.com>
Date:   Sun May 11 23:17:03 2008 -0700

    [SCSI] qla1280: Fix queue depth problem
    
    The qla1280 driver was ANDing the output value of mailbox register
    0 with (1 << target-number) to determine whether to enable queueing
    on the target in question.
    
    But mailbox register 0 has the status code for the mailbox command
    (in this case, Set Target Parameters).  Potential values are:
    /*
     * ISP mailbox command complete status codes
     */
    
    So clearly that is in error.  I can't think what the author of that
    line was looking for in a mailbox register, so I just eliminated the
    AND.  flag is used later in the function, and I think that the later
    usage was also wrong, though it was used to set values that aren't
    used.  Oh well, an overhaul of this driver is not what I want to do
    now -- just a bugfix.
    
    After the fix, I found that my disks were getting a queue depth of
    255, which is far too many.  Most SCSI disks are limited to 32 or
    64.  In any case, there's no point, queueing up a bunch of commands
    to the adapter that will just result in queue full or starve other
    targets from being issued commands due to running out of internal
    memory.  So I dropped default queue depth to 32 (from which 1 is
    subtracted elsewhere, giving net of 31).
    
    I tested with a Seagate ST336753LC, and results look good, so
    I'm satisfied with this patch.
    
    Signed-off-by: Jeremy Higdon <jeremy@sgi.com>
    Acked-by: Jes Sorensen <jes@sgi.com>
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit c4e5fadd2a6fc0da465dcde761877d9a87313b33
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Tue May 13 16:48:50 2008 +0900

    ACPI/PCI: another multiple _OSC memory leak fix
    
    The acpi_query_osc() function can be called for the ACPI object that
    doesn't have _OSC method. In this case, acpi_get_osc_data() would
    allocate a useless memory region. To avoid this, we need to check the
    existence of _OSC before calling acpi_get_osc_data() in acpi_query_osc().
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 77db9885646f8a88214ea482988d41f8f73630f4
Author: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date:   Fri May 9 13:05:19 2008 -0700

    x86/PCI: X86_PAT & mprotect
    
    Some versions of X used the mprotect workaround to change caching type from UC
    to WB, so that it can then use mtrr to program WC for that region [1].  Change
    the mmap of pci space through /sys or /proc interfaces from UC to UC_MINUS.
    With this change, X will not need to use mprotect workaround to get WC type
    since the MTRR mapping type will be honored.
    
    The bug in mprotect that clobbers PAT bits is fixed in a follow on patch. So,
    this X workaround will stop working as well.
    
    Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 439a7733e8fcbaee39979c10246101565834d6b2
Author: Björn Krombholz <fox.box@gmail.com>
Date:   Mon May 12 00:24:27 2008 +0200

    PCI: enable nv_msi_ht_cap_quirk for ALi bridges
    
    This applies the NVidia MSI enabled flag for HT capable devices quirk
    to ALi bridges as well.
    
    As described in more detail in http://bugzilla.kernel.org/show_bug.cgi?id=10667
    this is required for my board which is using an nForce 3 250Gb chipset with an
    ALi M1695 northbridge.
    
    It fixes a regression introduced in 2.6.24 that made the internal NIC of the
    board unusable (MSI initialisation of the NIC but disabled MSI on the
    northbridge devices.
    
    Signed-off-by: Björn Krombholz <fox.box@gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit a7eb08c2a14f28cb652ea6ad1a8e2b8efc55fb9a
Author: mark gross <mgross@linux.intel.com>
Date:   Mon May 12 13:41:57 2008 -0700

    PCI: Make the intel-iommu_wait_op macro work when jiffies are not running
    
    The following patch changes the intel-iommu.c code to use the TSC
    instead of jiffies for detecting bad DMAR functionality.  Some systems
    with bad bios's have been seen to hang in early boot spinning in the
    IOMMU_WAIT_IO macro.  This patch will replace the infinite loop with a call to
    panic.
    
    Signed-off-by: Mark Gross <mgross@linux.intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 34a65055e5e7304b3d6ad0f7542bf66308eae50a
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Mon May 12 22:55:45 2008 +0900

    ACPI/PCI: handle multiple _OSC
    
    The pci_osc_control_set() function can be called for the ACPI object
    that doesn't have _OSC method. In this case, acpi_get_osc_data() would
    allocate a useless memory region. To avoid this, we need to check the
    existence of _OSC before calling acpi_get_osc_data(). Here is a patch
    to fix this problem in pci_osc_control_set.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit a5d1c8798309a384c2776e5ff472f8ceb6d9065d
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Mon May 12 10:48:10 2008 +0800

    ACPI/PCI: handle multiple _OSC
    
    There is an IA64 system here which have two pci root bridges with _OSC.
    One _OSC disables SHPC control bit but the other not. Below patch makes
    _OSC data per-device instead of one global, otherwise linux takes both
    root bridges don't support SHPC.
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 4a367f3a9dbf2e7ffcee4702203479809236ee6e
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri May 9 08:06:55 2008 +0200

    x86/PCI: fix broken ISA DMA
    
    Rene Herman reported:
    
    > commit 8779f2fc3b84ebb6c5181fb13d702e9944c16069
    >
    > "x86: don't try to allocate from DMA zone at first"
    >
    > breaks all of ISA DMA. Or all of ALSA ISA DMA at least. All
    > ISA soundcards are silent following that commit -- no error
    > messages, everything appears fine, just silence.
    
    That patch is buggy. We had an implicit assumption that
    dev = NULL for ISA devices that require 24bit DMA.
    
    The recent work on x86 dma_alloc_coherent() breaks the ISA DMA buffer
    allocation, which is represented by "dev = NULL" and requires 24bit
    DMA implicitly.
    
    Bisected-by: Rene Herman <rene.herman@keyaccess.nl>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 21e2b0a5efb3a01de58e7cb630f2eb70894da352
Author: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date:   Thu May 8 14:37:25 2008 +0900

    PCI ACPI: fix uninitialized variable in __pci_osc_support_set
    
    Fix uninitialized variable in __pci_osc_support_set().
    
    If the ACPI namespace doesn't have any device object corresponding to
    the specified hid, 'retval' in __pci_osc_support_set() is not changed
    by the acpi_query_osc() callback. Since 'retval' is not initizlized in
    the current implementation, the contents of 'retval' is undefined in
    this case. This causes a mis-handling of ctrlset_buf[OSC_SUPPORT_TYPE]
    and will cause an unexpected result in the subsequent
    pci_osc_control_set() call as a result.
    
    Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

commit 5dc93cf4576125f07cfc1b29cab0c9344c5b3d2b
Merge: 43f14d8... 3c17279...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue May 13 09:49:06 2008 -0700

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      [ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
      [ALSA] ASoC: build fix for snd_soc_info_bool_ext
      [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
      [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
      [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event

commit 43f14d856f013a4cc63da2c765617c665274338c
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon May 12 14:02:40 2008 -0700

    eCryptFS: fix imbalanced mutex locking
    
    Fix imbalanced calls for mutex lock/unlock on ecryptfs_daemon_hash_mux
    Revealed by Ingo Molnar: http://lkml.org/lkml/2008/5/7/260
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: Michael Halcrow <mhalcrow@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit d850a2fac11e4dd45d1d3d493a5a071b06c58c99
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon May 12 14:02:39 2008 -0700

    vt/fbcon: fix background color on line feed
    
    Another addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b
    ("vt: fix background color on line feed").
    
    fbcon still was not doing the right thing (read: continued to do old
    behavior).  fbcon_clear() seems to clear the new line (e.g.  where your new
    prompt appears after doing echo -en "\e[42mfoo\n"), while scr_memsetw clears
    the previous one only (where "foo" appears).  So just temporarily set the
    video_erase_char to the scrl_erase_char so that fbcon_clear does the right
    thing.
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7fe3915a492503a9199af475a433b50258303806
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon May 12 14:02:38 2008 -0700

    vt/fbcon: update scrl_erase_char after 256/512-glyph font switch
    
    Addendum to commit c9e587abfdec2c2aaa55fab83bcb4972e2f84f9b ("vt: fix
    background color on line feed").
    
    vc->vc_scrl_erase_char was not updated when fbcon switches between
    256- and 512-glyph fonts.
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Acked-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9fb1f68d40d9dd99fdbf65349c9c6af760e19e6e
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Mon May 12 14:02:38 2008 -0700

    rtc: m41t80: include <linux/kernel.h> for printk()
    
    The driver uses printk(), but does not include <linux/kernel.h> -- add it.
    
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Alexander Bigga <ab@mycable.de>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 417607d05f41dbe2acccdb7a298a81d30ba1d22b
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Mon May 12 14:02:35 2008 -0700

    RTC/watchdog: M41T80: fix a potential use of unitialized data
    
    Watchdog handlers within the driver make use of "save_client" -- make sure it
    has been initalized before the handlers are registered.
    
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: Alexander Bigga <ab@mycable.de>
    Cc: Wim Van Sebroeck <wim@iguana.be>
    Cc: David Brownell <david-b@pacbell.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6c82c4150910dedd449194cb6d286b80478f3542
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Mon May 12 14:02:34 2008 -0700

    drivers/char/synclink_gt.c: don't return an uninitialised local
    
    drivers/char/synclink_gt.c: In function 'put_char':
    drivers/char/synclink_gt.c:919: warning: 'ret' may be used uninitialized in this function
    
    The compiler speaketh truth.
    
    Cc: Paul Fulghum <paulkf@microgate.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f36f21ecca9ee688301174e5f2e0827827a7a7ff
Author: Jean Delvare <khali@linux-fr.org>
Date:   Mon May 12 14:02:33 2008 -0700

    Fix misuses of bdevname()
    
    bdevname() fills the buffer that it is given as a parameter, so calling
    strcpy() or snprintf() on the returned value is redundant (and probably not
    guaranteed to work - I don't think strcpy and snprintf support overlapping
    buffers.)
    
    Signed-off-by: Jean Delvare <khali@linux-fr.org>
    Cc: Stephen Tweedie <sct@redhat.com>
    Cc: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 78bb6cb9a890d3d50ca3b02fce9223d3e734ab9b
Author: Miklos Szeredi <mszeredi@suse.cz>
Date:   Mon May 12 14:02:32 2008 -0700

    fuse: add flag to turn on big writes
    
    Prior to 2.6.26 fuse only supported single page write requests.  In theory all
    fuse filesystem should be able support bigger than 4k writes, as there's
    nothing in the API to prevent it.  Unfortunately there's a known case in
    NTFS-3G where big writes cause filesystem corruption.  There could also be
    other filesystems, where the lack of testing with big write requests would
    result in bugs.
    
    To prevent such problems on a kernel upgrade, disable big writes by default,
    but let filesystems set a flag to turn it on.
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Szabolcs Szakacsits <szaka@ntfs-3g.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0f146a764ff08c4c210c04239c5e6784b4b77485
Author: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Date:   Mon May 12 14:02:31 2008 -0700

    cgroups: fix documentation
    
    Correct the cgroups documentation to reflect the correct file names.
    
    Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
    Cc: Sudhir Kumar <skumar@linux.vnet.ibm.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Paul Menage <menage@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4cd1a8fc3d3cd740416b14ece2693dbb5d065eaf
Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date:   Mon May 12 14:02:31 2008 -0700

    memcg: fix possible panic when CONFIG_MM_OWNER=y
    
    When mm destruction happens, we should pass mm_update_next_owner() the old mm.
     But unfortunately new mm is passed in exec_mmap().
    
    Thus, kernel panic is possible when a multi-threaded process uses exec().
    
    Also, the owner member comment description is wrong.  mm->owner does not
    necessarily point to the thread group leader.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Cc: "Paul Menage" <menage@google.com>
    Cc: "KAMEZAWA Hiroyuki" <kamezawa.hiroyu@jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c9bfcb3151040cff6714542d1da04ccd7e2d3efc
Author: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date:   Mon May 12 14:02:30 2008 -0700

    spi_mpc83xx: much improved driver
    
    The current driver may cause glitches on SPI CLK line since one must disable
    the SPI controller before changing any HW settings.  Fix this by implementing
    a local spi_transfer function that won't change speed and/or word size while
    CS is active.
    
    While doing that heavy lifting a few other issues were addressed too:
     - Make word size 16 and 32 work too.
     - Honor bits_per_word and speed_hz in spi transaction.
     - Optimize the common path.
    
    This also stops using the "bitbang" framework (except for a few constants).
    
    [Roel Kluin <12o3l@tiscali.nl>: "irq" needs to be signed]
    Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f4ed0deae8983591264d0e194e168ef65f4775f5
Author: Paul Jackson <pj@sgi.com>
Date:   Mon May 12 14:02:29 2008 -0700

    cpumask: remove bitmap_scnprintf_len and cpumask_scnprintf_len
    
    They aren't used.  They were briefly used as part of some other patches to
    provide an alternative format for displaying some /proc and /sys cpumasks.
    They probably should have been removed when those other patches were dropped,
    in favor of a different solution.
    
    Signed-off-by: Paul Jackson <pj@sgi.com>
    Cc: "Mike Travis" <travis@sgi.com>
    Cc: "Bert Wesarg" <bert.wesarg@googlemail.com>
    Cc: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 53c78dd1718b99dc365ff8a2244d7d4504b070a5
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Mon May 12 14:02:28 2008 -0700

    fbdev: do not let CONFIG_FB_DEFERRED_IO default to y
    
    CONFIG_FB_DEFERRED_IO can not be turned off, while it's already selected
    automatically by the drivers that need it.
    
    Although it's nice to have more compile-coverage, not being able to disable a
    rarely used feature is annoying.
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Acked-by: Jaya Kumar <jayakumar.lkml@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit baf6332a238a680ef3add9cfb0729f136da886b8
Author: Nicolas Ferre <nicolas.ferre@atmel.com>
Date:   Mon May 12 14:02:25 2008 -0700

    atmel_lcdfb: fix pixclock divider calculation
    
    Fix divider calculation and allow CLKVAL = 0 (divisor 2)
    
    It was not possible to get the clock value 0 (divisor 2) because
    the test "<=0" force the BYPASS bit to be activated instead.
    
    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    Cc: Per Hedblom <per.hedblom@abem.se>
    Cc: Roel Kluin <12o3l@tiscali.nl>
    Cc: Jan Weber <jw022609@uni-greifswald.de>
    Cc: Andrew Victor <linux@maxim.org.za>
    Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 945185a69daa457c4c5e46e47f4afad7dcea734f
Author: Maciej W. Rozycki <macro@linux-mips.org>
Date:   Mon May 12 14:02:24 2008 -0700

    rtc: rtc_time_to_tm: use unsigned arithmetic
    
    The input argument to rtc_time_to_tm() is unsigned as well as are members of
    the output structure.  However signed arithmetic is used within for
    calculations leading to incorrect results for input values outside the signed
    positive range.  If this happens the time of day returned is out of range.
    
    Found the problem when fiddling with the RTC and the driver where year was set
    to an unexpectedly large value like 2070, e.g.:
    
    rtc0: setting system clock to 2070-01-01 1193046:71582832:26 UTC (3155760954)
    
    while it should be:
    
    rtc0: setting system clock to 2070-01-01 00:15:54 UTC (3155760954)
    
    Changing types to unsigned fixes the problem.
    
    [akpm@linux-foundation.org: remove old-fashioned `register' keyword]
    Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
    Cc: Alessandro Zummo <a.zummo@towertech.it>
    Cc: David Brownell <david-b@pacbell.net>
    Cc: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f38c84312748de9d04562c12af57080c6901f931
Author: Greg Ungerer <gerg@snapgear.com>
Date:   Mon May 12 14:02:23 2008 -0700

    m68knommu: missing sections for linker script
    
    Include the missing kcrctab and kcrctab_unused sections into the m68knommu
    linker script.
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e662e1cfd434aa234b72fbc781f1d70211cb785b
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon May 12 14:02:22 2008 -0700

    init: don't lose initcall return values
    
    There is an ability to lose an initcall return value if it happened with irq
    disabled or imbalanced preemption (and if we debug initcall).
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 67d7671036e6cae24ded112e079926d55ffe9580
Author: Jordan Crouse <jordan.crouse@amd.com>
Date:   Mon May 12 14:02:22 2008 -0700

    Update Geode mailing list in MAINTAINERS
    
    Update the Geode list location in the MAINTAINERS file.
    
    Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 706322496b3a58af3cf258db2b553d6933656eef
Author: Eric Sesterhenn <snakebyte@gmx.de>
Date:   Mon May 12 14:02:21 2008 -0700

    Fix hfsplus oops on image without extents
    
    Fix an oops with a corrupted hfs+ image.
    
    See http://bugzilla.kernel.org/show_bug.cgi?id=10548 for details.
    
    Problem is that we call hfs_btree_open() from hfsplus_fill_super() to set
    HFSPLUS_SB(sb).[ext_tree|cat_tree] Both trees are still NULL at this moment.
    If hfs_btree_open() fails for any reason it calls iput() on the page, which
    gets to hfsplus_releasepage() which tries to access HFSPLUS_SB(sb).* which is
    still NULL and oopses while dereferencing it.
    
    [akpm@linux-foundation.org: build fix]
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Cc: Roman Zippel <zippel@linux-m68k.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 4413a0f637df4e59b934909ac388a21cfdd90e69
Author: Mel Gorman <mel@csn.ul.ie>
Date:   Mon May 12 14:02:19 2008 -0700

    parisc: fix DISCONTIGMEM compile breakage
    
    PA-RISC to aid debugging prints out the zonelists setup by the system.  A
    bad call to node_zonelist() breaks at compile-time.  This patch fixes it.
    
    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Cc: Christoph Lameter <clameter@sgi.com>
    Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Grant Grundler <grundler@parisc-linux.org>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Cc: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f2a5f24a279a21229e8c42198e21e2c8ce289129
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date:   Mon May 12 14:02:18 2008 -0700

    PNP: set IRQ index in sysfs "set irq" interface
    
    We have to set the ISAPNP register index when setting an IRQ via the sysfs
    interface.  We already do it for IO, MEM, and DMA resources; I just missed the
    IRQ one.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Cc: Len Brown <lenb@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 460817b9d45be7b2a50e1e24eb91b4aa0c435a09
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Mon May 12 14:02:17 2008 -0700

    mn10300: replace deprecated "TOPDIR" with newer "srctree"
    
    This would appear to be the last reference to TOPDIR in the entire tree, after
    which i'm guessing that variable can be dropped.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Acked-by: David Howells <dhowells@redhat.com>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7a6278e5e4bce72ace681ae3cf48209fb63a5420
Author: Julia Lawall <julia@diku.dk>
Date:   Mon May 12 14:02:16 2008 -0700

    drivers/video/pnx4008: eliminate double free
    
    The function framebuffer_release just calls kfree, so calling kfree
    subsequently on the same argument represents a double free.  The comments with
    the definition of framebuffer_release in drivers/video/fbsysfs.c suggest that
    a more elaborate definition of this function is planned, such that the
    splitting up of framebuffer_release and kfree as done in the second instance
    might someday make sense, but it does not make sense now.
    
    This was found using the following semantic match.
    (http://www.emn.fr/x-info/coccinelle/)
    
    // <smpl>
    @@
    expression E;
    @@
    
    * kfree(E);
    ...
    * framebuffer_release(E);
    
    @@
    expression E;
    @@
    
    * framebuffer_release(E);
    ...
    * kfree(E);
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Cc: Vitaly Wool <vitalywool@gmail.com>
    Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: Grigory Tolstolytkin <gtolstolytkin@ru.mvista.com>
    Cc: Antonino Daplas <adaplas@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5aecd559871d23a3cc297e544c9d63f0b8441cf4
Author: Denis Cheng <crquan@gmail.com>
Date:   Mon May 12 14:02:14 2008 -0700

    mm/pdflush.c: merge the same code in two path
    
    Signed-off-by: Denis Cheng <crquan@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 241937b863c8a3ef10511712f53285f41ab05308
Author: Darrick J. Wong <djwong@us.ibm.com>
Date:   Mon May 12 14:02:13 2008 -0700

    adt7473: minor documentation update
    
    Add a sentence about when fan speed increases to maximum.
    
    Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
    Acked-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 289f8e27ed435dcbefad132def06f4e84351e94f
Author: Serge E. Hallyn <serue@us.ibm.com>
Date:   Mon May 12 14:02:13 2008 -0700

    capabilities: add bounding set to /proc/self/status
    
    There is currently no way to query the bounding set of another task.  As there
    appears to be no security reason not to, and as Michael Kerrisk points out the
    following valid reasons to do so exist:
    
    * consistency (I can see all of the other per-thread/process sets in
      /proc/.../status)
    
    * debugging -- I could imagine that it would make the job of debugging an
      application that uses capabilities a little simpler.
    
    this patch adds the bounding set to /proc/self/status right after the
    effective set.
    
    Signed-off-by: Serge E. Hallyn <serue@us.ibm.com>
    Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
    Acked-by: Andrew G. Morgan <morgan@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c8894419acf5e56851de9741c5047bebd78acd1f
Author: Dan Williams <dan.j.williams@intel.com>
Date:   Mon May 12 14:02:12 2008 -0700

    md: fix raid5 'repair' operations
    
    commit bd2ab67030e9116f1e4aae1289220255412b37fd "md: close a livelock window
    in handle_parity_checks5" introduced a bug in handling 'repair' operations.
    After a repair operation completes we clear the state bits tracking this
    operation.  However, they are cleared too early and this results in the code
    deciding to re-run the parity check operation.  Since we have done the repair
    in memory the second check does not find a mismatch and thus does not do a
    writeback.
    
    Test results:
    $ echo repair > /sys/block/md0/md/sync_action
    $ cat /sys/block/md0/md/mismatch_cnt
    51072
    $ echo repair > /sys/block/md0/md/sync_action
    $ cat /sys/block/md0/md/mismatch_cnt
    0
    
    (also fix incorrect indentation)
    
    Cc: <stable@kernel.org>
    Tested-by: George Spelvin <linux@horizon.com>
    Acked-by: NeilBrown <neilb@suse.de>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3f275ea3086054205795972b8e87f2046fd3de98
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Mon May 12 14:02:11 2008 -0700

    tridentfb: improve clock setting accuracy
    
    Improve clock calculation precision (to kHz from MHz) and removes parameter
    field vclk from the tridentfb_par structure.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6fb488239cd8750cc818197d6c346409c0e8d330
Author: Krzysztof Helt <krzysztof.h1@wp.pl>
Date:   Mon May 12 14:02:09 2008 -0700

    tridentfb: remove misplaced enable_mmio()
    
    Remove redundant enable_mmio() call as the mmio mode is enabled in the probe
    function earlier.
    
    Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
    Cc: "Antonino A. Daplas" <adaplas@pol.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 55654be9e11461484141d8dff0715efa0d7a945a
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Mon May 12 14:02:08 2008 -0700

    mmc: make one-bit signed bitfields unsigned
    
    Otherwise it can only take the values 0/-1 which doesn't seem to
    have been intended.
    
    drivers/mmc/host/sdhci.h:190:20: error: dubious one-bit signed bitfield
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Acked-by: Pierre Ossman <drzeus-list@drzeus.cx>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9377abd026bf9bde7db90dac09170034bf6d1cbf
Author: Jan Kara <jack@suse.cz>
Date:   Mon May 12 14:02:08 2008 -0700

    quota: don't call sync_fs() from vfs_quota_off() when there's no quota turn off
    
    Sometimes, vfs_quota_off() is called on a partially set up super block (for
    example when fill_super() fails for some reason).  In such cases we cannot
    call ->sync_fs() because it can Oops because of not properly filled in super
    block.  So in case we find there's not quota to turn off, we just skip
    everything and return which fixes the above problem.
    
    [akpm@linux-foundation.org: fxi tpyo]
    Signed-off-by: Jan Kara <jack@suse.cz>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit bb45d64224e5cafe8c8e0d18a20da998e5a7dc93
Author: Christoph Hellwig <hch@lst.de>
Date:   Mon May 12 14:02:06 2008 -0700

    ufs: remove unneeded ufs_put_inode prototype
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Acked-by: Evgeniy Dushistov <dushistov@mail.ru>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b5be11329f8cb2cc1a4c3b33b6b8d096c6012895
Author: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date:   Mon May 12 14:02:06 2008 -0700

    make vmstat cpu-unplug safe
    
    When accessing cpu_online_map, we should prevent dynamic changing
    of cpu_online_map by get_online_cpus().
    
    Unfortunately, all_vm_events() doesn't do that.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Christoph Lameter <clameter@sgi.com>
    Cc: Gautham R Shenoy <ego@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 78f508ab07954d12896097ac07ab2fab443c7ca2
Author: Sebastian Siewior <bigeasy@linutronix.de>
Date:   Mon May 12 14:02:05 2008 -0700

    m68knommu: ColdFire add support for kernel preemption (missing chunk)
    
    As the subject says this patch adds the support for kernel preemption on
    m68knommu Coldfire.  I thing the same changes could be applied to 68360 &
    68328 but since I don't have the HW, I don't touch it.  Kconfig enables the
    preemption item only on coldfire.
    
    This is a missing chunk from Sebastian's original patch that I lost from the
    first submission.
    
    Signed-off-by: Sebastian Siewior <bigeasy@linutronix.de>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 8dc4e37362a5dc910d704d52ac6542bfd49ddc2f
Author: Miklos Szeredi <mszeredi@suse.cz>
Date:   Mon May 12 14:02:04 2008 -0700

    ecryptfs: clean up (un)lock_parent
    
    dget(dentry->d_parent) --> dget_parent(dentry)
    
    unlock_parent() is racy and unnecessary.  Replace single caller with
    unlock_dir().
    
    There are several other suspect uses of ->d_parent in ecryptfs...
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Michael Halcrow <mhalcrow@us.ibm.com>
    Cc: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 64d032ba434ad41586460811148f01511e5612f9
Author: Dean Nelson <dcn@sgi.com>
Date:   Mon May 12 14:02:03 2008 -0700

    drivers/misc/sgi-xp: replace partid_t with a short
    
    In preparation for supporting greater than 64 partitions replace partid_t by
    short in drivers/misc/sgi-xp.
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Acked-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 65c17b801e03e40acdca0cd34e8eb1b8a347b539
Author: Dean Nelson <dcn@sgi.com>
Date:   Mon May 12 14:02:02 2008 -0700

    drivers/misc/sgi-xp: clean up return values
    
    Make XP return values more generic to XP and not so tied to XPC by changing
    enum xpc_retval to xp_retval, along with changing return value prefixes from
    xpc to xp.  Also, cleanup a comment block that referenced some of these return
    values as well as the handling of BTE related return values.
    
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Acked-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0cf942d75a6acfa11a41f63330d8780901eda4af
Author: Eric BENARD <ebenard@free.fr>
Date:   Mon May 12 14:02:01 2008 -0700

    spi: pxa2xx_spi clock resume bugfix
    
    There is a typo in pxa2xx_spi.c, comment says "Enable the SSP clock", code
    says: clk_disable ...  so after resume, the SSP is dead.
    
    Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: Ned Forrester <nforrester@whoi.edu>
    Cc: Stephen Street <stephen@streetfiresound.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit fe2cc53ee013a4d4d0317d418e7019fe6533a5a8
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:02:00 2008 -0700

    uml: track and make up lost ticks
    
    Alarm delivery could be noticably late in the !CONFIG_NOHZ case because lost
    ticks weren't being taken into account.  This is now treated more carefully,
    with the time between ticks being calculated and the appropriate number of
    ticks delivered to the timekeeping system.
    
    Cc: Nix <nix@esperi.org.uk>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3d88958e01e71bb14a367db75f12f7a59c068f02
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:59 2008 -0700

    uml: style fixes in the random driver
    
    Give random.c a style workover while I'm changing it.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5d33e4d7fd9a52d2673e5c730eab81856e100a74
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:58 2008 -0700

    uml: random driver fixes
    
    The random driver would essentially hang if the host's /dev/random returned
    -EAGAIN.  There was a test of need_resched followed by a schedule inside the
    loop, but that didn't help and it's the wrong way to work anyway.
    
    The right way is to ask for an interrupt when there is input available from
    the host and handle it then rather than polling.
    
    Now, when the host's /dev/random returns -EAGAIN, the driver asks for a wakeup
    when there's randomness available again and sleeps.  The interrupt routine
    just wakes up whatever processes are sleeping on host_read_wait.
    
    There is an atomic_t, host_sleep_count, which counts the number of processes
    waiting for randomness.  When this reaches zero, the interrupt is disabled.
    
    An added complication is that async I/O notification was only recently added
    to /dev/random (by me), so essentially all hosts will lack it.  So, we use the
    sigio workaround here, which is to have a separate thread poll on the
    descriptor and send an interrupt when there is input on it.  This mechanism is
    activated when a process gets -EAGAIN (activating this multiple times is
    harmless, if a bit wasteful) and deactivated by the last process still
    waiting.
    
    The module name was changed from "random" to "hw_random" in order for udev to
    recognize it.
    
    The sigio workaround needed some changes.  sigio_broken was added for cases
    when we know that async notification doesn't work.  This is now called from
    maybe_sigio_broken, which deals with pts devices.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 60a2988aea701a6424809a5432bf068667aac177
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:57 2008 -0700

    uml: physical memory shouldn't include initial stack
    
    The top of physical memory should be below the initial process stack, not the
    top of the address space, at least for as long as the stack isn't known to the
    kernel VM system and appropriately reserved.
    
    Cc: "Christopher S. Aker" <caker@theshore.net>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a7dfa9403bf3b03899d5ef5d10b0c5c3f74b0682
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Mon May 12 14:01:56 2008 -0700

    uml: use PAGE_SIZE in linker scripts
    
    This patch includes page.h header into linker scripts that allow us to
    use PAGE_SIZE macro instead of numeric constant.
    
    To be able to include page.h into linker scripts page.h is needed for
    some modification - i.e.  we need to use __ASSEMBLY__ and _AC macro
    
    [jdike@linux.intel.com - fixed conflict with as-layout.h]
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6d0742426c9adc7465ef5c62a99a1d3e9696ea19
Author: Jiri Olsa <olsajiri@gmail.com>
Date:   Mon May 12 14:01:56 2008 -0700

    uml: use DIV_ROUND_UP
    
    I just saw similar patches in the janitor kernel's list, and spotted place it
    fits.
    
    Signed-off-by: Jiri Olsa <olsajiri@gmail.com>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 63b9871f6ee2607f3b44e0044e145574b3f08619
Author: Robert P. J. Day <rpjday@crashcourse.ca>
Date:   Mon May 12 14:01:55 2008 -0700

    uml: fix CONFIG_RAW dependencies
    
    Add the BLOCK dependency for RAW_DRIVER, to match what's in
    drivers/char/Kconfig.  Also, while we're there, update the alleged
    obsolesence of RAW_DRIVER since it doesn't seem to be going away any
    time soon.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5563d722bfc73f27423fcb76240bfc1fb4284635
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:54 2008 -0700

    uml: use __SPIN_LOCK_UNLOCKED
    
    From: Robert P. J. Day <rpjday@crashcourse.ca>
    
    Use newer, non-deprecated __SPIN_LOCK_UNLOCKED macro.
    
    Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit cfd28f6695d0fc047478480791a21bdd4967f98e
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:53 2008 -0700

    uml: fix bad NTP interaction with clock
    
    UML's supposed nanosecond clock interacts badly with NTP when NTP
    decides that the clock has drifted ahead and needs to be slowed down.
    Slowing down the clock is done by decrementing the cycle-to-nanosecond
    multiplier, which is 1.  Decrementing that gives you 0 and time is
    stopped.
    
    This is fixed by switching to a microsecond clock, with a multiplier
    of 1000.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 309e96cdf2f2c1a071102e8bdf828a3493e6e50a
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:52 2008 -0700

    uml: remove unused header
    
    From: Adrian Bunk <bunk@kernel.org>
    
    This patch removes the unused and broken (the normal asm/keyboard.h
    files no longer exists) include/asm-um/keyboard.h
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 43f5b3085fdd27c4edf535d938b2cb0ccead4f75
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:52 2008 -0700

    uml: fix build when SLOB is enabled
    
    Reintroduce uml_kmalloc for the benefit of UML libc code.  The
    previous tactic of declaring __kmalloc so it could be called directly
    from the libc side of the house turned out to be getting too intimate
    with slab, and it doesn't work with slob.
    
    So, the uml_kmalloc wrapper is back.  It calls kmalloc or whatever
    that translates into, and libc code calls it.
    
    kfree is left alone since that still works, leaving a somewhat
    inconsistent API.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 484f1e2c1ea58c6a4352313f7ee4edd4b52deecd
Author: Johann Felix Soden <johfel@users.sourceforge.net>
Date:   Mon May 12 14:01:51 2008 -0700

    uml: fix errno return
    
    Error returns are negative.
    
    Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 47906dd9e63ba1a8cb188e9e786c5928674fbbd3
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:50 2008 -0700

    uml: tidy ptrace interface
    
    Tidy the ptrace interface code.  Removed a bunch of unused macros.
    Started converting register sets from arrays of longs to structures.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 46d7b522ebf486edbd096965d534cc6465e9e309
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:50 2008 -0700

    uml: move hppfs_kern.c to hppfs.c
    
    There's no reason for the _kern in hppfs_kern.c, so move it to hppfs.c.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit a0612b1f0b3d851458dafe5886e33d58c1967440
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:49 2008 -0700

    uml: hppfs fixes
    
    hppfs tidying and fixes noticed during hch's get_inode work -
          style fixes
          a copy_to_user got its return value checked
          hppfs_write no longer fiddles file->f_pos because it gets and
    returns pos in its arguments
          hppfs_delete_inode dputs the underlyng procfs dentry stored in
    its private data and mntputs the vfsmnt stashed in s_fs_info
          hppfs_put_super no longer needs to mntput the s_fs_info, so it
    no longer needs to exist
          hppfs_readlink and hppfs_follow_link were doing a bunch of stuff
    with a struct file which they didn't use
          there is now a ->permission which calls generic_permission
          get_inode was always returning 0 for some reason - it now
    returns an inode if nothing bad happened
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 96cee3044dca2e6510ca7cc276d1eac34a1cfd51
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:48 2008 -0700

    uml: style fixes
    
    A few random style fixes.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 53c258787427ea43ebfa76fefa6534cae507e521
Author: Jeff Dike <jdike@addtoit.com>
Date:   Mon May 12 14:01:47 2008 -0700

    uml: redo host capability detection and disabling
    
    Redo how host capabilities are recorded at startup and disabled on the
    command line.
    
    There are now explicit variables saying what's been disabled by the
    command line rather than the implicitness of the have_* variable being
    zero.  The capability variables now start at zero and are set to one
    as their capabilities are found to be present on the host.
    
    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Cc: WANG Cong <xiyou.wangcong@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3c17279137bf8318438510b48229d4236f773da4
Author: Jarkko Nikula <jarkko.nikula@nokia.com>
Date:   Tue May 13 16:02:04 2008 +0200

    [ALSA] ASoC: Fix wrong enum count for jack_function in N810 machine driver
    
    Fix this typo and avoid similar errors by using ARRAY_SIZE macro.
    
    Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 392abe9cb36f04ccdda9c96938077b0d43f2b50b
Author: Philipp Zabel <philipp.zabel@gmail.com>
Date:   Tue May 13 14:03:40 2008 +0200

    [ALSA] ASoC: build fix for snd_soc_info_bool_ext
    
    I suspect that snd_ctl_boolean_mono should have been
    snd_ctl_boolean_mono_info instead. This fixes the build for magician.
    
    Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 5b006137f47622dbd4a5aa2ba4010202cbc31667
Author: Jarkko Nikula <jarkko.nikula@nokia.com>
Date:   Fri May 9 15:05:41 2008 +0200

    [ALSA] ASoC: Fix TLV320AIC3X mono line output interconnect
    
    There is no endpoint called MONOLOUT but MONO_LOUT.
    
    Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 3a3bd960a0b7bb26604b1270a8b4cafdc5883040
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Fri May 9 13:43:55 2008 +0200

    [ALSA] soc - fsl_ssi.c fix "BUG: scheduling while atomic"
    
    This patch fixes following bug caught with PREEMPT enabled:
    
    root@b1:~# cat /dev/dsp > /dev/null
    BUG: scheduling while atomic: cat/965/0x00000003
    Call Trace:
    [df165ce0] [c0008e84] show_stack+0x4c/0x1ac (unreliable)
    [df165d20] [c001c18c] __schedule_bug+0x64/0x78
    [df165d30] [c02b3344] schedule+0x2d8/0x334
    [df165d70] [c02b3674] schedule_timeout+0x64/0xe4
    [df165db0] [c002c05c] msleep+0x1c/0x34
    [df165dc0] [c01f2fe0] fsl_ssi_trigger+0x130/0x144
    [df165dd0] [c01ece54] soc_pcm_trigger+0x94/0xb8
    [df165df0] [c01da764] snd_pcm_do_start+0x48/0x60
    [df165e00] [c01da630] snd_pcm_action_single+0x4c/0xb4
    [df165e20] [c01e0f50] snd_pcm_lib_read1+0x2a0/0x2d4
    [df165e70] [c01ec274] snd_pcm_oss_read3+0xf0/0x13c
    [df165eb0] [c01ec2e4] snd_pcm_oss_read2+0x24/0x4c
    [df165ec0] [c01ec4ac] snd_pcm_oss_read+0x1a0/0x1f0
    [df165ef0] [c0076478] vfs_read+0xb4/0x108
    [df165f10] [c00768cc] sys_read+0x4c/0x90
    [df165f40] [c00117a4] ret_from_syscall+0x0/0x38
    
    Acked-by: Timur Tabi <timur@freescale.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit bf91141d3565b35fb2a44364bfb874a3be3c12b6
Author: maximilian attems <max@stro.at>
Date:   Fri May 9 13:43:09 2008 +0200

    [ALSA] emux midi synthesizer doesn't honor SOFT_PEDAL-release event
    
    When the hardware wavetable synthesizer of an Creative SB Audigy or SB
    Live! card (with emu10k chip) receives the MIDI SOFT_PEADAL-press event
    (?? 67 127) the appropriate voice is attenuted. Unfortunately when the
    pedal is released (event ?? 67 0) the voice does not get it's original
    volume again.
    
    Boolean MIDI controls should interpret 0..63 as false and 64..127 as true.
    Thanks to Clemens Ladisch for review and correction.
    
    Original patch from "Uwe Kraeger" <uwe_debbug@arcor.de>
    Submitted to http://bugs.debian.org/474312
    
    Signed-off-by: maximilian attems <max@stro.at>
    Cc: uwe_debbug@arcor.de
    Cc: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit c714a534d85576af21b06be605ca55cb2fb887ee
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 13:34:13 2008 -0700

    Make 'cond_resched()' nullification depend on PREEMPT_BKL
    
    Because it's not correct with a non-preemptable BKL and just causes
    PREEMPT kernels to have longer latencies than non-PREEMPT ones (which is
    obviously not the point of it at all).
    
    Of course, that config option actually got removed as an option earlier,
    so for now this basically disables it entirely, but if BKL preemption is
    ever resurrected it will be a meaningful optimization.  And in the
    meantime, it at least documents the intent of the code, while not doing
    the wrong thing.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 542dafadd81eb5826280f7714592930144ae3e1f
Merge: 9404ef0... e691b9d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 13:29:15 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      [CIFS] don't allow demultiplex thread to exit until kthread_stop is called
      [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir
      [CIFS]  add local struct inode pointer to cifs_setattr
      [CIFS] cifs_find_tcp_session cleanup

commit 9404ef02974a5411687b6c1b8ef3984305620e02
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 10:14:22 2008 -0700

    Fix up 'need_resched()' definition
    
    We should not go through the task pointer to get at the thread info,
    since it's usually cheaper to just access the thread info directly.
    
    So don't make the code look up 'current', when we can just use the
    thread info accessor functions directly.  This generally avoids one
    level of indirection and tends to work better together with code that
    also looks at other thread flags (eg preempt_count).
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 2b753a1599a28612851a2908abdbf86802c989c5
Merge: 8d97b84... 2ccdcfe...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 09:07:56 2008 -0700

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
      types: s390: fix #ifdef reversal in <asm-s390/types.h>

commit 8d97b84935b28ed8944d1be31859a3df7ebe93ae
Merge: 9f1a073... cb0e8b0...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 09:03:42 2008 -0700

    Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (28 commits)
      [MIPS] Pb1000: bury the remnants of the PCI code
      [MIPS] Fix build failure in mips oprofile code
      [MIPS] fix warning message on SMP kernels
      [MIPS] markeins: build fix
      [MIPS] ELF handling - use SELFMAG instead of numeric constant
      [MIPS] Get rid of __ilog2
      [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
      [MIPS] XXS1500 code style cleanup
      [MIPS] MTX-1 code style cleanup
      [MIPS] Pb1200/DBAu1200 code style cleanup
      [MIPS] Pb1550 code style cleanup
      [MIPS] Pb1500 code style cleanup
      [MIPS] Pb1100 code style cleanup
      [MIPS] Pb1000 code style cleanup
      [MIPS] DBAu1xx0 code style cleanup
      [MIPS] Alchemy PCI code style cleanup
      [MIPS] Alchemy common code style cleanup
      [MIPS] Alchemy common headers style cleanup
      [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
      [MIPS] msp_hwbutton.c: minor irq handler cleanups
      ...

commit 2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029
Author: H. Peter Anvin <hpa@zytor.com>
Date:   Fri May 9 09:46:38 2008 -0700

    types: s390: fix #ifdef reversal in <asm-s390/types.h>
    
    The #ifdef for the integer types was reversed; the standard pattern in
    these files are:
    
    #ifndef __s390x__
    /* 32-bit code */
    #else
    /* 64-bit code */
    #endif
    
    Stick with the original pattern, but make sure the 32-bit code
    actually comes first!
    
    Reported by Al Viro.
    
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: Al Viro <viro@zeniv.linux.org.uk>

commit cb0e8b0fba53e1aa6c4786bc465cfc641e8a77e7
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Tue Apr 29 23:33:47 2008 +0400

    [MIPS] Pb1000: bury the remnants of the PCI code
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 005ca9a3f1238ffebd9c4d09d581f708277d2985
Author: Thiemo Seufer <ths@networkno.de>
Date:   Tue May 6 11:23:33 2008 +0100

    [MIPS] Fix build failure in mips oprofile code
    
    This patch fixes a warning-as-error induced build failure of 64bit MIPS
    kernels.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 83738e307365aa2de4a1be65ed574aaebce52ea0
Author: Thiemo Seufer <ths@networkno.de>
Date:   Tue May 6 11:21:22 2008 +0100

    [MIPS] fix warning message on SMP kernels
    
    This patch fixes a (harmless) warning message.
    
    Signed-off-by: Thiemo Seufer <ths@networkno.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b01273f120a390363ceb27bd0ccc60ddf1fb936d
Author: Adrian Bunk <bunk@kernel.org>
Date:   Sun May 4 19:58:54 2008 +0300

    [MIPS] markeins: build fix
    
    This patch fixes the following build errror caused by
    commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168
    (ntp: handle leap second via timer):
    
    <--  snip  -->
    
    ...
      CC      arch/mips/emma2rh/markeins/setup.o
    /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/mips/emma2rh/markeins/setup.c:79: error: conflicting types for 'clock'
    /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/clocksource.h:96: error: previous declaration of 'clock' was here
    make[2]: *** [arch/mips/emma2rh/markeins/setup.o] Error 1
    
    <--  snip  -->
    
    [Ralf: reformated to 80 colums after the fix and marked emma2rh_clock as
    __initdata]
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d303f4a1a09b18e9689aa896bbc23879130b1da8
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Sun May 4 17:50:02 2008 +0100

    [MIPS] ELF handling - use SELFMAG instead of numeric constant
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ddc0d009947bf8645fa3543f4532063a787202da
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Sun May 4 14:53:53 2008 +0100

    [MIPS] Get rid of __ilog2
    
    56a6b1eb7bfb5ace0b5cb9c149f502fbd101b8ab was a bit too conservative and
    left __ilog2 around which is only used as an internal function for other
    bitops.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit fcd84f2fca49166dab2dba259eca6e633585763f
Author: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date:   Sun May 4 00:25:02 2008 +0200

    [MIPS] Fix __fls for non-MIPS32/MIPS64 cpus
    
    Only MIPS32 and MIPS64 CPUs implement clz/dclz. Therefore don't export
    __ilog2() for non MIPS32/MIPS64 cpus and use generic __fls bitop code for
    these cpus.
    
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7ff83f21d23d17b63bbb984fee5d12aa5a8066b3
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:31:03 2008 +0400

    [MIPS] XXS1500 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - remove needless parentheses;
    
    - remove unneeded numeric literal type cast;
    
    - insert spaces between operator and its operands;
    
    - remove excess new lines;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the structure initializer;
    
    - fix typos, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1ff1a78cbb6fb6ceafac1b2cbdd72c939a7c9bae
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:30:12 2008 +0400

    [MIPS] MTX-1 code style cleanup
    
    Fix many errors and warnings given by checkpatch.pl:
    
    - space after opening and before closing parentheses;
    
    - use of C99 // comments;
    
    - leading spaces instead of tabs;
    
    - brace not on the same line with 'else' in the 'if' statement;
      statement;
    
    - printk() without KERN_* facility level;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    - including <asm/gpio.h> instead of <linux/gpio.h>.
    
    In addition to these changes, also do the following:
    
    - insert spaces between operator and its operands;
    
    - replace tab between the function type and name with space in
      mtx1_pci_idsel() declaration;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array/structure
      initializers;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c3d1d5c8c10c937c65186f6dac75e2fb4675ef07
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:29:04 2008 +0400

    [MIPS] Pb1200/DBAu1200 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - initialization of a 'static' variable to 0;
    
    - space after opening and before closing parentheses;
    
    - missing space between 'for' and opening parenthesis;
    
    - macros with complex values not enclosed in parentheses;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - mention DBAu1200 board in the Makefile;
    
    - replace the group of #include/#ifdef directives by a single
      #include <au1xxx.h> since this header contains the needed stuff;
    
    - properly indent the blocks;
    
    - insert spaces between operator and its operands, remove excess spaces
      there;
    
    - remove needless parentheses and add some for clarity;
    
    - replace numeric literals/expressions with the matching macros;
    
    - remove space after the type cast's closing parenthesis;
    
    - reduce pb1200_setup_cascade() to the single 'return' statement;
    
    - reduce the number of printed empty lines in the so-called CPLD
      workaround;
    
    - remove #undef AU1X00_EXTERNAL_INT since that macro is not defined
      anywhere;
    
    - replace spaces after the macro name with tabs in the #define directives;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typo in the BCSR_RESETS_PWMR1mUX macro's name;
    
    - group all Pb1200 PCMCIA definitions together;
    
    - put the function's result type and name/parameters on the same line;
    
    - insert missing and remove excess new lines;
    
    - make the multi-line comment style consistent with the kernel style
      elsewhere by adding empty first line and/or adding space/asterisk on
      their left side;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - combine some comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 6afabe6c9335c0534224b53c3db4b091621af2dd
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:28:17 2008 +0400

    [MIPS] Pb1550 code style cleanup
    
    Fix a few errors and warnings given by checkpatch.pl:
    
    - macros with complex values not enclosed in parentheses;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - replace numeric literals with the matching macros;
    
    - properly indent the code and the array initializers;
    
    - insert spaces between operator and its operands, also remove excess spaces
      there;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives, also
      sometimes insert space there for better looks;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 2091a17ff7f32432976d1eacbb79a06819d95301
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:27:20 2008 +0400

    [MIPS] Pb1500 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - replace numeric literals/expressions with the matching macros;
    
    - insert spaces between operator and its operands;
    
    - properly indent the code and the array initializers;
    
    - remove useless #if dirctive from board_setup();
    
    - remove needless parentheses;
    
    - remove unneeded type casts;
    
    - remove excess new lines;
    
    - make hexadecimal literals all lower case;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives,
      also sometimes insert space there for better looks;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit be1c3c1ed13f31ae8f9d5d043d96d2e56b5ee1d5
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:26:28 2008 +0400

    [MIPS] Pb1100 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - space between asterisk and variable name;
    
    - use of C99 // comments;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - properly indent the code;
    
    - remove space after the type cast's closing parenthesis;
    
    - replace numeric literals/expressions with the matching macros;
    
    - replace spaces after the macro name with tabs in the #define directives,
      and sometimes insert spaces there;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style
      elsewhere by adding empty first line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 7916c3548e53bffb0545a1d0dc7fde86d79add92
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:25:55 2008 +0400

    [MIPS] Pb1000 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - brace not on the same line with condition in the 'switch' statement;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - using simple_strtol() where strict_strtol() could be used.
    
    In addition to these changes, also do the following:
    
    - properly indent the 'switch' statement;
    
    - remove needless parentheses;
    
    - insert spaces between operator and its operands;
    
    - replace numeric literals/expressions with the matching macros;
    
    - remove useless #if dirctive from board_setup();
    
    - remove unneeded numeric literal type casts;
    
    - remove space after the type cast's closing parenthesis;
    
    - replace spaces after the macro name with tabs in the #define directives, and
      sometimes insert spaces there;
    
    - remove excess new lines;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first/last line;
    
    - combine some comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit abd14cc00d940b8b5b4fc92be23f656b57c6ecfe
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:25:04 2008 +0400

    [MIPS] DBAu1xx0 code style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - macros with complex values not enclosed in parentheses;
    
    - leading spaces instead of tabs;
    
    - printk() without KERN_* facility level;
    
    - using simple_strtol() where strict_strtol() could be used;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - initialize variable instead of assigning value later where it makes sense;
    
    - insert spaces between operator and its operands, also remove excess spaces
      there;
    
    - remove unneeded numeric literal type casts;
    
    - remove needless parentheses;
    
    - remove space after the type cast's closing parenthesis;
    
    - insert missing space before closing brace in the array initializers;
    
    - replace spaces after the macro name with tabs in the #define directives;
    
    - remove excess tabs after the macro name in the #define directives;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first/last line;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a9633279cf13de15b7002b71a507baf89d0619ca
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:23:27 2008 +0400

    [MIPS] Alchemy PCI code style cleanup
    
    Fix 15 errors and 4 warnings given by checkpatch.pl:
    
    - space between the asterisk and variable name;
    
    - space after opening and before closing parentheses;
    
    - leading spaces instead of tabs;
    
    - printk() without KERN_* facility level;
    
    - unnecessary braces for single-statement block;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - combine the nested 'if' statements into one when possible;
    
    - remove needless parentheses;
    
    - add missing and remove excess spaces between operator and its operands;
    
    - fix printk() format specifiers mismatching the argument types;
    
    - put the function's result type and name/parameters on the same line;
    
    - insert missing and remove excess new lines;
    
    - properly indent multi-line expressions;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line;
    
    - fix typos, capitalize acronyms, etc. in the comments;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's old email address...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit c1dcb14ec2ae3c594ce1c2db953004083f2bd4a0
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:18:41 2008 +0400

    [MIPS] Alchemy common code style cleanup
    
    Fix many errors and warnings given by checkpatch.pl:
    
    - use of C99 // comments;
    
    - missing space between the type and asterisk in a variable declaration;
    
    - space between the asterisk and function/variable name;
    
    - leading spaces instead of tabs;
    
    - space after opening and before closing parentheses;
    
    - initialization of a 'static' variable to 0;
    
    - missing spaces around assignement/comparison operator;
    
    - brace not on the same line with condition (or 'else') in the 'if'/'switch'
      statement;
    
    - missing space between 'if'/'for'/'while' and opening parenthesis;
    
    - use of assignement in 'if' statement's condition;
    
    - printk() without KERN_* facility level;
    
    - EXPORT_SYMBOL() not following its function immediately;
    
    - unnecessary braces for single-statement block;
    
    - adding new 'typedef' (where including <linux/types.h> will do);
    
    - use of 'extern' in the .c file (where it can be avoided by including header);
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - insert missing space after opening brace and/or before closing brace in the
      structure initializers;
    
    - insert spaces between operator and its operands;
    
    - put the function's result type and name/parameters on the same line;
    
    - properly indent multi-line expressions;
    
    - remove commented out code;
    
    - remove useless initializers and code;
    
    - remove needless parentheses;
    
    - fix broken/excess indentation;
    
    - add missing spaces between operator and its operands;
    
    - insert missing and remove excess new lines;
    
    - group 'else' and 'if' together where possible;
    
    - make au1xxx_platform_init() 'static';
    
    - regroup variable declarations in pm_do_freq() for prettier look;
    
    - replace numeric literals with the matching macros;
    
    - fix printk() format specifiers mismatching the argument types;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line and/or adding space on their left side;
    
    - make two-line comments that only have one line of text one-line;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - fix/remove obsolete references in the comments;
    
    - reformat some comments;
    
    - add comment about the CPU:counter clock ratio to calc_clock();
    
    - update MontaVista copyright;
    
    - remove Pete Popov's and Steve Longerbeam's old email addresses...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ff6814d53016081947ff4021e00db3f806a561c9
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Wed Apr 30 23:18:35 2008 +0400

    [MIPS] Alchemy common headers style cleanup
    
    Fix several errors and warnings given by checkpatch.pl:
    
    - space after opening and before closing parentheses;
    
    - opening brace following 'struct' not on the same line;
    
    - leading spaces instead of tabs;
    
    - use of C99 // comments;
    
    - macros with complex values not enclosed in parentheses;
    
    - missing space between the type and asterisk in a variable declaration;
    
    - space between asterisk and function name;
    
    - including <asm/io.h> instead of <linux/io.h> and <asm/irq.h> instead of
      <linux/irq.h>;
    
    - use of '__inline__' instead of 'inline';
    
    - space between function name and opening parenthesis;
    
    - line over 80 characters.
    
    In addition to these changes, also do the following:
    
    - remove needless parentheses;
    
    - insert spaces between operator and its operands;
    
    - replace spaces after the macro name with tabs in the #define directives and
      after the type in the structure field declarations;
    
    - remove excess tabs after the macro name in the #define directives and in the
      'extern' variable declarations;
    
    - remove excess spaces between # and define for the SSI_*_MASK macros to align
      with other such macros;
    
    - put '||' operator on the same line with its first operand;
    
    - properly indent multi-line function prototypes;
    
    - make the multi-line comment style consistent with the kernel style elsewhere
      by adding empty first line and/or adding space/asterisk on their left side;
    
    - make two-line comments that only have one line of text one-line;
    
    - convert the large multi-line comment in au1xxx_ide.h into several one-liners,
      replace spaces with tabs there;
    
    - fix typos/errors, capitalize acronyms, etc. in the comments;
    
    - insert missing and remove excess new lines;
    
    - update MontaVista copyright;
    
    - remove Pete Popov's and Steve Longerbeam's old email addresses...
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit ad1d77a38575644b112340fd9115ac21dd533166
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Thu May 1 15:28:53 2008 +0100

    [MIPS] Add empty argument parenthesis to GCC_IMM_ASM
    
    This is to clarify that GCC_IMM_ASM does not take an argument as the
    context of the macro's invocation seems to imply.
    
    As suggested by Maciej W. Rozycki (macro@linux-mips.org).
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1c9e919f48a49fda2ff2c607891cc17024e75122
Author: Jeff Garzik <jeff@garzik.org>
Date:   Fri Apr 18 19:23:01 2008 -0400

    [MIPS] msp_hwbutton.c: minor irq handler cleanups
    
    - remove always-true test
    
    - neaten request_irq() indentation
    
    This change's main purpose is to prepare for the patchset in
    jgarzik/misc-2.6.git#irq-remove, that explores removal of the
    never-used 'irq' argument in each interrupt handler.
    
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit a64063046026729a69ad06c94453f4ddaa562d60
Author: Adrian Bunk <bunk@kernel.org>
Date:   Mon Apr 21 11:51:37 2008 +0300

    [MIPS] unexport __kmap_atomic_to_page
    
    This patch removes the no longer used export of __kmap_atomic_to_page.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit dc3bf3532bf7240cf117b8ecf3d16526810eba6a
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Fri Apr 18 10:56:07 2008 +0100

    [MIPS] Initialize max_pfn again.
    
    This was dropped by
    
    commit a0d9e2d891e4cf54676c430da63bd4a17d1cdb80 (lmo)
    commit b6f1f0dea1469e0c956eb89399916d60dd2a3808 (ko)
    Author: Franck Bui-Huu <vagabon.xyz@gmail.com>
    Date:   Fri Aug 11 17:51:48 2006 +0200
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit f4324f3eeb311d1889b8c25076f2669012323842
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Wed Apr 16 19:55:26 2008 +0100

    [MIPS] IRIX: Handle do_brk() error return correctly.
    
    do_brk's return value was stored in an unsigned long variable before being
    tested for less than zero making the test always fail.  Also do_brk's
    called irix_map_prda_page wasn't forwarding do_brk() success.
    
    Bug checking the return value of do_brk() and initial fix for it found
    by Roel Kluin <12o3l@tiscali.nl>.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 1928cc84a0a937ce7042d9235996ab380f36f18a
Author: Kevin D. Kissell <kevink@mips.com>
Date:   Wed Apr 16 15:32:22 2008 +0200

    [MIPS] MT: Functional fixes and a little reformatting of APRP support
    
    Signed-off-by: Kevin D. Kissell <kevink@mips.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9f2546adedda600687bba6ef3e1546a8ecbc16eb
Author: Ralf Baechle <ralf@linux-mips.org>
Date:   Thu Apr 17 13:42:50 2008 +0100

    [MIPS] Don't use max_pfn which is no longer initialized these days.
    
    Still won't play nicely with esotheric configurations such as discontig
    memory ...
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit d0e7ba063233105febd960e0716d5e9fd9159307
Author: Roel Kluin <12o3l@tiscali.nl>
Date:   Wed Apr 16 17:09:58 2008 +0200

    [MIPS] ip27-timer: fix unsigned irq < 0
    
    Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
    Acked-By: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit b618336aac146df24ace641dff69dc46675886c9
Author: Kevin D. Kissell <kevink@mips.com>
Date:   Wed Apr 16 15:32:22 2008 +0200

    [MIPS] Fixes necessary for non-SMP kernels and non-relocatable binaries
    
    Signed-off-by: Kevin D. Kissell <kevink@mips.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 8e07c2c6af30dccfa573033d280980b2b5eb35fe
Author: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date:   Sat Apr 5 22:16:21 2008 +0400

    [MIPS] Alchemy: SMBus resource fix
    
    The Alchemy platform code registers the SMBus device using the virtual
    address of its registers instead of the physical one -- fix this, taking
    into account that actually the whole megabyte is decoded by any of the
    programmable serial controllers (one of which is SMBus), and that all the
    Alchemy peripherals are directly mappable into KSEG1 kernel space and
    therefore ioremap() call would just boil down to CKSEG1ADDR() invocation.
    
    Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit 9f1a0735395ba2b2efa5012b5bf7f915299f1a79
Author: Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
Date:   Mon May 12 19:35:31 2008 +0900

    Fix c67x00-ll-hpi compilation failure (bug #10627)
    
    This patch fixes bug #10627 which caused the compilation error below.
    
      CC [M]  drivers/usb/c67x00/c67x00-ll-hpi.o
      drivers/usb/c67x00/c67x00-ll-hpi.c: In function `ll_recv_msg':
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: `HZ' undeclared (first use in this function)
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: (Each undeclared identifier is reported only once
      drivers/usb/c67x00/c67x00-ll-hpi.c:243: erreur: for each function it appears in.)
    
    Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3c29970c02829a91ab337abea2860973b291bd48
Merge: 59b1c82... 0d4b6b9...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 07:29:08 2008 -0700

    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] ppc: More compile fixes
      [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
      [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
      [POWERPC] ppc: Use ebony_defconfig for defconfig
      [POWERPC] Fix default cputable entries for e200 and e500 families

commit 59b1c82500bb5d658891bc8e8a2308b76d58a4de
Merge: 454aa38... a94a172...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon May 12 07:28:37 2008 -0700

    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: Work around memory probing bug in openfirmware.
      sparc32: fix rtrap.S typo
      sparc32: Fix build.

commit 454aa3899f0bebb5aa7f8788690668d106f9a34f
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon May 12 12:31:37 2008 +0100

    cris: Fix compile failure due to typo in serial driver
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 79f999d0aa264f72f5491be14b4bf60137a3d3a9
Author: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date:   Mon May 12 12:29:25 2008 +0100

    strip: Fix termios assumption
    
    Strip assumes that the tty drivers always have a set_termios method which
    may not be true. Check this when binding to the tty so that we don't oops
    later.
    
    Signed-off-by: Alan Cox <alan@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0d4b6b901c3d41beb0e1620316aee0aa234edf7f
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon May 12 22:57:51 2008 +1000

    [POWERPC] ppc: More compile fixes
    
    This fixes a few more miscellaneous compile problems with ARCH=ppc.
    
    1. Don't compile devres.c on ARCH=ppc, it doesn't have ioremap_flags.
    2. Include <asm/irq.h> in setup.c for the __DO_IRQ_CANON definition.
    3. Include <linux/proc_fs.h> in residual.c for the
       definition of create_proc_read_entry.
    4. Fix xchg_ptr to be a static inline to eliminate a compiler warning.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 6a8b23086c82d7cc4f424518532c8b10d95715c0
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:50 2008 +1000

    [POWERPC] ppc: Don't run prom_init_check for arch/ppc builds
    
    arch/ppc doesn't have prom_init.o (anymore).
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 9717e87fb19f21d1be2ac1dce8f65045547b7e1b
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:49 2008 +1000

    [POWERPC] ppc: Include <asm/cacheflush.h> in kernel/ppc_ksyms.c
    
    It needs it:
    
    	arch/ppc/kernel/ppc_ksyms.c:152: error: '__flush_icache_range'
    	undeclared here (not in a function)
    
    and a few more like that.
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 426e53fcbab76b68524f8f07c2afd7a4340c627a
Author: Segher Boessenkool <segher@kernel.crashing.org>
Date:   Wed May 7 08:58:48 2008 +1000

    [POWERPC] ppc: Use ebony_defconfig for defconfig
    
    We used to use common_defconfig, but it was removed some time ago.
    
    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit 516c8be3a93ec2b0746ba0907f38c1d1e62f4992
Author: Paul Mackerras <paulus@samba.org>
Date:   Mon May 12 14:20:35 2008 +1000

    [POWERPC] Fix default cputable entries for e200 and e500 families
    
    Commit 76bc080ef5a34aedb63e1691f28c6b42f3468e4e ("POWERPC] Make default
    cputable entries reflect selected CPU family") added default entries
    for the e200 and e500 families, but missed a closing brace on those
    entries, as pointed out by David Gibson.  This adds the closing braces.
    
    Signed-off-by: Paul Mackerras <paulus@samba.org>

commit a94a172d6c826232e623160ae134abbce181a41f
Author: David S. Miller <davem@davemloft.net>
Date:   Sun May 11 21:04:48 2008 -0700

    sparc64: Work around memory probing bug in openfirmware.
    
    Read all of the OF memory and translation tables, then read
    the physical available memory list twice.
    
    When making these requests, OF can allocate more memory to
    do it's job, which can remove pages from the available
    memory list.
    
    So fetch in all of the tables at once, and fetch the available
    list last to make sure we read a stable value.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8bf3028ede10dfe22e1729ebad96f6eb77020712
Author: Robert Reif <reif@earthlink.net>
Date:   Sun May 11 18:05:20 2008 -0700

    sparc32: fix rtrap.S typo
    
    Fix compile problem in rtrap.S
    
    arch/sparc/kernel/built-in.o: In function `ret_trap_userwins_ok':
    arch/sparc/kernel/rtrap.S:(.text+0x1900): undefined reference to
    `PSR_SYCALL'
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b5e10df665e756c2c68442177e460d90bb9cf979
Author: Robert Reif <reif@earthlink.net>
Date:   Sun May 11 15:47:05 2008 -0700

    sparc32: Fix build.
    
    Fix sparc32 build error due to undefined bool type.
    
    CC [M] fs/ocfs2/dlm/userdlm.o
    In file included from include/asm/sigcontext.h:6,
    from include/asm/signal.h:5,
    from include/linux/signal.h:4,
    from fs/ocfs2/dlm/userdlm.c:30:
    include/asm/ptrace.h:42: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
    ‘__attribute__’ before ‘pt_regs_is_syscall’
    include/asm/ptrace.h:47: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or
    ‘__attribute__’ before ‘pt_regs_clear_syscall’
    make[3]: *** [fs/ocfs2/dlm/userdlm.o] Error 1
    make[2]: *** [fs/ocfs2/dlm] Error 2
    make[1]: *** [fs/ocfs2] Error 2
    make: *** [fs] Error 2
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e691b9d1a096fbaaff9d6d6aef1adc593b786e62
Author: Steve French <sfrench@us.ibm.com>
Date:   Sun May 11 15:53:33 2008 +0000

    [CIFS] don't allow demultiplex thread to exit until kthread_stop is called
    
    cifs_demultiplex_thread can exit under several conditions:
    
    1) if it's signaled
    2) if there's a problem with session setup
    3) if kthread_stop is called on it
    
    The first two are problems. If kthread_stop is called on the thread,
    there is no guarantee that it will still be up. We need to have the
    thread stay up until kthread_stop is called on it.
    
    One option would be to not even try to tear things down until after
    kthread_stop is called. However, in the case where there is a problem
    setting up the session, there's no real reason to try continuing the
    loop.
    
    This patch allows the thread to clean up and prepare for exit under all
    three conditions, but it has the thread go to sleep until kthread_stop
    is called. This allows us to simplify the shutdown code somewhat since
    we can be reasonably sure that the thread won't exit after being
    signaled but before kthread_stop is called.
    
    It also removes the places where the thread itself set the tsk variable
    since it appeared that it could have a potential race where the thread
    might never be shut down.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Acked-by: Christoph Hellwig <hch@infradead.org>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 67750fb9e07940c078d1edb16fd736ccc92a4a4e
Author: Jeff Layton <jlayton@redhat.com>
Date:   Fri May 9 22:28:02 2008 +0000

    [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir
    
    When creating a directory on a CIFS share without POSIX extensions,
    and the given mode has no write bits set, set the ATTR_READONLY bit.
    
    When creating a file, set ATTR_READONLY if the create mode has no write
    bits set and we're not using unix extensions.
    
    There are some comments about this being problematic due to the VFS
    splitting creates into 2 parts. I'm not sure what that's actually
    talking about, but I'm assuming that it has something to do with how
    mknod is implemented. In the simple case where we have no unix
    extensions and we're just creating a regular file, there's no reason
    we can't set ATTR_READONLY.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 02eadeffda169a45946c79270ec19f45eeafb8e7
Author: Jeff Layton <jlayton@redhat.com>
Date:   Fri May 9 21:26:11 2008 +0000

    [CIFS]  add local struct inode pointer to cifs_setattr
    
    Clean up cifs_setattr a bit by adding a local inode pointer, and
    changing all of the direntry->d_inode references to it. This also adds a
    bit of micro-optimization. d_inode shouldn't change over the life of
    this function, so we only need to dereference it once.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 1b20d672188bf80baef60d515a123f556871a5ce
Author: Cyrill Gorcunov <gorcunov@gmail.com>
Date:   Fri May 9 18:17:21 2008 +0000

    [CIFS] cifs_find_tcp_session cleanup
    
    This patch cleans up cifs_find_tcp_session so it become
    less indented. Also the error of skipping IPv6 matched
    addresses fixed.
    
    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 64976a0387835a7ac61bbe2a99b27ccae34eac5d
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sat May 10 14:08:40 2008 -0500

    [SCSI] aha152x: Fix oops on module removal
    
    Reported-by: Frank de Jong <frapex@xs4all.nl>
    > after trying to unload the module:
    > BUG: unable to handle kernel paging request at 00100100
    > IP: [<fb9ff667>] :aha152x:aha152x_exit+0x47/0x6a
    > *pde = 00000000
    > Oops: 0000 [#1] PREEMPT SMP
    > Modules linked in: aha152x(-) w83781d hwmon_vid tun ne 8390 bonding
    > usb_storage snd_usb_audio snd_usb_lib snd_rawmidi pwc snd_seq_device
    > compat_ioctl32 snd_hwdep videodev v4l1_compat 3c59x mii intel_agp
    > agpgart snd_pcm_oss snd_pcm snd_timer snd_page_alloc snd_mixer_oss snd
    >
    > Pid: 2837, comm: rmmod Not tainted (2.6.25.3 #1)
    > EIP: 0060:[<fb9ff667>] EFLAGS: 00210212 CPU: 0
    > EIP is at aha152x_exit+0x47/0x6a [aha152x]
    > EAX: 00000001 EBX: 000ffdc4 ECX: f7c517a8 EDX: 00000001
    > ESI: 00000000 EDI: 00000003 EBP: e7880000 ESP: e7881f58
    >   DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
    > Process rmmod (pid: 2837, ti=e7880000 task=f27eb580 task.ti=e7880000)
    > Stack: fba03700 c01419d2 31616861 00783235 e795ee70 c0157709 b7f24000 e79ae000
    >         c0158271 ffffffff b7f25000 e79ae004 e795e370 b7f25000 e795e37c e795e370
    >         009ae000 fba03700 00000880 e7881fa8 00000000 bf93ec20 bf93ec20 c0102faa
    > Call Trace:
    >   [<c01419d2>] sys_delete_module+0x112/0x1a0
    >   [<c0157709>] remove_vma+0x39/0x50
    >   [<c0158271>] do_munmap+0x181/0x1f0
    >   [<c0102faa>] sysenter_past_esp+0x5f/0x85
    >   [<c0490000>] rsc_parse+0x0/0x3c0
    
    The problem is that the driver calls aha152x_release() under a
    list_for_each_entry().  Unfortunately, aha152x_release() deletes from
    the list in question.  Fix this by using list_for_each_entry_safe().
    
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit ad2fa42d044b98469449880474a9662fb689f7f9
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sat May 10 08:33:58 2008 -0500

    [SCSI] aha152x: fix init suspiciously returned 1, it should follow 0/-E convention
    
    Reported-by: Frank de Jong <frapex@xs4all.nl>
    > [1.] One line summary of the problem:
    > linux-2.6.25.3, aha152x'->init suspiciously returned 1, it should
    > follow 0/-E convention. The module / driver works okay. Unloading the
    > module is impossible.
    
    The driver is apparently returning 0 on failure and 1 on success.
    That's a bit unfortunate.  Fix it by altering to -ENODEV and 0.
    
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit c8611f975403dd20e6503aff8aded5dcb718f75b
Author: Mike Christie <michaelc@cs.wisc.edu>
Date:   Thu May 8 20:15:34 2008 -0500

    [SCSI] libiscsi regression in 2.6.25: fix setting of recv timer
    
    If the ping tmo is longer than the recv tmo then we could miss a window
    where we were supposed to check the recv tmo. This happens because
    the ping code will set the next timeout for the ping timeout, and if the
    ping executes quickly there will be a long chunk of time before the
    timer wakes up again.
    
    This patch has the ping processing code kick off a recv
    tmo check when getting a nop in response to our ping.
    
    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 4cf1043593db6a337f10e006c23c69e5fc93e722
Author: Mike Christie <michaelc@cs.wisc.edu>
Date:   Wed May 7 20:43:52 2008 -0500

    [SCSI] libiscsi regression in 2.6.25: fix nop timer handling
    
    The following patch fixes a bug in the iscsi nop processing.
    The target sends iscsi nops to ping the initiator and the
    initiator has to send nops to reply and can send nops to
    ping the target.
    
    In 2.6.25 we moved the nop processing to the kernel to handle
    problems when the userspace daemon is not up, but the target
    is pinging us, and to handle when scsi commands timeout, but
    the transport may be the cause (we can send a nop to check
    the transport). When we added this code we added a bug where
    if the transport timer wakes at the exact same time we are supposed to check
    for a nop timeout we drop the session instead of checking the transport.
    
    This patch checks if a iscsi ping is outstanding and if the ping has
    timed out, to determine if we need to signal a connection problem.
    
    Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
    Cc: Stable Tree <stable@kernel.org>
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit a85591fd0baf4ed3f03ee1aaac6a985e400cf089
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun May 4 22:35:58 2008 -0500

    [SCSI] gdth: fix Error: Driver 'gdth' is already registered, aborting...
    
    This message appears on modprobe/rmmod/modprobe of the driver.  It's
    caused because if the driver has no instances, it returns an error
    from gdth_init, which causes the module to fail to load.
    Unfortunately, the module's pci driver is still registered at this
    point.
    
    Fix this by making gdth behave like a modern driver and insert even if
    it doesn't find any instances (in case of hot plug or software driven
    binding).
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

commit 2d6f0d0cd94f9b8b24102300d8dd9cbbd1688826
Author: James Bottomley <James.Bottomley@HansenPartnership.com>
Date:   Sun May 4 22:34:49 2008 -0500

    [SCSI] gdth: fix timer handling
    
    The global timer handling is problematic in that if someone unbinds a
    PCI gdth instance, the BUG_ON() in the timer will cause a panic.
    
    Fix this by making the timer start and stop depending on whether there
    are instances present.  This should also permit binding and unbinding
    to work.
    
    Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>