commit 33bfad54b58cf05cfe6678c3ec9235d4bc8db4c2
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jan 30 11:37:22 2009 -0800

    Allow opportunistic merging of VM_CAN_NONLINEAR areas
    
    Commit de33c8db5910cda599899dd431cc30d7c1018cbf ("Fix OOPS in
    mmap_region() when merging adjacent VM_LOCKED file segments") unified
    the vma merging of anonymous and file maps to just one place, which
    simplified the code and fixed a use-after-free bug that could cause an
    oops.
    
    But by doing the merge opportunistically before even having called
    ->mmap() on the file method, it now compares two different 'vm_flags'
    values: the pre-mmap() value of the new not-yet-formed vma, and previous
    mappings of the same file around it.
    
    And in doing so, it refused to merge the common file case, which adds a
    marker to say "I can be made non-linear".
    
    This fixes it by just adding a set of flags that don't have to match,
    because we know they are ok to merge.  Currently it's only that single
    VM_CAN_NONLINEAR flag, but at least conceptually there could be others
    in the future.
    
    Reported-and-acked-by: Hugh Dickins <hugh@veritas.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Greg KH <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c01a25e7cf6dcb0fa69c155706d5dd1e76e53796
Merge: ae704e9... b9ec63f...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jan 30 08:54:29 2009 -0800

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
      ext4: Remove bogus BUG() check in ext4_bmap()
      ext4: Fix building with EXT4FS_DEBUG
      ext4: Initialize the new group descriptor when resizing the filesystem
      ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks
      jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs"
      ext3: Add sanity check to make_indexed_dir
      ext4: Add sanity check to make_indexed_dir
      ext4: only use i_size_high for regular files
      ext4: fix wrong use of do_div

commit ae704e9f92f87b12c5938b07245792857c7c9c14
Merge: dbeb170... 3a9a3f6...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jan 30 08:46:42 2009 -0800

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      cfq-iosched: Allow RT requests to pre-empt ongoing BE timeslice
      block: add sysfs file for controlling io stats accounting
      Mark mandatory elevator functions in the biodoc.txt
      include/linux: Add bsg.h to the Kernel exported headers
      block: silently error an unsupported barrier bio
      block: Fix documentation for blkdev_issue_flush()
      block: add bio_rw_flagged() for testing bio->bi_rw
      block: seperate bio/request unplug and sync bits
      block: export SSD/non-rotational queue flag through sysfs
      Fix small typo in bio.h's documentation
      block: get rid of the manual directory counting in blktrace
      block: Allow empty integrity profile
      block: Remove obsolete BUG_ON
      block: Don't verify integrity metadata on read error

commit dbeb17016e4d0affccfa07f4e8f61feac75c5a18
Merge: 0461ec5... f99ec06...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Jan 30 08:41:36 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)
      tulip: fix 21142 with 10Mbps without negotiation
      drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic
      gianfar: Fix Wake-on-LAN support
      smsc911x: timeout reaches -1
      smsc9420: fix interrupt signalling test failures
      ucc_geth: Change uec phy id to the same format as gianfar's
      wimax: fix build issue when debugfs is disabled
      netxen: fix memory leak in drivers/net/netxen_nic_init.c
      tun: Add some missing TUN compat ioctl translations.
      ipv4: fix infinite retry loop in IP-Config
      net: update documentation ip aliases
      net: Fix OOPS in skb_seq_read().
      net: Fix frag_list handling in skb_seq_read
      netxen: revert jumbo ringsize
      ath5k: fix locking in ath5k_config
      cfg80211: print correct intersected regulatory domain
      cfg80211: Fix sanity check on 5 GHz when processing country IE
      iwlwifi: fix kernel oops when ucode DMA memory allocation failure
      rtl8187: Fix error in setting OFDM power settings for RTL8187L
      mac80211: remove Michael Wu as maintainer
      ...

commit 0461ec5bc7745b89a8ab67ba0ea497abd58a6301
Author: Paul Larson <pl@linux.vnet.ibm.com>
Date:   Fri Jan 30 10:21:49 2009 -0600

    Add enable_ms to jsm driver
    
    This fixes a crash observed when non-existant enable_ms function is
    called for jsm driver.
    
    Signed-off-by: Scott Kilau <Scott.Kilau@digi.com>
    Signed-off-by: Paul Larson <pl@linux.vnet.ibm.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3a9a3f6cc55418dd1525e636dccbbe13c394f652
Author: Divyesh Shah <dpshah@google.com>
Date:   Fri Jan 30 12:46:41 2009 +0100

    cfq-iosched: Allow RT requests to pre-empt ongoing BE timeslice
    
    This patch adds the ability to pre-empt an ongoing BE timeslice when a RT
    request is waiting for the current timeslice to complete. This reduces the
    wait time to disk for RT requests from an upper bound of 4 (current value
    of cfq_quantum) to 1 disk request.
    
    Applied Jens' suggeested changes to avoid the rb lookup and use !cfq_class_rt()
    and retested.
    
    Latency(secs) for the RT task when doing sequential reads from 10G file.
                           | only RT | RT + BE | RT + BE + this patch
    small (512 byte) reads | 143     | 163     | 145
    large (1Mb) reads      | 142     | 158     | 146
    
    Signed-off-by: Divyesh Shah <dpshah@google.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit bc58ba9468d94d62c56ab9b47173583ec140b165
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Fri Jan 23 10:54:44 2009 +0100

    block: add sysfs file for controlling io stats accounting
    
    This allows us to turn off disk stat accounting completely, for the cases
    where the 0.5-1% reduction in system time is important.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 7598909e3ee2a08726276d6415b69dadb52d0d76
Author: Nikanth Karthikesan <knikanth@suse.de>
Date:   Tue Jan 27 09:29:24 2009 +0100

    Mark mandatory elevator functions in the biodoc.txt
    
    biodoc.txt mentions that elevator functions marked with * are mandatory, but
    no function is marked with *. Mark the 3 functions which should be
    implemented by any io scheduler.
    
    Signed-off-by: Nikanth Karthikesan <knikanth@suse.de>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit a229fc61ef0ee3c30fd193beee0eeb87410227f1
Author: Boaz Harrosh <bharrosh@panasas.com>
Date:   Mon Jan 19 10:37:38 2009 +0100

    include/linux: Add bsg.h to the Kernel exported headers
    
    bsg.h in current form is perfectly suitable for user-mode
    consumption. It is needed together with scsi/sg.h for applications
    that want to interface with the bsg driver.
    
    Currently the few projects that use it would copy it over into
    the projects. But that is not acceptable for projects that need
    to provide source and devel packages for distros.
    
    This should also be submitted to stable 2.6.28 and 2.6.27 since bsg had
    a stable API since these Kernels and distro users will need the header
    for these kernels a swell
    
    Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
    Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    CC: stable@kernel.org
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit cec0707e40ae25794b5a2de7b7f03c51961f80d9
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Tue Jan 13 15:28:32 2009 +0100

    block: silently error an unsupported barrier bio
    
    This fixes a "regression" from 2.6.28, where the barrier probes that file
    systems may do would trigger additional end request warnings in dmesg.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit dbdac9b71dff5d27885f82eb2cfca310861fdf9e
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Tue Jan 13 15:27:32 2009 +0100

    block: Fix documentation for blkdev_issue_flush()
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 1dfa17f4ab8543d82caf4d36636b93916a18f456
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Tue Jan 6 09:21:49 2009 +0100

    block: add bio_rw_flagged() for testing bio->bi_rw
    
    The existing functions for checking bio->bi_rw are badly named. So lets
    mirror what we do for bio->bi_flags testing, use a properly named
    function so that it's immediately obvious what is being tested.
    
    Maintain compatability names for the old macros, eventually we'll get
    rid of these.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 213d9417fec62ef4c3675621b9364a667954d4dd
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Tue Jan 6 09:16:05 2009 +0100

    block: seperate bio/request unplug and sync bits
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 1308835ffffe6d61ad1f48c5c381c9cc47f683ec
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date:   Wed Jan 7 12:22:39 2009 +0100

    block: export SSD/non-rotational queue flag through sysfs
    
    For some devices (i.e. CFA ATA) we can't reliably detect whether
    the device is of rotational or non-rotational type so we need to
    leave the final decision about this setting to the user-space.
    
    As a bonus do a minor CodingStyle fixup in queue_nomerges_store().
    
    Suggested-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 16642eb68216d8e0e136a99e514e9166e7125838
Author: Alberto Bertogli <albertito@blitiri.com.ar>
Date:   Mon Jan 5 10:18:53 2009 +0100

    Fix small typo in bio.h's documentation
    
    Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit f48fc4d32e24c0b6a18aad30305d819bcc68c049
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Mon Jan 5 10:17:25 2009 +0100

    block: get rid of the manual directory counting in blktrace
    
    It can result in a stuck blktrace system, if --kill is used.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 322316385dde5cd879e682bcb598c56d0659fb60
Author: Martin K. Petersen <martin.petersen@oracle.com>
Date:   Sun Jan 4 02:43:40 2009 -0500

    block: Allow empty integrity profile
    
    Allow a block device to allocate and register an integrity profile
    without providing a template.  This allows DM to preallocate a profile
    to avoid deadlocks during table reconfiguration.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 8ae372e3bb4acaca37ffa2ce54f4cf8dd60a94fa
Author: Martin K. Petersen <martin.petersen@oracle.com>
Date:   Sun Jan 4 02:43:39 2009 -0500

    block: Remove obsolete BUG_ON
    
    Now that bio_vecs are no longer cleared in bvec_alloc_bs() the following
    BUG_ON must go.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 7b24fc4d7eb611da367dea3aad45473050aacd6c
Author: Martin K. Petersen <martin.petersen@oracle.com>
Date:   Sun Jan 4 02:43:38 2009 -0500

    block: Don't verify integrity metadata on read error
    
    If we get an I/O error on a read request there is no point in doing a
    verify pass on the integrity buffer.  Adjust the completion path
    accordingly.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit b9ec63f78b425c0e16cc95605b5d4ff2dc228b97
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Fri Jan 30 00:00:24 2009 -0500

    ext4: Remove bogus BUG() check in ext4_bmap()
    
    The code to support journal-less ext4 operation added a BUG to
    ext4_bmap() which fired if there was no journal and the
    EXT4_STATE_JDATA bit was set in the i_state field.  This caused
    running the filefrag program (which uses the FIMBAP ioctl) to trigger
    a BUG().
    
    The EXT4_STATE_JDATA bit is only used for ext4_bmap(), and it's
    harmless for the bit to be set.  We could add a check in
    __ext4_journalled_writepage() and ext4_journalled_write_end() to only
    set the EXT4_STATE_JDATA bit if the journal is present, but that adds
    an extra test and jump instruction.  It's easier to simply remove the
    BUG check.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12568
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org

