1. 25 Sep, 2009 24 commits
  2. 24 Sep, 2009 16 commits
    • Russell King's avatar
      Merge branch 'origin' into for-linus · baea7b94
      Russell King authored
      Conflicts:
      	MAINTAINERS
      baea7b94
    • Roland Dreier's avatar
    • Moni Shoua's avatar
      IPoIB: Don't turn on carrier for a non-active port · 5ee95120
      Moni Shoua authored
      Multicast joins can succeed even if the IB port is down.  This happens
      when the SM runs on the same port with the requesting port.  However,
      IPoIB calls netif_carrier_on() when the join of the broadcast group
      succeeds, without caring about the state of the IB port.  The result
      is an IPoIB interface in RUNNING state but without an active IB port
      to support it.
      
      If a bonding interface uses this IPoIB interface as a slave it might
      not detect that this slave is almost useless and failover
      functionality will be damaged.  The fix checks the state of the IB
      port in the carrier_task before calling netif_carrier_on().
      
      Adresses: https://bugs.openfabrics.org/show_bug.cgi?id=1726
      
      Signed-off-by: default avatarMoni Shoua <monis@voltaire.com>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      5ee95120
    • Al Viro's avatar
      nfs[23] tcp breakage in mount with binary options · 36dd2fdb
      Al Viro authored
      
      
      We forget to set nfs_server.protocol in tcp case when old-style binary
      options are passed to mount.  The thing remains zero and never validated
      afterwards.  As the result, we hit BUG in fs/nfs/client.c:588.
      
      Breakage has been introduced in NFS: Add nfs_alloc_parsed_mount_data
      merged yesterday...
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      36dd2fdb
    • Jaswinder Singh Rajput's avatar
      net: fix htmldocs sunrpc, clnt.c · 7a73fdde
      Jaswinder Singh Rajput authored
      
      
      
        DOCPROC Documentation/DocBook/networking.xml
        Warning(net/sunrpc/clnt.c:647): No description found for parameter 'req'
        Warning(net/sunrpc/clnt.c:647): No description found for parameter 'tk_ops'
        Warning(net/sunrpc/clnt.c:647): Excess function parameter 'ops' description in 'rpc_run_bc_task'
      Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
      Cc: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
      Cc: Benny Halevy <bhalevy@panasas.com>
      Cc: Andy Adamson <andros@netapp.com>
      Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
      Cc: Randy Dunlap <randy.dunlap@oracle.com>
      Cc: David Miller <davem@davemloft.net>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Acked-by: default avatarBenny Halevy <bhalevy@panasas.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      7a73fdde
    • Jack Morgenstein's avatar
      IB/mthca: Fix access to freed memory in catastrophic event handling · d686159e
      Jack Morgenstein authored
      catas_reset() uses a pointer to mthca_dev, but mthca_dev is not valid
      after the call to __mthca_restart_one().
      
      Based on a similar patch for mlx4 (634354d7
      
      , "mlx4: Fix access to
      freed memory") by Vitaliy Gusev <vgusev@openvz.org>
      Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      d686159e
    • Eli Cohen's avatar
      mlx4_core: Pass cache line size to device FW · c57e20dc
      Eli Cohen authored
      
      
      ConnectX can work more efficiently if the CPU cache line size is passed
      to it with the INIT_HCA firmware command.
      Signed-off-by: default avatarEli Cohen <eli@mellanox.co.il>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      c57e20dc
    • Julia Lawall's avatar
      RDMA/nes: Remove duplicate .ndo_set_mac_address field initialization · bdf64381
      Julia Lawall authored
      The definition of nes_netdev_ops has initializations of a local function
      and eth_mac_addr for its ndo_set_mac_address field.  This change uses only
      the local function.
      
      The semantic match that finds this problem is as follows:
      (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @r
      
      @
      identifier I, s, fld;
      position p0,p;
      expression E;
      @@
      
      struct I s =@p0 { ... .fld@p = E, ...};
      
      @s@
      identifier I, s, r.fld;
      position r.p0,p;
      expression E;
      @@
      
      struct I s =@p0 { ... .fld@p = E, ...};
      
      @script:python@
      p0 << r.p0;
      fld << r.fld;
      ps << s.p;
      pr << r.p;
      @@
      
      if int(ps[0].line)!=int(pr[0].line) or int(ps[0].column)!=int(pr[0].column):
        cocci.print_main(fld,p0)
      // </smpl>
      Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      bdf64381
    • Linus Torvalds's avatar
      Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel · 94e0fb08
      Linus Torvalds authored
      * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (57 commits)
        drm/i915: Handle ERESTARTSYS during page fault
        drm/i915: Warn before mmaping a purgeable buffer.
        drm/i915: Track purged state.
        drm/i915: Remove eviction debug spam
        drm/i915: Immediately discard any backing storage for uneeded objects
        drm/i915: Do not mis-classify clean objects as purgeable
        drm/i915: Whitespace correction for madv
        drm/i915: BUG_ON page refleak during unbind
        drm/i915: Search harder for a reusable object
        drm/i915: Clean up evict from list.
        drm/i915: Add tracepoints
        drm/i915: framebuffer compression for GM45+
        drm/i915: split display functions by chip type
        drm/i915: Skip the sanity checks if the current relocation is valid
        drm/i915: Check that the relocation points to within the target
        drm/i915: correct FBC update when pipe base update occurs
        drm/i915: blacklist Acer AspireOne lid status
        ACPI: make ACPI button funcs no-ops if not built in
        drm/i915: prevent FIFO calculation overflows on 32 bits with high dotclocks
        drm/i915: intel_display.c handle latency variable efficiently
        ...
      
      Fix up trivial conflicts in drivers/gpu/drm/i915/{i915_dma.c|i915_drv.h}
      94e0fb08
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · b7f21bb2
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
        x86/PCI: make 32 bit NUMA node array int, not unsigned char
        x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
        MAINTAINTERS: remove hotplug driver entries
        PCI: pciehp: remove slot capabilities definitions
        PCI: pciehp: remove error message definitions
        PCI: pciehp: remove number field
        PCI: pciehp: remove hpc_ops
        PCI: pciehp: remove pci_dev field
        PCI: pciehp: remove crit_sect mutex
        PCI: pciehp: remove slot_bus field
        PCI: pciehp: remove first_slot field
        PCI: pciehp: remove slot_device_offset field
        PCI: pciehp: remove hp_slot field
        PCI: pciehp: remove device field
        PCI: pciehp: remove bus field
        PCI: pciehp: remove slot_num_inc field
        PCI: pciehp: remove num_slots field
        PCI: pciehp: remove slot_list field
        PCI: fix VGA arbiter header file
        PCI: Disable AER with pci=nomsi
        ...
      
      Fixed up trivial conflicts in MAINTAINERS
      b7f21bb2
    • Linus Torvalds's avatar
      Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6 · 7ca263cd
      Linus Torvalds authored
      * 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6:
        [PATCH] Fix idle time field in /proc/uptime
      7ca263cd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze · a6b49cb2
      Linus Torvalds authored
      * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (24 commits)
        microblaze: Disable heartbeat/enable emaclite in defconfigs
        microblaze: Support simpleImage.dts make target
        microblaze: Fix _start symbol to physical address
        microblaze: Use LOAD_OFFSET macro to get correct LMA for all sections
        microblaze: Create the LOAD_OFFSET macro used to compute VMA vs LMA offsets
        microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C
        microblaze: Actually show KiB rather than pages in "Freeing initrd memory:"
        microblaze: Support ptrace syscall tracing.
        microblaze: Updated CPU version and FPGA family codes in PVR
        microblaze: Generate correct signal and siginfo for integer div-by-zero
        microblaze: Don't be noisy when userspace causes hardware exceptions
        microblaze: Remove ipc.h file which points to non-existing asm-generic file
        microblaze: Clear sticky FSR register after generating exception signals
        microblaze: Ensure CPU usermode is set on new userspace processes
        microblaze: Use correct kbuild variable KBUILD_CFLAGS
        microblaze: Save and restore msr in hw exception
        microblaze: Add architectural support for USB EHCI host controllers
        microblaze: Implement include/asm/syscall.h.
        microblaze: Improve checking mechanism for MSR instruction
        microblaze: Add checking mechanism for MSR instruction
        ...
      a6b49cb2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · 2c9871de
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        module: don't call percpu_modfree on NULL pointer.
        module: fix memory leak when load fails after srcversion/version allocated
        module: preferred way to use MODULE_AUTHOR
        param: allow whitespace as kernel parameter separator
        module: reduce string table for loaded modules (v2)
        module: reduce symbol table for loaded modules (v2)
      2c9871de
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · dc2af6a6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (42 commits)
        Btrfs: hash the btree inode during  fill_super
        Btrfs: relocate file extents in clusters
        Btrfs: don't rename file into dummy directory
        Btrfs: check size of inode backref before adding hardlink
        Btrfs: fix releasepage to avoid unlocking extents we haven't locked
        Btrfs: Fix test_range_bit for whole file extents
        Btrfs: fix errors handling cached state in set/clear_extent_bit
        Btrfs: fix early enospc during balancing
        Btrfs: deal with NULL space info
        Btrfs: account for space used by the super mirrors
        Btrfs: fix extent entry threshold calculation
        Btrfs: remove dead code
        Btrfs: fix bitmap size tracking
        Btrfs: don't keep retrying a block group if we fail to allocate a cluster
        Btrfs: make balance code choose more wisely when relocating
        Btrfs: fix arithmetic error in clone ioctl
        Btrfs: add snapshot/subvolume destroy ioctl
        Btrfs: change how subvolumes are organized
        Btrfs: do not reuse objectid of deleted snapshot/subvol
        Btrfs: speed up snapshot dropping
        ...
      dc2af6a6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 · 6c5daf01
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
        truncate: use new helpers
        truncate: new helpers
        fs: fix overflow in sys_mount() for in-kernel calls
        fs: Make unload_nls() NULL pointer safe
        freeze_bdev: grab active reference to frozen superblocks
        freeze_bdev: kill bd_mount_sem
        exofs: remove BKL from super operations
        fs/romfs: correct error-handling code
        vfs: seq_file: add helpers for data filling
        vfs: remove redundant position check in do_sendfile
        vfs: change sb->s_maxbytes to a loff_t
        vfs: explicitly cast s_maxbytes in fiemap_check_ranges
        libfs: return error code on failed attr set
        seq_file: return a negative error code when seq_path_root() fails.
        vfs: optimize touch_time() too
        vfs: optimization for touch_atime()
        vfs: split generic_forget_inode() so that hugetlbfs does not have to copy it
        fs/inode.c: add dev-id and inode number for debugging in init_special_inode()
        libfs: make simple_read_from_buffer conventional
      6c5daf01
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current · 6d39b27f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
        lsm: Use a compressed IPv6 string format in audit events
        Audit: send signal info if selinux is disabled
        Audit: rearrange audit_context to save 16 bytes per struct
        Audit: reorganize struct audit_watch to save 8 bytes
      6d39b27f