1. 07 May, 2009 14 commits
  2. 05 May, 2009 8 commits
  3. 02 May, 2009 18 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
    • Linus Torvalds's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 414772fa
      Linus Torvalds authored
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
        kbuild, modpost: Check the section flags, to catch missing "ax"/"aw"
        kbuild: fix comment in modpost.c
        kbuild: fix scripts/setlocalversion with git
        kbuild: fix Module.markers permission error under cygwin
        docs: also clean index.html
        kbuild: remove a tag file before it is regenerated
        kbuild: "make prepare" should be "make modules_prepare"
        kbuild: clean Module.markers and modules.order for out-of-tree modules
        avr32: drop unused CLEAN_FILES
      414772fa
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 7e567b44
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
        ocfs2: Change repository in MAINTAINERS.
        ocfs2: Fix a missing credit when deleting from indexed directories.
        ocfs2/trivial: Remove unused variable in ocfs2_rename.
        ocfs2: Add missing iput() during error handling in ocfs2_dentry_attach_lock()
        ocfs2: Fix some printk() warnings.
        ocfs2: Fix 2 warning during ocfs2 make.
        ocfs2: Reserve 1 more cluster in expanding_inline_dir for indexed dir.
      7e567b44
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 020f932b
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: fix oops in hid_check_keys_pressed()
        HID: fix possible deadlock in usbhid_close()
        HID: Fix the support for apple mini aluminium keyboard
        HID: Add support for the G25 force feedback wheel in native mode
        HID: hidraw -- fix missing unlocks in unlocked_ioctl
      020f932b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev · 912e7796
      Linus Torvalds authored
      * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
        m32r: use __stringify() macro in assembler.h
        m32r: build fix for __stringify macro
      912e7796
    • Ashutosh Naik's avatar
      ibft: fix the display of a few fields in the NIC attribute structure in sysfs · 65fd2105
      Ashutosh Naik authored
      Fix the display of a few fields in the iBFT NIC attribute structure in
      sysfs.
      
      Ensure that, if the DHCP IP address and the subnet mask for the interface
      is present in the iBFT NIC structure, the corresponding entries are
      created in sysfs tree for the device.  This would hence create the
      additional entries in the tree based on the iBFT table and would not
      delete any existing entries.
      Signed-off-by: default avatarAshutosh Naik <ashutosh.naik@gmail.com>
      Cc: Vishnu V <vishnu@chelsio.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      65fd2105
    • Andrea Righi's avatar
      mm: prevent divide error for small values of vm_dirty_bytes · 9e4a5bda
      Andrea Righi authored
      Avoid setting less than two pages for vm_dirty_bytes: this is necessary to
      avoid potential division by 0 (like the following) in get_dirty_limits().
      
      [   49.951610] divide error: 0000 [#1] PREEMPT SMP
      [   49.952195] last sysfs file: /sys/devices/pci0000:00/0000:00:01.1/host0/target0:0:0/0:0:0:0/block/sda/uevent
      [   49.952195] CPU 1
      [   49.952195] Modules linked in: pcspkr
      [   49.952195] Pid: 3064, comm: dd Not tainted 2.6.30-rc3 #1
      [   49.952195] RIP: 0010:[<ffffffff802d39a9>]  [<ffffffff802d39a9>] get_dirty_limits+0xe9/0x2c0
      [   49.952195] RSP: 0018:ffff88001de03a98  EFLAGS: 00010202
      [   49.952195] RAX: 00000000000000c0 RBX: ffff88001de03b80 RCX: 28f5c28f5c28f5c3
      [   49.952195] RDX: 0000000000000000 RSI: 00000000000000c0 RDI: 0000000000000000
      [   49.952195] RBP: ffff88001de03ae8 R08: 0000000000000000 R09: 0000000000000000
      [   49.952195] R10: ffff88001ddda9a0 R11: 0000000000000001 R12: 0000000000000001
      [   49.952195] R13: ffff88001fbc8218 R14: ffff88001de03b70 R15: ffff88001de03b78
      [   49.952195] FS:  00007fe9a435b6f0(0000) GS:ffff8800025d9000(0000) knlGS:0000000000000000
      [   49.952195] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [   49.952195] CR2: 00007fe9a39ab000 CR3: 000000001de38000 CR4: 00000000000006e0
      [   49.952195] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      [   49.952195] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
      [   49.952195] Process dd (pid: 3064, threadinfo ffff88001de02000, task ffff88001ddda250)
      [   49.952195] Stack:
      [   49.952195]  ffff88001fa0de00 ffff88001f2dbd70 ffff88001f9fe800 000080b900000000
      [   49.952195]  00000000000000c0 ffff8800027a6100 0000000000000400 ffff88001fbc8218
      [   49.952195]  0000000000000000 0000000000000600 ffff88001de03bb8 ffffffff802d3ed7
      [   49.952195] Call Trace:
      [   49.952195]  [<ffffffff802d3ed7>] balance_dirty_pages_ratelimited_nr+0x1d7/0x3f0
      [   49.952195]  [<ffffffff80368f8e>] ? ext3_writeback_write_end+0x9e/0x120
      [   49.952195]  [<ffffffff802cc7df>] generic_file_buffered_write+0x12f/0x330
      [   49.952195]  [<ffffffff802cce8d>] __generic_file_aio_write_nolock+0x26d/0x460
      [   49.952195]  [<ffffffff802cda32>] ? generic_file_aio_write+0x52/0xd0
      [   49.952195]  [<ffffffff802cda49>] generic_file_aio_write+0x69/0xd0
      [   49.952195]  [<ffffffff80365fa6>] ext3_file_write+0x26/0xc0
      [   49.952195]  [<ffffffff803034d1>] do_sync_write+0xf1/0x140
      [   49.952195]  [<ffffffff80290d1a>] ? get_lock_stats+0x2a/0x60
      [   49.952195]  [<ffffffff80280730>] ? autoremove_wake_function+0x0/0x40
      [   49.952195]  [<ffffffff8030411b>] vfs_write+0xcb/0x190
      [   49.952195]  [<ffffffff803042d0>] sys_write+0x50/0x90
      [   49.952195]  [<ffffffff8022ff6b>] system_call_fastpath+0x16/0x1b
      [   49.952195] Code: 00 00 00 2b 05 09 1c 17 01 48 89 c6 49 0f af f4 48 c1 ee 02 48 89 f0 48 f7 e1 48 89 d6 31 d2 48 c1 ee 02 48 0f af 75 d0 48 89 f0 <48> f7 f7 41 8b 95 ac 01 00 00 48 89 c7 49 0f af d4 48 c1 ea 02
      [   49.952195] RIP  [<ffffffff802d39a9>] get_dirty_limits+0xe9/0x2c0
      [   49.952195]  RSP <ffff88001de03a98>
      [   50.096523] ---[ end trace 008d7aa02f244d7b ]---
      Signed-off-by: default avatarAndrea Righi <righi.andrea@gmail.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: David Rientjes <rientjes@google.com>
      Cc: Dave Chinner <david@fromorbit.com>
      Cc: Christoph Lameter <cl@linux-foundation.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9e4a5bda
    • Andrew Morton's avatar
      vmscan: avoid multiplication overflow in shrink_zone() · 8713e012
      Andrew Morton authored
      Local variable `scan' can overflow on zones which are larger than
      
      	(2G * 4k) / 100 = 80GB.
      
      Making it 64-bit on 64-bit will fix that up.
      
      Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Cc: Wu Fengguang <fengguang.wu@intel.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8713e012
    • Oleg Nesterov's avatar
      ptrace: s/parent/real_parent/ in binfmt_elf_fdpic.c · 0ae05fb2
      Oleg Nesterov authored
      ->real_parent is the parent. ->parent may be the tracer.
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Acked-by: default avatarDavid Howells <dhowells@redhat.com>
      Acked-by: default avatarRoland McGrath <roland@redhat.com>
      Cc: Greg Ungerer <gerg@snapgear.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0ae05fb2
    • Randy Dunlap's avatar
      kernel-doc: restrict syntax for private: and public: · 52dc5aec
      Randy Dunlap authored
      scripts/kernel-doc can (incorrectly) delete struct members that are
      surrounded by /* ...  */ <struct members> /* ...  */ if there is a /*
      private: */ comment in there somewhere also.
      
      Fix that by making the "/* private:" only allow whitespace between /* and
      "private:", not anything/everything in the world.
      
      This fixes some erroneous kernel-doc warnings that popped up while
      processing include/linux/usb/composite.h.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      52dc5aec