commit f2257b70b0f9b2fe8f2afd83fc6798dca75930b8
Merge: 1737ef7... a9ac49d...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:21:14 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      cifs: make sure we allocate enough storage for socket address
      [CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases
      [CIFS] some cleanup to dir.c prior to addition of posix_open
      [CIFS] revalidate parent inode when rmdir done within that directory
      [CIFS] Rename md5 functions to avoid collision with new rt modules
      cifs: turn smb_send into a wrapper around smb_sendv

commit 1737ef7598d3515fdc11cb9ba7e054f334404e04
Author: Alexander Beregalov <a.beregalov@gmail.com>
Date:   Thu Jan 29 02:30:56 2009 +0300

    sata_sil: Fix build breakage
    
    Commit e57db7b (SATA Sil: Blacklist system that spins off disks during ACPI power off)
     breaks build like the following, in both cases when CONFIG_DMI set or not.
    
            drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
            drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
            drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast
    
      sata_sil.c should include dmi.h
    
    Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 242f45da5b7bf63c50f1f18301750712e7885dd6
Author: Bill Nottingham <notting@redhat.com>
Date:   Thu Jan 29 16:28:40 2009 -0800

    Documentation/Changes: add required versions for new filesystems
    
    btrfs requires version 0.18 of its tools, and squashfs requires 4.0.
    ext3 should use and ext4 requires v1.41.4 of e2fsprogs.
    
    Signed-off-by: Bill Nottingham <notting@redhat.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    cc: Ted Tso <tytso@mit.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 70221395ba980392ba98c1d78f6c9f77be03df9e
Author: Dan Carpenter <error27@gmail.com>
Date:   Thu Jan 29 16:28:28 2009 -0800

    fix emacs indenting howto filename expansion
    
    I don't think emacs understands tilde expansion, so use
    "expand-file-name" to do that.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0acbc6c651911dc9ffb4f59b34306bc1ccb751e5
Author: Teemu Likonen <tlikonen@iki.fi>
Date:   Thu Jan 29 16:28:16 2009 -0800

    Documentation: update CodingStyle tips for Emacs users
    
    With the previous Emacs tips example the kernel style was made available
    for files in the kernel-tree only. This patch updates the tip to add a
    separate cc-mode indent style ("linux-tabs-only"). This makes it easy to
    switch between different indent styles and also makes the kernel style
    easily available for any filetype mode (c++, awk, ...) that is managed
    by the Emacs cc-mode.
    
    Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5872fb94f85d2e4fdef94657bd14e1a492df9825
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Thu Jan 29 16:28:02 2009 -0800

    Documentation: move DMA-mapping.txt to Doc/PCI/
    
    Move DMA-mapping.txt to Documentation/PCI/.
    
    DMA-mapping.txt was supposed to be moved from Documentation/ to
    Documentation/PCI/.  The 00-INDEX files in those two directories
    were updated, along with a few other text files, but the file
    itself somehow escaped being moved, so move it and update more
    text files and source files with its new location.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    cc:	Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ca493d171b66e96f542501b7eb572bc8380f690d
Merge: 5488ace... dcbbcef...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:14:20 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
      Staging: poch: fix verification of memory area
      Staging: usbip: usbip_start_threads(): handle kernel_thread failure
      staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h>
      Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
      Staging: android: Add lowmemorykiller documentation.
      Staging: android: fix build error on 64bit boxes
      Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25.
      Staging: android: binder: fix arm build errors
      Staging: meilhaus: fix Kbuild
      Staging: comedi: fix Kbuild

commit 5488ace40be22d3f23f58190ae48b2c8d4691f2b
Merge: 05986e2... 7cbcf22...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:14:05 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      driver-core: fix kernel-doc parameter name
      UIO: Add missing documentation of features added recently
      Sync patch for jp_JP/stable_kernel_rules.txt

commit 05986e264ee638b6b6151aea89c9f191278c30f1
Merge: 0d28088... de2cf59...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:13:22 2009 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver
      ASoC: Fix null string usage with WM8753 DAIs
      ALSA: hda - add another MacBook Pro 4, 1 subsystem ID
      ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
      ALSA: hda - Add quirk for HP DV6700 laptop
      ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs

commit 0d280884961de51afd87465f72ade9e8876d1e26
Merge: 9b4d142... 766fb95...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:12:58 2009 -0800

    Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
    
    * 'linux-next' of git://git.infradead.org/ubi-2.6:
      UBI: allow direct user-space I/O
      UBI: fix resource de-allocation
      UBI: remove unused variable
      UBI: use nicer 64-bit math
      UBI: add ioctl compatibility
      UBI: constify file operations
      UBI: allow all ioctls
      UBI: remove unnecessry header inclusion
      UBI: improve ioctl commentaries
      UBI: add ioctl for is_mapped operation
      UBI: add ioctl for unmap operation
      UBI: add ioctl for map operation

commit 9b4d142d521963ee1c53cefcd1f9790ca32b5db7
Merge: 6e3eed9... bae7eb3...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:11:02 2009 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: document difference between hid_blacklist and hid_ignore_list
      HID: add antec-branded soundgraph imon devices to blacklist
      HID: fix reversed logic in disconnect testing of hiddev
      HID: adjust report descriptor fixup for MS 1028 receiver

commit 6e3eed9850064e38a98851ff91534bb32438b292
Merge: ceb5eb0... 05dfdbb...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:10:36 2009 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
      lguest: Fix a memory leak with the lg object during launcher close
      lguest: disable the FORTIFY for lguest.
      lguest: typos fix

commit ceb5eb0cb3fe61d488aa76aba748409775a56daa
Merge: 726a669... 1448d7c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 18:09:41 2009 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      ieee1394: sbp2: add workarounds for 2nd and 3rd generation iPods
      firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
      firewire: sbp2: fix DMA mapping leak on the failure path
      firewire: sbp2: define some magic numbers as macros
      firewire: sbp2: fix payload limit at S1600 and S3200
      ieee1394: sbp2: don't assume zero model_id or firmware_revision if there is none
      ieee1394: sbp2: fix payload limit at S1600 and S3200
      ieee1394: sbp2: update a help string
      ieee1394: support for speeds greater than S800
      firewire: core: optimize card shutdown
      ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others
      firewire: ohci: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others
      firewire: ohci: change "context_stop: still active" log message
      firewire: keep highlevel drivers attached during brief connection loss
      firewire: unnecessary BM delay after generation rollover
      firewire: insist on successive self ID complete events

commit 726a6699267e36c66043a55b13dfeec3d9925452
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Thu Jan 29 14:25:27 2009 -0800

    drivers/gpu/drm/i915/intel_lvds.c: fix locking snafu
    
    s/unlock/lock/
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=12575
    
    Reported-by: Daniel Vetter <daniel@ffwll.ch>
    Cc: Dave Airlie <airlied@linux.ie>
    Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Eric Anholt <eric@anholt.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 9df04e1f25effde823a600e755b51475d438f56b
Author: Davide Libenzi <davidel@xmailserver.org>
Date:   Thu Jan 29 14:25:26 2009 -0800

    epoll: drop max_user_instances and rely only on max_user_watches
    
    Linus suggested to put limits where the money is, and max_user_watches
    already does that w/out the need of max_user_instances.  That has the
    advantage to mitigate the potential DoS while allowing pretty generous
    default behavior.
    
    Allowing top 4% of low memory (per user) to be allocated in epoll watches,
    we have:
    
    LOMEM    MAX_WATCHES (per user)
    512MB    ~178000
    1GB      ~356000
    2GB      ~712000
    
    A box with 512MB of lomem, will meet some challenge in hitting 180K
    watches, socket buffers math teaches us.  No more max_user_instances
    limits then.
    
    Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
    Cc: Willy Tarreau <w@1wt.eu>
    Cc: Michael Kerrisk <mtk.manpages@googlemail.com>
    Cc: Bron Gondwana <brong@fastmail.fm>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3095eb87bb36ae880608fe3fc46cfd59ced1f319
Author: Frans Pop <elendil@planet.nl>
Date:   Thu Jan 29 14:25:25 2009 -0800

    hp-wmi: set initial docking state
    
    If the initial state is not set when the input device is set up, the first
    docking event after the module is loaded will be lost.
    
    Signed-off-by: Frans Pop <elendil@planet.nl>
    Acked-by: Matthew Garrett <mjg59@srcf.ucam.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit fb9f88e1dc76f9feb39d39c40a5d61aad6df4388
Author: Bharath Ramesh <bramesh@vt.edu>
Date:   Thu Jan 29 14:25:24 2009 -0800

    hwmon: applesmc: add support for MacPro 3 temperature sensors
    
    MacPro 3 have more temperature sensors than the previous MacPro's also the
    sensor THTG has been removed.  This patch add supports for the newer
    temperature sensors in the MacPro3.
    
    Signed-off-by: Bharath Ramesh <bramesh@vt.edu>
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit c189f4ec955e1fe4a2a2742d028aeecc52a5848a
Author: David Altobelli <david.altobelli@hp.com>
Date:   Thu Jan 29 14:25:23 2009 -0800

    hpilo: increment version
    
    Bump hpilo module version to indicate that the open/close bug is fixed.
    
    Signed-off-by: David Altobelli <david.altobelli@hp.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 839ec5452ebfd5905b9c69b20ceb640903a8ea1a
Author: Paul Menage <menage@google.com>
Date:   Thu Jan 29 14:25:22 2009 -0800

    cgroup: fix root_count when mount fails due to busy subsystem
    
    root_count was being incremented in cgroup_get_sb() after all error
    checking was complete, but decremented in cgroup_kill_sb(), which can be
    called on a superblock that we gave up on due to an error.  This patch
    changes cgroup_kill_sb() to only decrement root_count if the root was
    previously linked into the list of roots.
    
    Signed-off-by: Paul Menage <menage@google.com>
    Tested-by: Serge Hallyn <serue@us.ibm.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 804b3c28a4e4fa1c224571bf76edb534b9c4b1ed
Author: Paul Menage <menage@google.com>
Date:   Thu Jan 29 14:25:21 2009 -0800

    cgroups: add cpu_relax() calls in css_tryget() and cgroup_clear_css_refs()
    
    css_tryget() and cgroup_clear_css_refs() contain polling loops; these
    loops should have cpu_relax calls in them to reduce cross-cache traffic.
    
    Signed-off-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 1404f06565ee89e0ce04d4a5859c00b0e3a0dc8d
Author: Li Zefan <lizf@cn.fujitsu.com>
Date:   Thu Jan 29 14:25:21 2009 -0800

    cgroups: fix lock inconsistency in cgroup_clone()
    
    I fixed a bug in cgroup_clone() in Linus' tree in commit 7b574b7
    ("cgroups: fix a race between cgroup_clone and umount") without noticing
    there was a cleanup patch in -mm tree that should be rebased (now commit
    104cbd5, "cgroups: use task_lock() for access tsk->cgroups safe in
    cgroup_clone()"), thus resulted in lock inconsistency.
    
    Signed-off-by: Li Zefan <lizf@cn.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 945048ca36173315afa2f0c53bed21ba01a588c1
Author: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Date:   Thu Jan 29 14:25:20 2009 -0800

    alpha: fix the BUG() macro
    
    The commit "alpha: teach the compiler that BUG doesn't return"
    (ed6b9b97f42c091630335bfb71a2931e6f86388b) moved the asm code into inline
    function which takes __FILE__ and __LINE__ as arguments.  This violates
    asm constrains there ("i" - an immediate operand with constant value), so
    that compile may result in warning or error, depending on compiler
    version.
    
    Just adding an infinite loop to the BUG() is sufficient.
    
    Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Richard Henderson <rth@twiddle.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ee0c468bb151aad23281660152d2894f1e214238
Author: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Date:   Thu Jan 29 14:25:19 2009 -0800

    alpha: compile fixes
    
    - jensen build: fix conflicting declarations for pci_alloc_consistent()
      and undefined virt_to_phys();
    
    - SMP: arch/alpha/kernel/smp.c:124: warning: passing argument 2
           of '__cpu_test_and_set' discards qualifiers from pointer target type
      Interestingly, this only happens with gcc-4.2; gcc <= 4.1 and gcc-4.3
      are OK. Fixed with extra assignment.
    
    Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e5d9a90c36e05dd080704ea58328c00f64facdc1
Author: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Date:   Thu Jan 29 14:25:18 2009 -0800

    alpha: use syscall wrappers
    
    Convert OSF syscalls and add alpha specific SYSCALL_ALIAS() macro.
    
    Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 299b4eaa302138426d5a9ecd954de1f565d76c94
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date:   Thu Jan 29 14:25:17 2009 -0800

    memcg: NULL pointer dereference at rmdir on some NUMA systems
    
    N_POSSIBLE doesn't means there is memory...and force_empty can
    visit invalid node which have no pgdat.
    
    To visit all valid nodes, N_HIGH_MEMORY should be used.
    
    Reported-by: Li Zefan <lizf@cn.fujitsu.com>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Tested-by: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
    Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 248ae0d43fe7f951352eedfff36572d4b75ce963
Author: Alex Buell <alex.buell@munted.org.uk>
Date:   Thu Jan 29 14:25:16 2009 -0800

    fbdev: incorrect URL given in drivers/video/Kconfig
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 6989d5651a16b49908069b514329d5114217ea0e
Author: Frans Pop <elendil@planet.nl>
Date:   Thu Jan 29 14:25:14 2009 -0800

    hp-wmi: fix regressions caused by missing if statement
    
    Error was introduced in commit fe8e4e039dc3 ("hp-wmi: handle
    rfkill_register() failure").
    
    Signed-off-by: Frans Pop <elendil@planet.nl>
    Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
    Acked-by: Matthew Garrett <mjg@redhat.com>
    Cc: Matthew Garrett <mjg59@srcf.ucam.org>
    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 8d50d369d1b3ccc4d96ce01f62146173ee7064ca
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date:   Thu Jan 29 14:25:14 2009 -0800

    memcg: update document to mention that swapoff should be tested
    
    Considering the recently found problem "memcg: fix refcnt handling at
    swapoff", it's better to mention swapoff behavior in the memcg_test
    document.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 85d9fc89fb0f0703df6444f260187c088a8d59ff
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date:   Thu Jan 29 14:25:13 2009 -0800

    memcg: fix refcnt handling at swapoff
    
    Now, at swapoff, even while try_charge() fails, commit is executed.  This
    is a bug which turns the refcnt of cgroup_subsys_state negative.
    
    Reported-by: Li Zefan <lizf@cn.fujitsu.com>
    Tested-by: Li Zefan <lizf@cn.fujitsu.com>
    Tested-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7460db567bbca76bf087d1694d792a1a96bdaa26
Author: Magnus Damm <damm@igel.co.jp>
Date:   Thu Jan 29 14:25:12 2009 -0800

    gpiolib: fix request related issue
    
    Fix request-already-requested handling in gpio_request().
    
    Signed-off-by: Magnus Damm <damm@igel.co.jp>
    Acked-by: David Brownell <dbrownell@users.sourceforge.net>
    Cc: <stable@kernel.org>		[2.6.28.x]
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 7bcc1bb1232de6efc0b85e0c7fe38e90b2436318
Author: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Date:   Thu Jan 29 14:25:11 2009 -0800

    memcg: get/put parents at create/free
    
    The lifetime of struct cgroup and struct mem_cgroup is different and
    mem_cgroup has its own reference count for handling references from
    swap_cgroup.
    
    This causes strange problem that the parent mem_cgroup dies while child
    mem_cgroup alive, and this problem causes a bug in case of
    use_hierarchy==1 because res_counter_uncharge climbs up the tree.
    
    This patch is for avoiding it by getting the parent at create, and putting
    it at freeing.
    
    Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Reviewed-by; KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
    Cc: Pavel Emelyanov <xemul@openvz.org>
    Cc: Li Zefan <lizf@cn.fujitsu.com>
    Cc: Paul Menage <menage@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit baef99a08a2e23d9386b47e53fa5f0d44fc98f66
Author: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date:   Thu Jan 29 14:25:10 2009 -0800

    cgroups: use hierarchy mutex in creation failure path
    
    Now, cgrp->sibling is handled under hierarchy mutex.
    error route should do so, too.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Cc: Li Zefan <lizf@cn.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 9e9e3cbc62da43c66e894d5a61fa08b427e25202
Author: Evgeniy Polyakov <zbr@ioremap.net>
Date:   Thu Jan 29 14:25:09 2009 -0800

    mm: OOM documentation update
    
    Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net>
    Acked-by: David Rientjes <rientjes@google.com>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit dc19835df6c47ff676ad6c98722d5e529db5d74c
Author: Masami Hiramatsu <mhiramat@redhat.com>
Date:   Thu Jan 29 14:25:08 2009 -0800

    kprobes: fix module compilation error with CONFIG_KPROBES=n
    
    Define kprobes related data structures even if CONFIG_KPROBES is not set.
    This fixes compilation errors which occur if CONFIG_KPROBES is not set, in
    kprobe using modules.
    
    [akpm@linux-foundation.org: fix build for non-kprobes-supporting architectures]
    Reviewed-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 252523ef2421b803de4810876223e4d695f23ec6
Author: Robin Holt <holt@sgi.com>
Date:   Thu Jan 29 14:25:07 2009 -0800

    sgi-xpc: fix up stale DBUG_ON statements
    
    Clean up the stale DBUG_ON checks and add a couple new ones.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 17e2161654da4e6bdfd8d53d4f52e820ee93f423
Author: Robin Holt <holt@sgi.com>
Date:   Thu Jan 29 14:25:07 2009 -0800

    sgi-xpc: Remove NULL pointer dereference.
    
    If the bte copy fails, the attempt to retrieve payloads merely returns a
    null pointer deref and not NULL as was expected.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 69b3bb65fa97a1e8563518dbbc35cd57beefb2d4
Author: Robin Holt <holt@sgi.com>
Date:   Thu Jan 29 14:25:06 2009 -0800

    sgi-xpc: ensure flags are updated before bte_copy
    
    The clearing of the msg->flags needs a barrier between it and the notify
    of the channel threads that the messages are cleaned and ready for use.
    
    Signed-off-by: Robin Holt <holt@sgi.com>
    Signed-off-by: Dean Nelson <dcn@sgi.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit de33c8db5910cda599899dd431cc30d7c1018cbf
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Thu Jan 29 17:46:42 2009 -0800

    Fix OOPS in mmap_region() when merging adjacent VM_LOCKED file segments
    
    As of commit ba470de43188cdbff795b5da43a1474523c6c2fb ("map: handle
    mlocked pages during map, remap, unmap") we now use the 'vma' variable
    at the end of mmap_region() to handle the page-in of newly mapped
    mlocked pages.
    
    However, if we merged adjacent vma's together, the vma we're using may
    be stale.  We historically consciously avoided using it after the merge
    operation, but that got overlooked when redoing the locked page
    handling.
    
    This commit simplifies mmap_region() by doing any vma merges early,
    avoiding the issue entirely, and 'vma' will always be valid.  As pointed
    out by Hugh Dickins, this depends on any drivers that change the page
    offset of flags to have set one of the VM_SPECIAL bits (so that they
    cannot trigger the early merge logic), but that's true in general.
    
    Reported-and-tested-by: Maksim Yevmenkin <maksim.yevmenkin@gmail.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
    Cc: Nick Piggin <npiggin@suse.de>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Hugh Dickins <hugh@veritas.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit f99ec0649accb581cf3e8fcfeea796e82d05f4ea
Author: Philippe De Muyter <phdm@macqel.be>
Date:   Thu Jan 29 17:35:04 2009 -0800

    tulip: fix 21142 with 10Mbps without negotiation
    
    with current kernels, tulip 21142 ethernet controllers fail to connect
    to a 10Mbps only (i.e. without negotiation-partner) network.  It used
    to work in 2.4 kernels.  Fix that.  Tested on a 21142 Rev 0x11.
    
    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c25b9abbc2c2c0da88e180c3933d6e773245815a
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Thu Jan 29 17:32:20 2009 -0800

    drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic
    
    Fix inverted logic
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e5664bb2a7fd8ae1bee1281c2e44653c471af9ca
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Jan 29 17:31:13 2009 -0800

    gianfar: Fix Wake-on-LAN support
    
    commit 0f0ca340e57bd7446855fefd07a64249acf81223 ("phy: power
    management support") caused a regression in the gianfar driver.
    
    Now phylib turns off PHY power during suspend, and thus WOL
    doesn't work anymore.
    
    This patch workarounds the issue by enabling wakeup in the MDIO
    device, i.e. just restores the old behaviour for the gianfar
    driver. Note that this way all PHYs on a given MDIO bus won't
    be turned off during suspend, which isn't good from the power
    saving point of view.
    
    A proper, per netdevice wakeup management support will need
    a bit reworked phylib suspend/resume logic.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f307dbd88d82c4ccab7aec49613c366023b89cde
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Thu Jan 29 17:30:00 2009 -0800

    smsc911x: timeout reaches -1
    
    With a postfix decrement the timeout will reach -1 rather than 0,
    so the warning will not be issued.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Acked-by: Steve Glendinning <steve.glendinning@smsc.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1609559547ae0ddc2e4829c7f78ac2c4869875b9
Author: Steve Glendinning <steve.glendinning@smsc.com>
Date:   Thu Jan 29 17:29:15 2009 -0800

    smsc9420: fix interrupt signalling test failures
    
    smsc9420 performs an interrupt signalling test when the interface is
    brought up.  The current code mistakenly sets its test flag to false
    AFTER enabling the software interrupt source, making failure quite
    likely.
    
    This patch changes the code to set the test flag BEFORE enabling
    interrupts. I've also removed an smp_wmb because the following spinlock
    provides an implicit memory barrier.
    
    Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b1c4a9dddf09fe99b8f88252718ac5b357363dc4
Author: Haiying Wang <Haiying.Wang@freescale.com>
Date:   Thu Jan 29 17:28:04 2009 -0800

    ucc_geth: Change uec phy id to the same format as gianfar's
    
    The commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 ("gianfar: Convert
    gianfar to an of_platform_driver") changes the gianfar's phy id to the
    format like "mdio@xxxx:xx", but uec still uses the old format like
    "xxxxxxxx:xx".  For the board whose UEC uses gianfar-mdio like
    MPC8568MDS, the phy can not be attached because of the incompatible
    phy id format. This patch changes uec's phy id to the same format as
    gianfar's.
    
    Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1af7ad51049d6a310a19d497960597198290ddfa
Author: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Date:   Thu Jan 29 17:18:31 2009 -0800

    wimax: fix build issue when debugfs is disabled
    
    As reported by Toralf Förster and Randy Dunlap.
    
    - http://linuxwimax.org/pipermail/wimax/2009-January/000460.html
    
    - http://lkml.org/lkml/2009/1/29/279
    
    The definitions needed for the wimax stack and i2400m driver debug
    infrastructure was, by mistake, compiled depending on CONFIG_DEBUG_FS
    (by them being placed in the debugfs.c files); thus the build broke in
    2.6.29-rc3 when debugging was enabled (CONFIG_WIMAX_DEBUG) and
    DEBUG_FS was disabled.
    
    These definitions are always needed if debug is enabled at compile
    time (independently of DEBUG_FS being or not enabled), so moving them
    to a file that is always compiled fixes the issue.
    
    Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 05dfdbbd678ea2b642db73f48b75667a23d15484
Author: Mark Wallis <mwallis@serialmonkey.com>
Date:   Mon Jan 26 17:32:35 2009 +1100

    lguest: Fix a memory leak with the lg object during launcher close
    
    Fix a memory leak identified by Rusty Russell during LCA09 by
    kfree'ing the lg object instead of just clearing it when the
    launcher closes.
    
    Signed-off-by: Mark Wallis <mwallis@serialmonkey.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit b44d49ab0954accefba4c71274ab58abe1c25c52
Author: Tim 'mithro' Ansell <mithro@mithis.com>
Date:   Thu Jan 22 15:06:41 2009 +1100

    lguest: disable the FORTIFY for lguest.
    
    Makes all the warnings go away when compiling lguest on Ubuntu on
    Intrepid or greater.
    
    Signed-off-by: Timothy R Ansell <mithro@mithis.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 72410af921cbc9018da388ca1ddf75880a033ac1
Author: Atsushi SAKAI <sakaia@jp.fujitsu.com>
Date:   Fri Jan 16 20:39:14 2009 +0900

    lguest: typos fix
    
    3 points
    
    lguest_asm.S => i386_head.S
    LHCALL_BREAK => LHREQ_BREAK
    perferred    => preferred
    
    Signed-off-by: Atsushi SAKAI <sakaia@jp.fujitsu.com>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit 584dbe9475313e117abf9d2af88164edfd429c9a
Author: Daniel Marjamäki <danielm77@spray.se>
Date:   Thu Jan 29 08:55:56 2009 +0000

    netxen: fix memory leak in drivers/net/netxen_nic_init.c
    
    For kernel bugzilla #12537:
    http://bugzilla.kernel.org/show_bug.cgi?id=12537
    
    Free memory.
    
    Signed-off-by: Daniel Marjamäki <danielm77@spray.se>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit df1c46b2b6876d0a1b1b4740f009fa69d95ebbc9
Author: David S. Miller <davem@davemloft.net>
Date:   Thu Jan 29 16:53:35 2009 -0800

    tun: Add some missing TUN compat ioctl translations.
    
    Based upon a report from Michael Tokarev <mjt@tls.msk.ru>:
    
    	Just saw in dmesg:
    
    	ioctl32(kvm:4408): Unknown cmd fd(9) cmd(800454cf){t:'T';sz:4} arg(ffc668e4) on /dev/net/tun
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9d8dba6c979fa99c96938c869611b9a23b73efa9
Author: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>
Date:   Thu Jan 29 16:19:13 2009 -0800

    ipv4: fix infinite retry loop in IP-Config
    
    Signed-off-by: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 58092d1e0a896eb1d9163d58f93df7ed704fa8e1
Author: Stephen Hemminger <shemminger@vyatta.com>
Date:   Thu Jan 29 16:16:31 2009 -0800

    net: update documentation ip aliases
    
    This documentation is old.  Add a short note to describe why aliases
    are no long necessary, and remove the old contact/edit info.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 71b3346d182355f19509fadb8fe45114a35cc499
Author: Shyam Iyer <shyam_iyer@dell.com>
Date:   Thu Jan 29 16:12:42 2009 -0800

    net: Fix OOPS in skb_seq_read().
    
    It oopsd for me in skb_seq_read. addr2line said it was
    linux-2.6/net/core/skbuff.c:2228, which is this line:
    
    
    	while (st->frag_idx < skb_shinfo(st->cur_skb)->nr_frags) {
    
    
    I added some printks in there and it looks like we hit this:
    
            } else if (st->root_skb == st->cur_skb &&
                       skb_shinfo(st->root_skb)->frag_list) {
                     st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
                     st->frag_idx = 0;
                     goto next_skb;
            }
    
    
    
    Actually I did some testing and added a few printks and found that the
    st->cur_skb->data was 0 and hence the ptr used by iscsi_tcp was null.
    This caused the kernel panic.
    
     	if (abs_offset < block_limit) {
    -		*data = st->cur_skb->data + abs_offset;
    +		*data = st->cur_skb->data + (abs_offset - st->stepped_offset);
    
    I enabled the debug_tcp and with a few printks found that the code did
    not go to the next_skb label and could find that the sequence being
    followed was this -
    
    It hit this if condition -
    
            if (st->cur_skb->next) {
                    st->cur_skb = st->cur_skb->next;
                    st->frag_idx = 0;
                    goto next_skb;
    
    And so, now the st pointer is shifted to the next skb whereas actually
    it should have hit the second else if first since the data is in the
    frag_list.
    
            else if (st->root_skb == st->cur_skb &&
                     skb_shinfo(st->root_skb)->frag_list) {
                    st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
                    goto next_skb;
            }
    
    Reversing the two conditions the attached patch fixes the issue for me
    on top of Herbert's patches.
    
    Signed-off-by: Shyam Iyer <shyam_iyer@dell.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 95e3b24cfb4ec0479d2c42f7a1780d68063a542a
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date:   Thu Jan 29 16:07:52 2009 -0800

    net: Fix frag_list handling in skb_seq_read
    
    The frag_list handling was broken in skb_seq_read:
    
    1) We didn't add the stepped offset when looking at the head
    are of fragments other than the first.
    
    2) We didn't take the stepped offset away when setting the data
    pointer in the head area.
    
    3) The frag index wasn't reset.
    
    This patch fixes both issues.
    
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e125646ab56b490d0390b158e0afa9cccfc1f897
Author: Dhananjay Phadke <dhananjay@netxen.com>
Date:   Thu Jan 29 16:05:19 2009 -0800

    netxen: revert jumbo ringsize
    
    Reducing jumbo ring size below 1024 reduces throughput for old
    firmwares (3.4.216 and older) running on older (NX2031) chip,
    so restore it back to 1024.
    
    This was reduced in commit 32ec803348b4d5f1353e1d7feae30880b8b3e342
    ("netxen: reduce memory footprint").
    
    Raising jumbo ring size from 512 to 1024, adds ~4MB per port, but
    there's still big saving because of original patch (~20MB per port).
    
    Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ae9e47e9e864bc5f0a7a7e71dc3f287196b3626b
Merge: a4e6db0... be00937...
Author: David S. Miller <davem@davemloft.net>
Date:   Thu Jan 29 15:27:47 2009 -0800

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

commit be0093705c3ce98d73cac0ca8f93ea105cdf4e9c
Author: Bob Copeland <me@bobcopeland.com>
Date:   Thu Jan 22 08:44:16 2009 -0500

    ath5k: fix locking in ath5k_config
    
    ath5k_config updates the software context without taking sc->lock.
    
    Changes-licensed-under: 3-Clause-BSD
    
    Signed-off-by: Bob Copeland <me@bobcopeland.com>
    Acked-by: Nick Kossifidis <mickflemm@gmail.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 667ecd010d870f861a9e276aaaca8cb443ded8b3
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date:   Thu Jan 22 15:05:43 2009 -0800

    cfg80211: print correct intersected regulatory domain
    
    When CONFIG_CFG80211_REG_DEBUG is enabled and an intersection
    occurs we are printing the regulatory domain passed by CRDA
    and indicating its the intersected regulatory domain. Lets fix
    this and print the intersection as originally intended.
    
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Acked-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 615aab4b75dfa77b00c372330d6f70edd2458bf9
Author: Luis R. Rodriguez <lrodriguez@atheros.com>
Date:   Thu Jan 22 15:05:46 2009 -0800

    cfg80211: Fix sanity check on 5 GHz when processing country IE
    
    This fixes two issues with the sanity check loop when processing
    the country IE:
    
    1. Do not use frequency for the current subband channel check,
       this was a big fat typo.
    2. Apply the 5 GHz 4-channel steps when considering max channel
       on each subband as was done with a recent patch.
    
    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 1f304e4e3bb161163d9f5bc3c6467a2a6fa9b3ae
Author: Zhu, Yi <yi.zhu@intel.com>
Date:   Fri Jan 23 13:45:22 2009 -0800

    iwlwifi: fix kernel oops when ucode DMA memory allocation failure
    
    The patch fixes memcpy to NULL address when the ucode DMA allocation failure.
    
    This is a fix to bug
    http://www.intellinuxwireless.org/bugzilla/show_bug.cgi?id=1861
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit eb83bbf57429ab80f49b413e3e44d3b19c3fdc5a
Author: Larry Finger <Larry.Finger@lwfinger.net>
Date:   Tue Jan 27 12:31:23 2009 -0600

    rtl8187: Fix error in setting OFDM power settings for RTL8187L
    
    After reports of poor performance, a review of the latest vendor driver
    (rtl8187_linux_26.1025.0328.2007) for RTL8187L devices was undertaken.
    
    A difference was found in the code used to index the OFDM power tables. When
    the Linux driver was changed, my unit works at a much greater range than
    before. I think this fixes Bugzilla #12380 and has been tested by at least
    two other users.
    
    Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
    Tested-by: Martín Ernesto Barreyro <barreyromartin@gmail.com>
    Cc: Stable <stable@kernel.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e6a271651e9e7810c1802bb8375967f6efa4baea
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Mon Jan 26 19:35:28 2009 +0100

    mac80211: remove Michael Wu as maintainer
    
    His email address keeps bouncing, and he's not interested in mac80211
    patches etc. anyway.
    
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 1448d7c6a2ff96d3b52ecae49e2d0f046a097fe0
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Thu Jan 29 00:13:20 2009 +0100

    ieee1394: sbp2: add workarounds for 2nd and 3rd generation iPods
    
    as per https://bugs.launchpad.net/bugs/294391.  These got one sample of
    each iPod generation going.  However there still occurred I/O stalls
    with the 3rd generation iPod which remain undiagnosed at the time of
    this writing.
    
    Acked-by: Jarod Wilson <jarod@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit c8c4707cf7ca8ff7dcc1653447e48cb3de0bf114
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Thu Jan 29 00:11:59 2009 +0100

    firewire: sbp2: add workarounds for 2nd and 3rd generation iPods
    
    According to https://bugs.launchpad.net/bugs/294391
      - 3rd generation iPods need the "fix capacity" workaround after all
        (apparently they crash after the last sector was accessed),
      - 2nd generation iPods need the "128 kB maximum request size"
        workaround.
    
    Alas both iPod generations feature the same model ID in the config ROM,
    hence we can only define a shared quirks list entry for them.  Luckily
    the fix capacity workaround did not show a negative effect in Jarod's
    tests with 2nd gen. iPod.
    
    A side note:  Apple computers in target mode (or at least an x86 Mac
    mini) don't have firmware_version and model_id, hence none of the iPod
    quirks list entries is active for them.
    
    Tested-by: Jarod Wilson <jarod@redhat.com>
    Acked-by: Jarod Wilson <jarod@redhat.com>
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit de2cf591bc876f7a63809d8955855ab074588c30
Merge: c9de36f... 2a88464...
Author: Takashi Iwai <tiwai@suse.de>
Date:   Thu Jan 29 14:47:56 2009 +0100

    Merge branch 'fix/hda' into for-linus

commit c9de36f2a230919bee95f05ba27ed10ce4850409
Merge: 18e352e... ef390c0...
Author: Takashi Iwai <tiwai@suse.de>
Date:   Thu Jan 29 14:47:53 2009 +0100

    Merge branch 'fix/asoc' into for-linus

commit ef390c0b6e3f4d2d2d43f53f4bd35e1884571a14
Author: Misael Lopez Cruz <x0052729@ti.com>
Date:   Thu Jan 29 13:29:46 2009 +0200

    ASoC: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver
    
    This patch explicitly initializes McBSP Transmit Configuration
    Control Register (XCCR) and Receive Configuration Control
    Register (RCCR) to their reset values. Reset values are 26 ns
    of DX delay and Transmit DMA disabled for XCCR register;
    receive full cycle mode enabled and Receive DMA disabled for
    RCCR register.
    
    This patch requires a counterpart in OMAP McBSP driver before
    to apply it. The required changes in McBSP were sent and approved
    in linux-omap mailing list and patch is going upstream
    (commit 3127f8f8595a064b3f1a1837fea2177902589ac3 from linux-omap-2.6
    tree).
    
    Signed-off-by: Misael Lopez Cruz <x0052729@ti.com>
    [ jarkko.nikula@nokia.com: Commit id for counterpart patch corrected ]
    Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 9e70c1f099c6977d3928879e64fa6af7f903b7b0
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Thu Jan 29 13:08:20 2009 +0000

    ASoC: Fix null string usage with WM8753 DAIs
    
    The WM8753 driver multiplexes the DAI structures it exposes to the
    outside world, leaving them uninitialised until the codec probes.  Since
    the DAI name is used during the registration and setup process provide a
    dummy name.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit bae7eb33b25387fdc7ccae08768bef1f9484a5b0
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Wed Jan 28 23:06:37 2009 +0100

    HID: document difference between hid_blacklist and hid_ignore_list
    
    Many people get it wrong and add device IDs into hid_blacklist instead
    of hid_ignore_list. Let's put a little comment in place.
    
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 656f1fb90aa2261daa316c0dd8f75e3420f81e9e
Author: Jarod Wilson <jarod@redhat.com>
Date:   Wed Jan 28 21:22:35 2009 +0100

    HID: add antec-branded soundgraph imon devices to blacklist
    
    hid_ignore_list additions for the Antec-branded SoundGraph iMon VFD and LCD
    devices (0x15c2:0x0044 and 0x0045).
    
    These devices are driven by lirc.
    
    Signed-off-by: Jarod Wilson <jarod@redhat.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit be5d0c837cf8e43458c5757be5df4837a2803d08
Author: Oliver Neukum <oliver@neukum.org>
Date:   Wed Jan 28 09:36:18 2009 +0100

    HID: fix reversed logic in disconnect testing of hiddev
    
    The logic for testing for disconnection is reversed in an ioctl leading
    to false reports of disconnection.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Tested-by: Folkert van Heusden <folkert@vanheusden.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 0fb21de0799a985d2da3da14ae5625d724256638
Author: Jiri Kosina <jkosina@suse.cz>
Date:   Wed Jan 14 03:03:21 2009 +0100

    HID: adjust report descriptor fixup for MS 1028 receiver
    
    Report descriptor fixup for MS 1028 receiver changes also values for
    Keyboard and Consumer, which incorrectly trims the range, causing correct
    events being thrown away before passing to userspace.
    
    We need to keep the GenDesk usage fixup though, as it reports totally bogus
    values about axis.
    
    Reported-by: Lucas Gadani <lgadani@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit a9ac49d303f967be0dabd97cb722c4a13109c6c2
Author: Jeff Layton <jlayton@redhat.com>
Date:   Thu Jan 22 14:43:21 2009 -0500

    cifs: make sure we allocate enough storage for socket address
    
    The sockaddr declared on the stack in cifs_get_tcp_session is too small
    for IPv6 addresses. Change it from "struct sockaddr" to "struct
    sockaddr_storage" to prevent stack corruption when IPv6 is used.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit da505c386c9f993e43861791dae339b2219cf8dd
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon Jan 19 03:49:35 2009 +0000

    [CIFS] Make socket retry timeouts consistent between blocking and nonblocking cases
    
    We have used approximately 15 second timeouts on nonblocking sends in the past, and
    also 15 second SMB timeout (waiting for server responses, for most request types).
    Now that we can do blocking tcp sends,
    make blocking send timeout approximately the same (15 seconds).
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit f818dd55c4a8b3519e203900bde0bb780d36e799
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon Jan 19 02:38:35 2009 +0000

    [CIFS] some cleanup to dir.c prior to addition of posix_open
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 42c245447c8c3f998dfe880aba18b6e5129d2976
Author: Steve French <sfrench@us.ibm.com>
Date:   Tue Jan 13 22:03:55 2009 +0000

    [CIFS] revalidate parent inode when rmdir done within that directory
    
    When a search is pending of a parent directory, and a child directory
    within it is removed, we need to reset the parent directory's time
    so that we don't reuse the (now stale) search results.
    
    Thanks to Gunter Kukkukk for reporting this:
    
    > got the following failure notification on irc #samba:
    >
    > A user was updating from subversion 1.4 to 1.5, where the
    > repository is located on a samba share (independent of
    > unix extensions = Yes or No).
    > svn 1.4 did work, 1.5 does not.
    >
    > The user did a lot of stracing of subversion - and wrote a
    > testapplet to simulate the failing behaviour.
    > I've converted the C++ source to C and added some error cases.
    >
    > When using "./testdir" on a local file system, "result2"
    > is always (nil) as expected - cifs vfs behaves different here!
    >
    >   ./testdir /mnt/cifs/mounted/share
    >
    > returns a (failing) valid pointer.
    
    Acked-by: Dave Kleikamp <shaggy@us.ibm.com>
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 6a7f8d36c00ab7adef5fb633f7805c91e8c1e139
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon Jan 12 21:03:25 2009 +0000

    [CIFS] Rename md5 functions to avoid collision with new rt modules
    
    When rt modules were added they (each) included their own md5
    with names which collided with the existing names of cifs's md5 functions.
    
    Renaming cifs's md5 modules so we don't collide with them.
    
    > Stephen Rothwell wrote:
    > When CIFS is built-in (=y) and staging/rt28[67]0 =y, there are multiple
    > definitions of:
    >
    > build-r8250.out:(.text+0x1d8ad0): multiple definition of `MD5Init'
    > build-r8250.out:(.text+0x1dbb30): multiple definition of `MD5Update'
    > build-r8250.out:(.text+0x1db9b0): multiple definition of `MD5Final'
    >
    > all of which need to have more unique identifiers for their global
    > symbols (e.g., rt28_md5_init, cifs_md5_init, foo, blah, bar).
    >
    
    CC: Greg K-H <gregkh@suse.de>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 0496e02d8791e7f06673a19a181be30dad6eff70
Author: Jeff Layton <jlayton@redhat.com>
Date:   Tue Dec 30 12:39:16 2008 -0500

    cifs: turn smb_send into a wrapper around smb_sendv
    
    cifs: turn smb_send into a wrapper around smb_sendv
    
    Rename smb_send2 to smb_sendv to make it consistent with kernel naming
    conventions for functions that take a vector.
    
    There's no need to have 2 functions to handle sending SMB calls. Turn
    smb_send into a wrapper around smb_sendv. This also allows us to
    properly mark the socket as needing to be reconnected when there's a
    partial send from smb_send.
    
    Also, in practice we always use the address and noblocksnd flag
    that's attached to the TCP_Server_Info. There's no need to pass
    them in as separate args to smb_sendv.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 7cbcf22548df1f1df7c6b0d0bda579b92efca63c
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Tue Jan 20 16:29:13 2009 -0800

    driver-core: fix kernel-doc parameter name
    
    Fix function parameter name in kernel-doc:
    
    Warning(linux-next-20090120//drivers/base/core.c:1289): No description found for parameter 'dev'
    Warning(linux-next-20090120//drivers/base/core.c:1289): Excess function parameter 'root' description in 'root_device_unregister'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Acked-by: Mark McLoughlin <markmc@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 6a1b699678c8c0d45f88a37b32358a9e82bef6bb
Author: Hans J. Koch <hjk@linutronix.de>
Date:   Wed Jan 7 00:12:37 2009 +0100

    UIO: Add missing documentation of features added recently
    
    The following features were added to the UIO framework in the near past:
    
    * Generic drivers for platform devices (uio_pdrv, uio_pdrv_genirq)
    * an "offset" sysfs attribute for memory mappings
    
    Unfortunately, all this went in without documentation (won't happen again...)
    
    This patch updates UIO documentation.
    
    Signed-off-by: Hans J. Koch <hjk@linutronix.de>
    Acked-by: Uwe Kleine-König <ukleinek@strlen.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 720893fd5fb6de1f752f816a89e630f08ae8b20a
Author: Tsugikazu Shibata <tshibata@ab.jp.nec.com>
Date:   Fri Jan 23 09:59:50 2009 +0900

    Sync patch for jp_JP/stable_kernel_rules.txt
    
    Updated jp_JP/stable_kernel_rules.txt due to changes in the main version
    of the file.
    
    Also, this patch is already reviewed by Japanese translation community
    called JF.
    
    Signed-off-by: Tsugikazu Shibata <tshibata@ab.jp.nec.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit dcbbcefb6a6d540b605421e85fbaa4cea3fef5a2
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Wed Jan 28 22:14:17 2009 +0100

    Staging: poch: fix verification of memory area
    
    fix verification of memory area
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 05d6d677ab4b975697c6a987f1dffdc55d61a160
Author: Roel Kluin <roel.kluin@gmail.com>
Date:   Fri Dec 19 23:37:30 2008 +0100

    Staging: usbip: usbip_start_threads(): handle kernel_thread failure
    
    kernel_thread may fail, notice this.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit e48d94dac7eef16b4a4f246bf7b8df0f00cc0aec
Author: Geert Uytterhoeven <geert@linux-m68k.org>
Date:   Mon Jan 12 09:19:42 2009 +0100

    staging: agnx: drivers/staging/agnx/agnx.h needs <linux/io.h>
    
    On m68k:
    drivers/staging/agnx/agnx.h: In function 'agnx_read32':
    drivers/staging/agnx/agnx.h:10: error: implicit declaration of function 'ioread32'
    drivers/staging/agnx/agnx.h: In function 'agnx_write32':
    drivers/staging/agnx/agnx.h:15: error: implicit declaration of function 'iowrite32'
    drivers/staging/agnx/sta.c: In function 'get_sta_power':
    drivers/staging/agnx/sta.c:94: error: implicit declaration of function 'memcpy_fromio'
    drivers/staging/agnx/sta.c: In function 'set_sta_power':
    drivers/staging/agnx/sta.c:103: error: implicit declaration of function 'memcpy_toio'
    
    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 1176e83aff6f15b6ae4d1b53c16124884ad29363
Author: Oleg Nesterov <oleg@redhat.com>
Date:   Sun Jan 18 18:17:20 2009 +0100

    Staging: android: task_get_unused_fd_flags: fix the wrong usage of tsk->signal
    
    Compile tested.
    
    task_struct->signal is not protected by RCU, the code is bogus.
    Change the code to take ->siglock to pin ->signal.
    
    Signed-off-by: Oleg Nesterov <oleg@redhat.com>
    Cc: Arve Hjønnevåg <arve@android.com>
    Cc: Brian Swetland <swetland@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 191805ac41a63929003faa33365027d3fb924d71
Author: Arve Hjønnevåg <arve@android.com>
Date:   Wed Jan 14 16:54:16 2009 -0800

    Staging: android: Add lowmemorykiller documentation.
    
    Signed-off-by: Arve Hjønnevåg <arve@android.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 07960058f0ce77ddc3027d3e45a5de1fb977334f
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Wed Jan 28 15:42:43 2009 -0800

    Staging: android: fix build error on 64bit boxes
    
    ktime_t isn't ment to directly access on all arches, so use the proper
    conversion functions instead to figure out what time is remaining.
    
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Arve Hjønnevåg <arve@android.com>
    Cc: Mike Lockwood <lockwood@android.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 2d0db6bf5010c26beb1ccbd4ee50991fd2c05d90
Author: Arve Hjønnevåg <arve@android.com>
Date:   Thu Jan 8 16:48:46 2009 -0800

    Staging: android: timed_gpio: Fix build to build on kernels after 2.6.25.
    
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Cc: Mike Lockwood <lockwood@android.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c171ac36b74f6c90bc7a03c309136ba175314b6d
Author: Arve Hjønnevåg <arve@android.com>
Date:   Thu Jan 8 15:28:50 2009 -0800

    Staging: android: binder: fix arm build errors
    
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 7c5151fbf134e082bc7f2c0ed02684ed12578b3b
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri Jan 16 18:01:57 2009 -0800

    Staging: meilhaus: fix Kbuild
    
    The Meilhaus drivers do not like being built into the kernel right now,
    so force them to be a module.
    
    Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit c69a1f09430c7a62b87af89383998256fcf07685
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date:   Fri Jan 16 17:59:15 2009 -0800

    Staging: comedi: fix Kbuild
    
    comedi doesn't like being built into the kernel right now, so force it
    to be a module.
    
    Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 5e2125677fd72d36396cc537466e07ffcbbd4b2b
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Wed Jan 28 01:03:34 2009 +0100

    firewire: sbp2: fix DMA mapping leak on the failure path
    
    Reported-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    who also provided a first version of the fix.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit f746072abc12d0e10ecd7847f1846157fde15987
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Jan 24 19:41:46 2009 +0100

    firewire: sbp2: define some magic numbers as macros
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit a08e100aece16e33a45b82924ad85f4066c4ed1c
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Jan 24 19:41:46 2009 +0100

    firewire: sbp2: fix payload limit at S1600 and S3200
    
    1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter
    limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3).
    
    Our previously too large limit doesn't matter though if the controller
    reports its max_receive correctly.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit c1fbdd78517a9323ea5f5767c8ceb10aabc40fc2
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Jan 24 19:41:46 2009 +0100

    ieee1394: sbp2: don't assume zero model_id or firmware_revision if there is none
    
    This makes sbp2 behave more like firewire-sbp2 which reports 0xff000000
    as immediate value if there are no unit directory entries for model_id
    or firmware_revision.
    
    It does not reduce matches with the currently existing quirks table; the
    only zero entry there is for a device which actually does have a zero
    model_id.  It only changes how model_id and firmware_revision are logged
    if they are missing.
    
    Other functionally unrelated changes:  The model_id member of quirks
    list entries is renamed to model;  the value (but not the effect) of
    SBP2_ROM_VALUE_WILDCARD is changed.  Now this part of the source is
    identical with firewire-sbp2 for easier maintenance.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit d3e3e970e3722c51e3fd3b042b6065d4bfaf6f81
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Jan 24 19:41:46 2009 +0100

    ieee1394: sbp2: fix payload limit at S1600 and S3200
    
    1394-2008 clause 16.3.4.1 (1394b-2002 clause 16.3.1.1) defines tighter
    limits than 1394-2008 clause 6.2.2.3 (1394a-2000 clause 6.2.2.3).
    
    Our previously too large limit doesn't matter though if the controller
    reports its max_receive correctly.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 4106ceff15495a7df1617e78bbf3e852fe6601c9
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Mon Jan 19 19:20:31 2009 +0100

    ieee1394: sbp2: update a help string
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 82d4b90debaa7ab3590335c1b641eb3d2ebb164e
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Mon Jan 19 19:19:55 2009 +0100

    ieee1394: support for speeds greater than S800
    
    The hard-wired configuration of the top speed (until now S800) was
    unnecessary, remove it.
    
    If the local link layer controller supports S1600 or S3200, we now
    assume this speed for all present 1394b PHYs (except if they are
    behind 1394a repeaters) until nodemgr figured out the actual speed
    while fetching the config ROM.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 2a88464ceb1bda2571f88902fd8068a6168e3f7b
Author: Luke Yelavich <themuso@ubuntu.com>
Date:   Wed Jan 28 15:58:38 2009 +1100

    ALSA: hda - add another MacBook Pro 4, 1 subsystem ID
    
    Add another MacBook Pro 4,1 SSID (106b:3800). It seems that latter revisions,
    (at least mine), have different IDs to earlier revisions.
    
    Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit a4e6db07984529847c6ad8bc616485e721dcb809
Author: David S. Miller <davem@davemloft.net>
Date:   Tue Jan 27 22:41:03 2009 -0800

    ipv6: Make mc_forwarding sysctl read-only.
    
    The kernel manages this value internally, as necessary, as
    VIFs are added/removed and as multicast routers are registered
    and deregistered.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1d6e55f195128813f96458203a9fa14204f9251e
Author: Thomas Goff <thomas.goff@boeing.com>
Date:   Tue Jan 27 22:39:59 2009 -0800

    IPv6: Fix multicast routing bugs.
    
    This patch addresses the IPv6 multicast routing issues described
    below.  It was tested with XORP 1.4/1.5 as the IPv6 PIM-SM routing
    daemon against FreeBSD peers.
    
    net/ipv6/ip6_input.c:
    
      - Don't try to forward link-local multicast packets.
    
      - Don't reset skb2->dev before calling ip6_mr_input() so packets can
        be identified as coming from the PIM register vif properly.
    
    net/ipv6/ip6mr.c:
    
      - Fix incoming PIM register messages processing:
    
        * The IPv6 pseudo-header should be included when checksumming PIM
          messages (RFC 4601 section 4.9; RFC 3973 section 4.7.1).
    
        * Packets decapsulated from PIM register messages should have
          skb->protocol ETH_P_IPV6.
    
      - Enable/disable IPv6 multicast forwarding on the corresponding
        interface when a routing daemon adds/removes a multicast virtual
        interface.
    
      - Remove incorrect skb_pull() to fix userspace signaling.
    
      - Enable/disable global IPv6 multicast forwarding when an IPv6
        multicast routing socket is opened/closed.
    
    net/ipv6/route.c:
    
      - Don't use strict routing logic for packets decapsulated from PIM
        register messages (similar to disabling rp_filter for the IPv4
        case).
    
    Signed-off-by: Thomas Goff <thomas.goff@boeing.com>
    Reviewed-by: Fred Templin <fred.l.templin@boeing.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6c06a478c9e59d1584a5dc1b2b3519bae5d6546a
Author: Jiri Pirko <jpirko@redhat.com>
Date:   Tue Jan 27 22:30:19 2009 -0800

    net: fix xfrm reverse flow lookup for icmp6
    
    This patch fixes the xfrm reverse flow lookup for icmp6 so that icmp6 packets
    don't get lost over ipsec tunnels. Similar patch is in RHEL5 kernel for a quite
    long time and I do not see why it isn't in mainline.
    
    Signed-off-by: Jiri Pirko <jpirko@redhat.com>
    Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 94cd3e6cbebf85903b4d53ed2147bdb4c6e08625
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Tue Jan 27 17:45:10 2009 -0800

    net: wrong test in inet_ehash_locks_alloc()
    
    In commit 9db66bdcc83749affe61c61eb8ff3cf08f42afec (net: convert
    TCP/DCCP ehash rwlocks to spinlocks), I forgot to change one
    occurrence of rwlock_t to spinlock_t
    
    I believe sizeof(raw_spinlock_t) might be > 0 on !CONFIG_SMP if
    CONFIG_DEBUG_SPINLOCK while sizeof(raw_rwlock_t) should be 0 in this
    case.
    
    Fortunatly, CONFIG_DEBUG_SPINLOCK adds fields to both spinlock_t and
    rwlock_t, but at this might change in the future (being able to debug
    spinlocks but not rwlocks for example), better to be safe.
    
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 15b2bee22a0390d951301b53e83df88d0350c499
Author: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date:   Tue Jan 27 16:41:58 2009 -0800

    e1000: fix bug with shared interrupt during reset
    
    A nasty bug was found where an MTU change (or anything else that caused a
    reset) could race with the interrupt code.  The interrupt code was entered
    by a shared interrupt during the MTU change.
    
    This change prevents the interrupt code from running while the driver is in
    the middle of its reset path.
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 766fb95ba06e1bbf531d30dc05e21b2d4a0e8dd2
Author: Sidney Amani <seed@uffs.org>
Date:   Tue Jan 27 10:11:46 2009 +0100

    UBI: allow direct user-space I/O
    
    Introduce a new ioctl UBI_IOCSETPROP to set properties
    on a volume. Also add the first property:
    UBI_PROP_DIRECT_WRITE, this property is used to set the
    ability to use direct writes in userspace
    
    Signed-off-by: Sidney Amani <seed@uffs.org>
    Signed-off-by: Corentin Chary <corentincj@iksaif.net>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 5801f992276366cd6a4f1f9939a4c9da33d499ee
Author: Takashi Iwai <tiwai@suse.de>
Date:   Tue Jan 27 12:53:22 2009 +0100

    ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n
    
      sound/pci/hda/patch_conexant.c:352: warning: 'conexant_add_jack' defined but not used
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit aa9d823bb347fb66cb07f98c686be8bb85cb6a74
Author: Joerg Schirottke <master@kanotix.com>
Date:   Tue Jan 27 11:01:34 2009 +0100

    ALSA: hda - Add quirk for HP DV6700 laptop
    
    Added the matching model=laptop for HP DV6700 laptop.
    
    Signed-off-by: Joerg Schirottke <master@kanotix.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 9fa5fdf291c9b58b1cb8b4bb2a0ee57efa21d635
Author: Dimitris Michailidis <dm@chelsio.com>
Date:   Mon Jan 26 22:15:31 2009 -0800

    tcp: Fix length tcp_splice_data_recv passes to skb_splice_bits.
    
    tcp_splice_data_recv has two lengths to consider: the len parameter it
    gets from tcp_read_sock, which specifies the amount of data in the skb,
    and rd_desc->count, which is the amount of data the splice caller still
    wants.  Currently it passes just the latter to skb_splice_bits, which then
    splices min(rd_desc->count, skb->len - offset) bytes.
    
    Most of the time this is fine, except when the skb contains urgent data.
    In that case len goes only up to the urgent byte and is less than
    skb->len - offset.  By ignoring len tcp_splice_data_recv may a) splice
    data tcp_read_sock told it not to, b) return to tcp_read_sock a value > len.
    
    Now, tcp_read_sock doesn't handle used > len and leaves the socket in a
    bad state (both sk_receive_queue and copied_seq are bad at that point)
    resulting in duplicated data and corruption.
    
    Fix by passing min(rd_desc->count, len) to skb_splice_bits.
    
    Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
    Acked-by: Eric Dumazet <dada1@cosmosbay.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit a7a41acf99d9150b424839b0d7b4f5ad9d211e2d
Author: Manish Katiyar <mkatiyar@gmail.com>
Date:   Mon Jan 26 21:54:21 2009 -0800

    r6040: Remove unused variable pdev from drivers/net/r6040.c
    
    drivers/net/r6040.c:441: warning: unused variable 'pdev'
    
    Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 98322f22eca889478045cf896b572250d03dc45f
Author: Eric Dumazet <dada1@cosmosbay.com>
Date:   Mon Jan 26 21:35:35 2009 -0800

    udp: optimize bind(0) if many ports are in use
    
    commit 9088c5609584684149f3fb5b065aa7f18dcb03ff
    (udp: Improve port randomization) introduced a regression for UDP bind() syscall
    to null port (getting a random port) in case lot of ports are already in use.
    
    This is because we do about 28000 scans of very long chains (220 sockets per chain),
    with many spin_lock_bh()/spin_unlock_bh() calls.
    
    Fix this using a bitmap (64 bytes for current value of UDP_HTABLE_SIZE)
    so that we scan chains at most once.
    
    Instead of 250 ms per bind() call, we get after patch a time of 2.9 ms
    
    Based on a report from Vitaly Mayatskikh
    
    Reported-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Tested-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 8527bec548e01a29c6d1928d20d6d3be71861482
Author: Ira W. Snyder <iws@ovro.caltech.edu>
Date:   Mon Jan 26 21:00:33 2009 -0800

    virtio_net: use correct accessors for scatterlists
    
    Without this fix, virtio_net makes incorrect usage of scatterlists. It sets
    the end of the scatterlist chain after the first element, despite the fact
    that more entries come after it.
    
    If you try to run dma_map_sg() on one of the scatterlists given to you by
    add_buf(), you will get a null pointer oops.
    
    Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9fd9784c91db79e953ea3fe3741f885bdc390a72
Author: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date:   Mon Jan 26 19:26:26 2009 -0500

    ext4: Fix building with EXT4FS_DEBUG
    
    When bg_free_blocks_count was renamed to bg_free_blocks_count_lo in
    560671a0, its uses under EXT4FS_DEBUG were not changed to the helper
    ext4_free_blks_count.
    
    Another commit, 498e5f24, also did not change everything needed under
    EXT4FS_DEBUG, thus making it spill some warnings related to printing
    format.
    
    This commit fixes both issues and makes ext4 build again when
    EXT4FS_DEBUG is enabled.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

commit fdff73f094e7220602cc3f8959c7230517976412
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Mon Jan 26 19:06:41 2009 -0500

    ext4: Initialize the new group descriptor when resizing the filesystem
    
    Make sure all of the fields of the group descriptor are properly
    initialized.  Previously, we allowed bg_flags field to be contain
    random garbage, which could trigger non-deterministic behavior,
    including a kernel OOPS.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12433
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org

commit e747a5c0be3efe5465e45c8e326bc766b1288be6
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Jan 24 20:35:38 2009 +0100

    firewire: core: optimize card shutdown
    
    This fixes a regression by "firewire: keep highlevel drivers attached
    during brief connection loss":  There were 2 seconds unnecessary waiting
    added to the shutdown procedure of each controller.
    
    We use card->link as status flag to signal the device handler that there
    is no use to wait for a come-back.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 64c634ef83991b390ec0503e61f16efb0ba3c60b
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Tue Jan 20 19:09:58 2009 +0100

    ieee1394: ohci1394: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others
    
    Camcorders have a tendency to fail read requests to their config ROM and
    write request to their FCP command register with ack_busy_X.  This has
    become a problem with newer kernels and especially Panasonic camcorders,
    causing AV/C in dvgrab and kino to fail.  Dvgrab for example frequently
    logs "send oops"; kino reports loss of AV/C control.  I suspect that
    lower CPU scheduling latencies in newer kernels made this issue more
    prominent now.
    
    According to
    https://sourceforge.net/tracker/?func=detail&atid=114103&aid=2492640&group_id=14103
    this can be fixed by configuring the FireWire controller for more
    hardware retries for request transmission; these retries are evidently
    more successful than libavc1394's own retry loop (typically 3 tries on
    top of hardware retries).
    
    Presumably the same issue has been reported at
    https://bugzilla.redhat.com/show_bug.cgi?id=449252 and
    https://bugzilla.redhat.com/show_bug.cgi?id=477279 .
    
    Tested-by: Mathias Beilstein
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 8b7b6afaa84708d08139daa08538ca3e56c351f1
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Tue Jan 20 19:10:58 2009 +0100

    firewire: ohci: increase AT req. retries, fix ack_busy_X from Panasonic camcorders and others
    
    Camcorders have a tendency to fail read requests to their config ROM and
    write request to their FCP command register with ack_busy_X.  This has
    become a problem with newer kernels and especially Panasonic camcorders,
    causing AV/C in dvgrab and kino to fail.  Dvgrab for example frequently
    logs "send oops"; kino reports loss of AV/C control.  I suspect that
    lower CPU scheduling latencies in newer kernels made this issue more
    prominent now.
    
    According to
    https://sourceforge.net/tracker/?func=detail&atid=114103&aid=2492640&group_id=14103
    this can be fixed by configuring the FireWire controller for more
    hardware retries for request transmission; these retries are evidently
    more successful than libavc1394's own retry loop (typically 3 tries on
    top of hardware retries).
    
    Presumably the same issue has been reported at
    https://bugzilla.redhat.com/show_bug.cgi?id=449252 and
    https://bugzilla.redhat.com/show_bug.cgi?id=477279 .
    
    In a quick test with a JVC camcorder (which didn't malfunction like the
    reported camcorders), this change decreased the number of ack_busy_X
    from 16 in three runs of dvgrab to 4 in three runs of the same capture
    duration.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit b006854955254a971096c120d4ef115a7c6145fb
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Mon Jan 5 20:43:23 2009 +0100

    firewire: ohci: change "context_stop: still active" log message
    
    The present message is mostly just noise.  We only need to be notified
    if the "active" flag does not go off before the retry loop terminates.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 00a602db1ce9d61319d6f769dee206ec85f19bda
Author: Takashi Iwai <tiwai@suse.de>
Date:   Fri Jan 23 11:55:42 2009 +0100

    ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs
    
    The reference NID for the analog outputs of STAC/IDT codecs is set
    to a fixed number 0x02.  But this isn't always correct and in many
    codecs it points to a non-existing NID.
    
    This patch fixes the initialization of the PCM reference NID taken
    from the actually probed DAC list.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 3d36a0df3b473fb53531484df227f2da8bc7494b
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Sat Jan 17 22:45:54 2009 +0100

    firewire: keep highlevel drivers attached during brief connection loss
    
    There are situations when nodes vanish from the bus and come back
    quickly thereafter:
      - When certain bus-powered hubs are plugged in,
      - when certain devices are plugged into 6-port hubs,
      - when certain disk enclosures are switched from self-power to bus
        power or vice versa and break the daisy chain during the transition,
      - when the user plugs a cable out and quickly plugs it back in, e.g.
        to reorder a daisy chain (works on Mac OS X if done quickly enough),
      - when certain hubs temporarily malfunction during high bus traffic.
    
    Until now, firewire-core reported affected nodes as lost to the
    highlevel drivers (firewire-sbp2 and userspace drivers).  We now delay
    the destruction of device representations until after at least two
    seconds after the last bus reset.  If a "new" device is detected in this
    period whose bus information block and root directory header match that
    of a device which is pending for deletion, we resurrect that device and
    send update calls to highlevel drivers.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

commit 8cd0bbbdff7471163cc6a058be8b8610ddd01d6b
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Mon Mar 24 20:56:40 2008 +0100

    firewire: unnecessary BM delay after generation rollover
    
    Noticed by Jarod Wilson:  The bus manager work was unnecessarily delayed
    each time the bus generation counter rolled over.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Jarod Wilson <jwilson@redhat.com>

commit a5c7f4710fba334bf613d705f97b4471b36446f8
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date:   Wed Mar 19 22:02:40 2008 +0100

    firewire: insist on successive self ID complete events
    
    The whole topology code only works if the old and new topologies which
    are compared come from immediately successive self ID complete events.
    
    If there happened bus resets without self ID complete events in the
    meantime, or self ID complete events with invalid selfIDs, the topology
    comparison could identify nodes wrongly, or more likely just corrupt
    kernel memory or panic right away.
    
    We now discard all nodes of the old topology and treat all current nodes
    as new ones if the current self ID generation is not the previous one
    plus 1.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Jarod Wilson <jwilson@redhat.com>

commit 36b477d005fbda29e7581c3cef7ee31a59d8970b
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Tue Jan 20 18:04:09 2009 +0200

    UBI: fix resource de-allocation
    
    GregKH asked to fix UBI which has fake device release method. Indeed,
    we have to free UBI device description object from the release method,
    because otherwise we'll oops is someone opens a UBI device sysfs file,
    then the device is removed, and he reads the file. With this fix, he
    will get -ENODEV instead of an oops.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 8c4c19f1367435afdc16ac122a2a95a4d6cff9f0
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Tue Jan 20 17:48:02 2009 +0200

    UBI: remove unused variable
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit e7f07968c16bdd9480001c0a9de013ba56889cf9
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Tue Jan 20 09:50:19 2009 -0500

    ext4: Fix ext4_free_blocks() w/o a journal when files have indirect blocks
    
    When trying to unlink a file with indirect blocks on a filesystem
    without a journal, the "circular indirect block" sanity test was
    getting falsely triggered.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

commit 3013ee31b6c5fd9a49a81816d6c13e1cdb7a1288
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Fri Jan 16 19:08:43 2009 +0200

    UBI: use nicer 64-bit math
    
    Get rid of 'do_div()' and use more user-friendly primitives from
    'linux/math64.h'.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit f429b2ea8eadb5a576542a70f7fd6f5c2a7455e1
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Fri Jan 16 18:06:55 2009 +0200

    UBI: add ioctl compatibility
    
    UBI ioctl's do not work when running 64-bit kernel and 32-bit
    user-land. Fix this by adding the compat_ioctl method.
    
    Also, UBI serializes all ioctls, so more than one ioctl at a time
    is not a problem. Amd UBI does not seem to depend on anything else,
    so use unlocked_ioctl instead of ioctl (no BKL needed).
    
    Reported-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Reviewed-by: Arnd Bergmann <arnd@arndb.de>

commit 4d187a88d3ee3be6a1a0b6859eb00f70e1601b5e
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Sun Jan 11 23:55:39 2009 +0100

    UBI: constify file operations
    
    Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit ade44ce07c9316351ae321051221c9bad3af3a44
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Fri Jan 16 18:03:22 2009 +0200

    UBI: allow all ioctls
    
    Some ioctl's in UBI are enabled only when debugging is switched
    on. There is not particular reason for this, just noone needed
    them. However, some people need the now for their user-space
    development. Thus, allow these ioctl's even if UBI debugging
    is disabled.
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 573135b5dbc02be12940558db23158cc9ee89c66
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Fri Jan 16 18:02:08 2009 +0200

    UBI: remove unnecessry header inclusion
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit f7fc6f3f33703e3365c0ef9d4bf322b88cc9dae7
Author: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date:   Wed Jan 7 16:10:58 2009 +0200

    UBI: improve ioctl commentaries
    
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit a27ce8f55dd5fddf0b8ea179cce8f399c13dc94f
Author: Corentin Chary <corentincj@iksaif.net>
Date:   Mon Jan 5 14:48:59 2009 +0100

    UBI: add ioctl for is_mapped operation
    
    This patch adds ioctl to check if an LEB is mapped or not (as a
    debugging option so far).
    
    [Re-named ioctl to make it look the same as the other one and made
     some minor stylistic changes. Artem Bityutskiy.]
    
    Signed-off-by: Corentin Chary <corentincj@iksaif.net>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit c3da23be1673be4e738aea235604b4e6cb259655
Author: Corentin Chary <corentincj@iksaif.net>
Date:   Mon Jan 5 14:46:19 2009 +0100

    UBI: add ioctl for unmap operation
    
    This patch adds ioctl for the LEB unmap operation (as a debugging
    option so far).
    
    [Re-named ioctl to make it look the same as the other one and made
     some minor stylistic changes. Artem Bityutskiy.]
    
    Signed-off-by: Corentin Chary <corentincj@iksaif.net>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 141e6ebd1b1759bd5cebf092b7216b6f1c7b4c4f
Author: Corentin Chary <corentincj@iksaif.net>
Date:   Mon Jan 5 14:44:11 2009 +0100

    UBI: add ioctl for map operation
    
    This patch adds ioctl for the LEB map operation (as a debugging
    option so far).
    
    [Re-named ioctl to make it look the same as the other one and made
     some minor stylistic changes. Artem Bityutskiy.]
    
    Signed-off-by: Corentin Chary <corentincj@iksaif.net>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

commit 08ec8c3878cea0bf91f2ba3c0badf44b383752d0
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Fri Jan 16 11:57:00 2009 -0500

    jbd2: On a __journal_expect() assertion failure printk "JBD2", not "EXT3-fs"
    
    Otherwise it can be very confusing to find a "EXT3-fs: " failure in
    the middle of EXT4-fs failures, and it makes it harder to track the
    source of the failure.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

commit a21102b55c4f8dfd3adb4a15a34cd62237b46039
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Fri Jan 16 11:13:47 2009 -0500

    ext3: Add sanity check to make_indexed_dir
    
    Make sure the rec_len field in the '..' entry is sane, lest we overrun
    the directory block and cause a kernel oops on a purposefully
    corrupted filesystem.
    
    This fixes a bug related to a bug originally reported by Sami Liedes
    for ext4 at:
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12430
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org

commit e6b8bc09ba2075cd91fbffefcd2778b1a00bd76f
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Fri Jan 16 11:13:40 2009 -0500

    ext4: Add sanity check to make_indexed_dir
    
    Make sure the rec_len field in the '..' entry is sane, lest we overrun
    the directory block and cause a kernel oops on a purposefully
    corrupted filesystem.
    
    Thanks to Sami Liedes for reporting this bug.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12430
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org

commit 06a279d636734da32bb62dd2f7b0ade666f65d7c
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Sat Jan 17 18:41:37 2009 -0500

    ext4: only use i_size_high for regular files
    
    Directories are not allowed to be bigger than 2GB, so don't use
    i_size_high for anything other than regular files.  E2fsck should
    complain about these inodes, but the simplest thing to do for the
    kernel is to only use i_size_high for regular files.
    
    This prevents an intentially corrupted filesystem from causing the
    kernel to burn a huge amount of CPU and issuing error messages such
    as:
    
    EXT4-fs warning (device loop0): ext4_block_to_path: block 135090028 > max
    
    Thanks to David Maciejak from Fortinet's FortiGuard Global Security
    Research Team for reporting this issue.
    
    http://bugzilla.kernel.org/show_bug.cgi?id=12375
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Cc: stable@kernel.org

commit c225aa57ff4ffe715df4692676b77c815a337236
Author: Simon Holm Thøgersen <odie@cs.aau.dk>
Date:   Sun Jan 11 22:34:01 2009 -0500

    ext4: fix wrong use of do_div
    
    the following warning:
    
    fs/jbd2/journal.c: In function ‘jbd2_seq_info_show’:
    fs/jbd2/journal.c:850: warning: format ‘%lu’ expects type ‘long
    unsigned int’, but argument 3 has type ‘uint32_t’
    
    is caused by wrong usage of do_div that modifies the dividend in-place
    and returns the quotient. So not only would an incorrect value be
    displayed, but s->journal->j_average_commit_time would also be changed
    to a wrong value!
    
    Fix it by using div_u64 instead.
    
    Signed-off-by: Simon Holm Thøgersen <odie@cs.aau.dk>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>