1. 05 May, 2009 13 commits
  2. 04 May, 2009 11 commits
  3. 03 May, 2009 7 commits
  4. 02 May, 2009 9 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · b4348f32
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: fix getbmap vs mmap deadlock
        xfs: a couple getbmap cleanups
        xfs: add more checks to superblock validation
        xfs_file_last_byte() needs to acquire ilock
      b4348f32
    • David Gibson's avatar
      Move dtc and libfdt sources from arch/powerpc/boot to scripts/dtc · 9fffb55f
      David Gibson authored
      The powerpc kernel always requires an Open Firmware like device tree
      to supply device information.  On systems without OF, this comes from
      a flattened device tree blob.  This blob is usually generated by dtc,
      a tool which compiles a text description of the device tree into the
      flattened format used by the kernel.  Sometimes, the bootwrapper makes
      small changes to the pre-compiled device tree blob (e.g. filling in
      the size of RAM).  To do this it uses the libfdt library.
      
      Because these are only used on powerpc, the code for both these tools
      is included under arch/powerpc/boot (these were imported and are
      periodically updated from the upstream dtc tree).
      
      However, the microblaze architecture, currently being prepared for
      merging to mainline also uses dtc to produce device tree blobs.  A few
      other archs have also mentioned some interest in using dtc.
      Therefore, this patch moves dtc and libfdt from arch/powerpc into
      scripts, where it can be used by any architecture.
      
      The vast bulk of this patch is a literal move, the rest is adjusting
      the various Makefiles to use dtc and libfdt correctly from their new
      locations.
      Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9fffb55f
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs · afc1e702
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs:
        configfs: Fix Trivial Warning in fs/configfs/symlink.c
      afc1e702
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 7b39da78
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
        ide-cd: fix REQ_QUIET tests in cdrom_decode_status
      
      Fix up trivial conflicts in include/linux/blkdev.h
      7b39da78
    • Linus Torvalds's avatar
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 2142baba
      Linus Torvalds authored
      * master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
        [ARM] 5489/1: ARM errata: Data written to the L2 cache can be overwritten with stale data
        [ARM] 5490/1: ARM errata: Processor deadlock when a false hazard is created
        [ARM] 5487/1: ARM errata: Stale prediction on replaced interworking branch
        [ARM] 5488/1: ARM errata: Invalidation of the Instruction Cache operation can fail
        davinci: DM644x: NAND: update partitioning
        davinci: update DM644x support in preparation for more SoCs
        davinci: DM644x: rename board file
        davinci: update pin-multiplexing support
        davinci: serial: generalize for more SoCs
        davinci: DM355 IRQ Definitions
        davinci: DM646x: add interrupt number and priorities
        davinci: PSC: Clear bits in MDCTL reg before setting new bits
        davinci: gpio bugfixes
        davinci: add EDMA driver
        davinci: timers: use clk_get_rate()
        [ARM] pxa/littleton: add missing da9034 touchscreen support
        [ARM] pxa/zylonite: configure GPIO18/19 correctly, used by 2 GPIO expanders
        [ARM] pxa/zylonite: fix the issue of unused SDATA_IN_1 pin get AC97 not working
        [ARM] pxa: make ads7846 on corgi and spitz to sync on HSYNC
        [ARM] pxa: remove unused CPU_FREQ_PXA Kconfig symbol
        ...
      2142baba
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip · bb402c4f
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
        x86, mce: fix boot logging logic
        x86, mce: make polling timer interval per CPU
      bb402c4f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 61bd1e85
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (53 commits)
        [SCSI] libosd: OSD2r05: on-the-wire changes for latest OSD2 revision 5.
        [SCSI] libosd: OSD2r05: OSD_CRYPTO_KEYID_SIZE will grow 20 => 32 bytes
        [SCSI] libosd: OSD2r05: Prepare for rev5 attribute list changes
        [SCSI] libosd: fix potential ERR_PTR dereference in osd_initiator.c
        [SCSI] mpt2sas : bump driver version to 01.100.02.00
        [SCSI] mpt2sas: fix hotplug event processing
        [SCSI] mpt2sas : release diagnotic buffers prior host reset
        [SCSI] mpt2sas : Broadcast Primative AEN bug fix
        [SCSI] mpt2sas : Identify Dell series-7 adapters at driver load time
        [SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl
        [SCSI] mpt2sas : running out of message frames
        [SCSI] mpt2sas : fix oops when firmware sends large sense buffer size
        [SCSI] mpt2sas : the sanity check in base_interrupt needs to be on dword boundary
        [SCSI] mpt2sas : unique ioctl magic number
        [SCSI] fix sign extension with 1.5TB usb-storage LBD=y
        [SCSI] ipr: Fix sleeping function called with interrupts disabled
        [SCSI] fcoe: fip: add multicast filter to receive FIP advertisements.
        [SCSI] libfc: Fix compilation warnings with allmodconfig
        [SCSI] fcoe: fix spelling typos and bad comments
        [SCSI] fcoe: don't export functions that are internal to fcoe
        ...
      61bd1e85
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 8c0c3f7f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: document the multi-touch (MT) protocol
        Input: add detailed multi-touch finger data report protocol
        Input: allow certain EV_ABS events to bypass all filtering
        Input: bcm5974 - add documentation for the driver
        Input: bcm5974 - augment debug information
        Input: bcm5974 - Add support for the Macbook 5 (Unibody)
        Input: bcm5974 - add quad-finger tapping
        Input: bcm5974 - prepare for a new trackpad header type
        Input: appletouch - fix DMA to/from stack buffer
        Input: wacom - fix TabletPC touch bug
        Input: lifebook - add DMI entry for Fujitsu B-2130
        Input: ALPS - add signature for Toshiba Satellite Pro M10
        Input: elantech - make sure touchpad is really in absolute mode
        Input: elantech - provide a workaround for jumpy cursor on firmware 2.34
        Input: ucb1400 - use disable_irq_nosync() in irq handler
        Input: tsc2007 - use disable_irq_nosync() in irq handler
        Input: sa1111ps2 - use disable_irq_nosync() in irq handlers
        Input: omap-keypad - use disable_irq_nosync() in irq handler
      8c0c3f7f
    • Trond Myklebust's avatar
      SUNRPC: Fix the problem of EADDRNOTAVAIL syslog floods on reconnect · f75e6745
      Trond Myklebust authored
      See http://bugzilla.kernel.org/show_bug.cgi?id=13034
      
      If the port gets into a TIME_WAIT state, then we cannot reconnect without
      binding to a new port.
      Tested-by: default avatarPetr Vandrovec <petr@vandrovec.name>
      Tested-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f75e6745