1. 11 Jan, 2011 37 commits
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · b9d919a4
      Linus Torvalds authored
      * 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits)
        NFS fix the setting of exchange id flag
        NFS: Don't use vm_map_ram() in readdir
        NFSv4: Ensure continued open and lockowner name uniqueness
        NFS: Move cl_delegations to the nfs_server struct
        NFS: Introduce nfs_detach_delegations()
        NFS: Move cl_state_owners and related fields to the nfs_server struct
        NFS: Allow walking nfs_client.cl_superblocks list outside client.c
        pnfs: layout roc code
        pnfs: update nfs4_callback_recallany to handle layouts
        pnfs: add CB_LAYOUTRECALL handling
        pnfs: CB_LAYOUTRECALL xdr code
        pnfs: change lo refcounting to atomic_t
        pnfs: check that partial LAYOUTGET return is ignored
        pnfs: add layout to client list before sending rpc
        pnfs: serialize LAYOUTGET(openstateid)
        pnfs: layoutget rpc code cleanup
        pnfs: change how lsegs are removed from layout list
        pnfs: change layout state seqlock to a spinlock
        pnfs: add prefix to struct pnfs_layout_hdr fields
        pnfs: add prefix to struct pnfs_layout_segment fields
        ...
      b9d919a4
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 · 7c955fca
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
        UDF: Close small mem leak in udf_find_entry()
        udf: Fix directory corruption after extent merging
        udf: Protect udf_file_aio_write from possible races
        udf: Remove unnecessary bkl usages
        udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution
        udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct
        udf: Remove BKL from free space counting functions
        udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks()
        udf: Remove BKL from udf_put_super() and udf_remount_fs()
        udf: Protect default inode credentials by rwlock
        udf: Protect all modifications of LVID with s_alloc_mutex
        udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex
        udf: Remove BKL from udf_update_inode
        udf: Convert UDF_SB(sb)->s_flags to use bitops
        fs/udf: Add printf format/argument verification
        fs/udf: Use vzalloc
      
      (Evil merge: this also removes the BKL dependency from the Kconfig file)
      7c955fca
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · e9688f6a
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (44 commits)
        ext4: fix trimming starting with block 0 with small blocksize
        ext4: revert buggy trim overflow patch
        ext4: don't pass entire map to check_eofblocks_fl
        ext4: fix memory leak in ext4_free_branches
        ext4: remove ext4_mb_return_to_preallocation()
        ext4: flush the i_completed_io_list during ext4_truncate
        ext4: add error checking to calls to ext4_handle_dirty_metadata()
        ext4: fix trimming of a single group
        ext4: fix uninitialized variable in ext4_register_li_request
        ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary
        ext4: drop i_state_flags on architectures with 64-bit longs
        ext4: reorder ext4_inode_info structure elements to remove unneeded padding
        ext4: drop ec_type from the ext4_ext_cache structure
        ext4: use ext4_lblk_t instead of sector_t for logical blocks
        ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED
        ext4: fix 32bit overflow in ext4_ext_find_goal()
        ext4: add more error checks to ext4_mkdir()
        ext4: ext4_ext_migrate should use NULL not 0
        ext4: Use ext4_error_file() to print the pathname to the corrupted inode
        ext4: use IS_ERR() to check for errors in ext4_error_file
        ...
      e9688f6a
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 40c73abb
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
        ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG
        ext3: Remove redundant unlikely()
        ext2: Remove redundant unlikely()
        ext3: speed up file creates by optimizing rec_len functions
        ext2: speed up file creates by optimizing rec_len functions
        ext3: Add more journal error check
        ext3: Add journal error check in resize.c
        quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
        ext3: Add FITRIM handling
        ext3: Add batched discard support for ext3
        ext3: Add journal error check into ext3_rename()
        ext3: Use search_dirblock() in ext3_dx_find_entry()
        ext3: Avoid uninitialized memory references with a corrupted htree directory
        ext3: Return error code from generic_check_addressable
        ext3: Add journal error check into ext3_delete_entry()
        ext3: Add error check in ext3_mkdir()
        fs/ext3/super.c: Use printf extension %pV
        fs/ext2/super.c: Use printf extension %pV
        ext3: don't update sb journal_devnum when RO dev
      40c73abb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 0945f352
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: Don't set dentry->d_op in create routines
        fs/9p: fix spelling typo
        fs/9p: TREADLINK bugfix
        net/9p: Use proper data types
        fs/9p: Simplify the .L create operation
        fs/9p: Move dotl inode operations into a seperate file
        fs/9p: fix menu presentation
        fs/9p: Fix the return error on default acl removal
        fs/9p: Remove unnecessary semicolons
      0945f352
    • Jan Kara's avatar
      ext4: fix trimming starting with block 0 with small blocksize · 0f0a25bf
      Jan Kara authored
      When s_first_data_block is not zero (which happens e.g. when block size is 1KB)
      and trim ioctl is called to start trimming from block 0, the math in
      ext4_get_group_no_and_offset() overflows. The overall result is that ioctl
      returns EINVAL which is kind of unexpected and we probably don't want
      userspace tools to bother with internal details of filesystem structure.
      So just silently increase starting offset (and shorten length) when starting
      block is below s_first_data_block.
      
      CC: Lukas Czerner <lczerner@redhat.com>
      Signed-off-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      0f0a25bf
    • Theodore Ts'o's avatar
      ext4: revert buggy trim overflow patch · 0a2179b1
      Theodore Ts'o authored
      This reverts commit 4f531501: ext4: fix possible overflow in
      ext4_trim_fs()
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      0a2179b1
    • Linus Torvalds's avatar
      Merge branch 'for-linus-merged' of git://oss.sgi.com/xfs/xfs · 7bc4a4ce
      Linus Torvalds authored
      * 'for-linus-merged' of git://oss.sgi.com/xfs/xfs: (47 commits)
        xfs: convert grant head manipulations to lockless algorithm
        xfs: introduce new locks for the log grant ticket wait queues
        xfs: convert log grant heads to atomic variables
        xfs: convert l_tail_lsn to an atomic variable.
        xfs: convert l_last_sync_lsn to an atomic variable
        xfs: make AIL tail pushing independent of the grant lock
        xfs: use wait queues directly for the log wait queues
        xfs: combine grant heads into a single 64 bit integer
        xfs: rework log grant space calculations
        xfs: fact out common grant head/log tail verification code
        xfs: convert log grant ticket queues to list heads
        xfs: use AIL bulk delete function to implement single delete
        xfs: use AIL bulk update function to implement single updates
        xfs: remove all the inodes on a buffer from the AIL in bulk
        xfs: consume iodone callback items on buffers as they are processed
        xfs: reduce the number of AIL push wakeups
        xfs: bulk AIL insertion during transaction commit
        xfs: clean up xfs_ail_delete()
        xfs: Pull EFI/EFD handling out from under the AIL lock
        xfs: fix EFI transaction cancellation.
        ...
      7bc4a4ce
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 498f7f50
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (22 commits)
        MAINTAINERS: Update Joel Becker's email address
        ocfs2: Remove unused truncate function from alloc.c
        ocfs2/cluster: dereferencing before checking in nst_seq_show()
        ocfs2: fix build for OCFS2_FS_STATS not enabled
        ocfs2/cluster: Show o2net timing statistics
        ocfs2/cluster: Track process message timing stats for each socket
        ocfs2/cluster: Track send message timing stats for each socket
        ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container
        ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking
        ocfs2: Add DEBUG_FS dependency
        ocfs2/dlm: Hard code the values for enums
        ocfs2/dlm: Minor cleanup
        ocfs2/dlm: Cleanup dlmdebug.c
        ocfs2: Release buffer_head in case of error in ocfs2_double_lock.
        ocfs2/cluster: Pin the local node when o2hb thread starts
        ocfs2/cluster: Show pin state for each o2hb region
        ocfs2/cluster: Pin/unpin o2hb regions
        ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap
        ocfs2/cluster: Pin the remote node item in configfs
        ocfs2/dlm: make existing convertion precedent over new lock
        ...
      498f7f50
    • Andy Adamson's avatar
      NFS fix the setting of exchange id flag · 357f54d6
      Andy Adamson authored
      Indicate support for referrals. Do not set any PNFS roles. Check the flags
      returned by the server for validity. Do not use exchange flags from an old
      client ID instance when recovering a client ID.
      
      Update the EXCHID4_FLAG_XXX set to RFC 5661.
      Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
      Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
      357f54d6
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze · 0969d11e
      Linus Torvalds authored
      * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: remove obsolete DEBUG_BOOTMEM
        microblaze: trivial: Fix removed the part of line
        microblaze: Fix __muldi3 function for little-endian.
        microblaze: Clear i/dcache for sw breakpoints
        microblaze: Remove useless early_init_dt_check_for_initrd
        microblaze: Fix unaligned exception for little endian platform
        microblaze: Add PVR for Microblaze v8.00.b
        microblaze: Correct PVR access macros
        Revert "microblaze: Simplify syscall rutine"
        microblaze: Fix initramfs
        arch/microblaze: Remove unnecessary semicolons
      0969d11e
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of... · 16ee8db6
      Linus Torvalds authored
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Fix Moorestown VRTC fixmap placement
        x86/gpio: Implement x86 gpio_to_irq convert function
        x86, UV: Fix APICID shift for Westmere processors
        x86: Use PCI method for enabling AMD extended config space before MSR method
        x86: tsc: Prevent delayed init if initial tsc calibration failed
        x86, lapic-timer: Increase the max_delta to 31 bits
        x86: Fix sparse non-ANSI function warnings in smpboot.c
        x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation
        x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h
        x86, numa: Fix cpu to node mapping for sparse node ids
        x86, numa: Fake node-to-cpumask for NUMA emulation
        x86, numa: Fake apicid and pxm mappings for NUMA emulation
        x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
        x86, numa: Reduce minimum fake node size to 32M
      
      Fix up trivial conflict in arch/x86/kernel/apic/x2apic_uv_x.c
      16ee8db6
    • Linus Torvalds's avatar
      Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 5943a268
      Linus Torvalds authored
      * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rtc: Namespace fixup
        RTC: Remove UIE emulation
        RTC: Rework RTC code to use timerqueue for events
      
      Fix up trivial conflict in drivers/rtc/rtc-dev.c
      5943a268
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · 42776163
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
        perf session: Fix infinite loop in __perf_session__process_events
        perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1)
        perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail
        perf tools: Emit clearer message for sys_perf_event_open ENOENT return
        perf stat: better error message for unsupported events
        perf sched: Fix allocation result check
        perf, x86: P4 PMU - Fix unflagged overflows handling
        dynamic debug: Fix build issue with older gcc
        tracing: Fix TRACE_EVENT power tracepoint creation
        tracing: Fix preempt count leak
        tracepoint: Add __rcu annotation
        tracing: remove duplicate null-pointer check in skb tracepoint
        tracing/trivial: Add missing comma in TRACE_EVENT comment
        tracing: Include module.h in define_trace.h
        x86: Save rbp in pt_regs on irq entry
        x86, dumpstack: Fix unused variable warning
        x86, NMI: Clean-up default_do_nmi()
        x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU
        x86, NMI: Remove DIE_NMI_IPI
        x86, NMI: Add priorities to handlers
        ...
      42776163
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · edb2877f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (39 commits)
        mmc: davinci: add support for SDIO irq handling
        mmc: fix division by zero in MMC core
        mmc: tmio_mmc: fix CMD irq handling
        mmc: tmio_mmc: handle missing HW interrupts
        mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc
        mmc: tmio_mmc: implement SDIO IRQ support
        mfd: sdhi: require the tmio-mmc driver to bounce unaligned buffers
        mmc: tmio_mmc: silence compiler warnings
        mmc: tmio_mmc: implement a bounce buffer for unaligned DMA
        mmc: tmio_mmc: merge the private header into the driver
        mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure
        mmc: tmio_mmc: allow multi-element scatter-gather lists
        mmc: Register debugfs dir before calling card probe function.
        mmc: MMC_BLOCK_MINORS should depend on MMC_BLOCK.
        mmc: Explain why we make adjacent mmc_bus_{put,get} calls during rescan.
        mmc: Fix sd/sdio/mmc initialization frequency retries
        mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap
        mmc: dw_mmc: Add Synopsys DesignWare mmc host driver.
        mmc: add sdhci-tegra driver for Tegra SoCs
        mmc: sdhci: add quirk for max len ADMA descriptors
        ...
      edb2877f
    • Aneesh Kumar K.V's avatar
      fs/9p: Don't set dentry->d_op in create routines · b8b80cf3
      Aneesh Kumar K.V authored
      We do set dentry->d_op in lookup even in case of EOENT entries.
      That implies we should have dentry->d_op already set when
      create/mkdir/mknod/link/symlink routines are called
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      b8b80cf3
    • Eric Van Hensbergen's avatar
      fs/9p: fix spelling typo · c25a61f5
      Eric Van Hensbergen authored
      introduced a typo somehow during a hand merge
      
      Reported by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      c25a61f5
    • M. Mohan Kumar's avatar
      fs/9p: TREADLINK bugfix · 31b6ceac
      M. Mohan Kumar authored
      Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update
      v9fs_vfs_follow_link_dotl function to accommodate this change
      Signed-off-by: default avatarM. Mohan Kumar <mohan@in.ibm.com>
      Reported-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      31b6ceac
    • M. Mohan Kumar's avatar
      net/9p: Use proper data types · 219fd58b
      M. Mohan Kumar authored
      Use proper data types for storing the count of the binary blob and
      length of a string. Without this patch length calculation of string will
      always result in -1 because of comparision between signed and unsigned
      integer.
      Signed-off-by: default avatarM. Mohan Kumar <mohan@in.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      219fd58b
    • Aneesh Kumar K.V's avatar
    • Aneesh Kumar K.V's avatar
    • Randy Dunlap's avatar
      fs/9p: fix menu presentation · 255614c4
      Randy Dunlap authored
      Make the 9P_FS kconfig options subordinate to the 9P_FS kconfig symbol
      in the menu presentation instead of them all being at the same level.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      255614c4
    • Aneesh Kumar K.V's avatar
      fs/9p: Fix the return error on default acl removal · 6f81c115
      Aneesh Kumar K.V authored
      If we don't have default ACL, then trying to remove
      default acl on a file should return 0.
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
      6f81c115
    • Joe Perches's avatar
      fs/9p: Remove unnecessary semicolons · 009ca389
      Joe Perches authored
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      009ca389
    • Arjan van de Ven's avatar
      x86: Fix Moorestown VRTC fixmap placement · fa36e956
      Arjan van de Ven authored
      The x86 fixmaps need to be all together... unfortunately the
      VRTC one was misplaced.
      
      This patch makes sure the MRST VRTC fixmap is put prior to the
      __end_of_permanent_fixed_addresses marker.
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      LKML-Reference: <20110111105544.24448.27607.stgit@bob.linux.org.uk>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      fa36e956
    • Alek Du's avatar
      x86/gpio: Implement x86 gpio_to_irq convert function · 718c45bd
      Alek Du authored
      We need this for x86 MID platforms where GPIO interrupts are
      used. No special magic is needed so the default 1:1 behaviour
      will do nicely.
      Signed-off-by: default avatarAlek Du <alek.du@intel.com>
      Signed-off-by: default avatarJacob Pan <jacob.jun.pan@intel.com>
      Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
      LKML-Reference: <20110111105439.24448.69863.stgit@bob.linux.org.uk>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      718c45bd
    • Jack Steiner's avatar
      x86, UV: Fix APICID shift for Westmere processors · 990a32d1
      Jack Steiner authored
      Westmere processors use a different algorithm for
      assigning APICIDs on SGI UV systems. The location of the
      node number within the apicid is now a function of the
      processor type.
      Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
      LKML-Reference: <20110110195210.GA18737@sgi.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      990a32d1
    • Jan Beulich's avatar
      x86: Use PCI method for enabling AMD extended config space before MSR method · 24d9b70b
      Jan Beulich authored
      While both methods should work equivalently well for the native
      case, the Xen Dom0 case can't reliably work with the MSR one,
      since there's no guarantee that the virtual CPUs it has
      available fully cover all necessary physical ones.
      
      As per the suggestion of Robert Richter the patch only adds the
      PCI method, but leaves the MSR one as a fallback to cover new
      systems the PCI IDs of which may not have got added to the code
      base yet.
      
      The only change in v2 is the breaking out of the new CPI
      initialization method into a separate function, as requested by
      Ingo.
      Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
      Acked-by: default avatarRobert Richter <robert.richter@amd.com>
      Cc: Andreas Herrmann3 <Andreas.Herrmann3@amd.com>
      Cc: Joerg Roedel <joerg.roedel@amd.com>
      Cc: Jeremy Fitzhardinge <jeremy@goop.org>
      LKML-Reference: <4D2B3FD7020000780002B67D@vpn.id2.novell.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      24d9b70b
    • Thomas Gleixner's avatar
      x86: tsc: Prevent delayed init if initial tsc calibration failed · 29fe359c
      Thomas Gleixner authored
      commit a8760eca (x86: Check tsc available/disabled in the delayed init
      function) missed to prevent the setup of the delayed init function in
      case the initial tsc calibration failed. This results in the same
      divide by zero bug as we have seen without the tsc disabled check.
      
      Skip the delayed work setup when tsc_khz (the initial calibration
      value) is 0.
      Bisected-and-tested-by: default avatarKirill A. Shutemov <kas@openvz.org>
      Cc: John Stultz <john.stultz@linaro.org>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      29fe359c
    • Alex Elder's avatar
      Merge branch 'master' into for-linus-merged · 92f1c008
      Alex Elder authored
      This merge pulls the XFS master branch into the latest Linus master.
      This results in a merge conflict whose best fix is not obvious.
      I manually fixed the conflict, in "fs/xfs/xfs_iget.c".
      
      Dave Chinner had done work that resulted in RCU freeing of inodes
      separate from what Nick Piggin had done, and their results differed
      slightly in xfs_inode_free().  The fix updates Nick's call_rcu()
      with the use of VFS_I(), while incorporating needed updates to some
      XFS inode fields implemented in Dave's series.  Dave's RCU callback
      function has also been removed.
      Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
      92f1c008
    • Linus Torvalds's avatar
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5b2eef96
      Linus Torvalds authored
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (390 commits)
        drm/radeon/kms: disable underscan by default
        drm/radeon/kms: only enable hdmi features if the monitor supports audio
        drm: Restore the old_fb upon modeset failure
        drm/nouveau: fix hwmon device binding
        radeon: consolidate asic-specific function decls for pre-r600
        vga_switcheroo: comparing too few characters in strncmp()
        drm/radeon/kms: add NI pci ids
        drm/radeon/kms: don't enable pcie gen2 on NI yet
        drm/radeon/kms: add radeon_asic struct for NI asics
        drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init
        drm/radeon/kms: add ucode loader for NI
        drm/radeon/kms: add support for DCE5 display LUTs
        drm/radeon/kms: add ni_reg.h
        drm/radeon/kms: add bo blit support for NI
        drm/radeon/kms: always use writeback/events for fences on NI
        drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5
        drm/radeon/kms: add backend map workaround for barts
        drm/radeon/kms: fill gpu init for NI asics
        drm/radeon/kms: add disabled vbios accessor for NI asics
        drm/radeon/kms: handle NI thermal controller
        ...
      5b2eef96
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 8adbf8d4
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Constify i2c_client where possible
        i2c-algo-bit: Complain about masters which can't read SCL
        i2c-algo-bit: Refactor adapter registration
        i2c: Add generic I2C multiplexer using GPIO API
        i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
        i2c-i801: Include <linux/slab.h>
      8adbf8d4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 0be8c8bd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (52 commits)
        Blackfin: encode cpu-rev into uImage name
        Blackfin: bf54x: don't ack GPIO ints when unmasking them
        Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
        Blackfin: boards: add missing "static" to peripheral lists
        Blackfin: DNP5370: new board port
        Blackfin: bf518f-ezbrd: fix dsa resources
        Blackfin: move "-m elf32bfin" to general LDFLAGS
        Blackfin: kgdb_test: make sure to initialize num2
        Blackfin: kgdb: disable preempt schedule when running single step in kgdb
        Blackfin: kgdb: disable interrupt when single stepping in ADEOS
        Blackfin: SMP: kgdb: apply anomaly 257 work around
        Blackfin: fix building IPIPE code when XIP is enabled
        Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
        Blackfin: sport_uart resources: remove unused secondary RX/TX pins
        Blackfin: tll6527m: fix spelling in unused code (struct name)
        Blackfin: bf527-ezkit: add adau1373 chip address
        Blackfin: no-mpu: fix masking of small uncached dma region
        Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
        MAINTAINERS: update Analog Devices support info
        Blackfin: dpmc.h: pull in new pll.h
        ...
      0be8c8bd
    • Arnaldo Carvalho de Melo's avatar
      perf session: Fix infinite loop in __perf_session__process_events · 3d03e2ea
      Arnaldo Carvalho de Melo authored
      In this if statement:
      
              if (head + event->header.size >= mmap_size) {
                      if (mmaps[map_idx]) {
                              munmap(mmaps[map_idx], mmap_size);
                              mmaps[map_idx] = NULL;
                      }
      
                      page_offset = page_size * (head / page_size);
                      file_offset += page_offset;
                      head -= page_offset;
                      goto remap;
              }
      
      With, for instance, these values:
      
      head=2992
      event->header.size=48
      mmap_size=3040
      
      We end up endlessly looping back to remap. Off by one.
      
      Problem introduced in 55b4462.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Reported-by: default avatarIngo Molnar <mingo@elte.hu>
      Reported-by: default avatarDavid Ahern <daahern@cisco.com>
      Bisected-by: default avatarDavid Ahern <daahern@cisco.com>
      Tested-by: default avatarDavid Ahern <daahern@cisco.com>
      Cc: David Ahern <daahern@cisco.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      LKML-Reference: <new-submission>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      3d03e2ea
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of... · e54be894
      Linus Torvalds authored
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        driver core: Document that device_rename() is only for networking
        sysfs: remove useless test from sysfs_merge_group
        driver-core: merge private parts of class and bus
        driver core: fix whitespace in class_attr_string
      e54be894
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 949f6711
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
        staging: speakup: fix failure handling
        staging: usbip: remove double giveback of URB
        Staging: batman-adv: Remove batman-adv from staging
        Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
        staging: hv: remove unneeded osd_schedule_callback
        staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
        staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
        staging: brcm80211: Fix WL_<type> logging macros
        Staging: IIO: DDS: AD9833 / AD9834 driver
        Staging: IIO: dds.h convenience macros
        Staging: IIO: Direct digital synthesis abi documentation
        staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
        staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
        staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
        staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
        staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
        staging: brcm80211: Remove unused ether_<foo> #defines and struct
        staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
        staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
        Staging: comedi: Fix checkpatch.pl issues in file s526.c
        ...
      
      Fix up trivial conflict in drivers/video/udlfb.c
      949f6711
    • Arnaldo Carvalho de Melo's avatar
      perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1) · 0252208e
      Arnaldo Carvalho de Melo authored
      And a test for it:
      
      [acme@felicio linux]$ perf test
       1: vmlinux symtab matches kallsyms: Ok
       2: detect open syscall event: Ok
       3: detect open syscall event on all cpus: Ok
      [acme@felicio linux]$
      
      Translating C the test does:
      
      1. generates different number of open syscalls on each CPU
         by using sched_setaffinity
      2. Verifies that the expected number of events is generated
         on each CPU
      
      It works as expected.
      
      LKML-Reference: <new-submission>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Mike Galbraith <efault@gmx.de>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Tom Zanussi <tzanussi@gmail.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      0252208e
  2. 10 Jan, 2011 3 commits
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of... · 443e6221
      Linus Torvalds authored
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (36 commits)
        sony-laptop: support new hotkeys on the P, Z and EC series
        platform/x86: Consistently select LEDS Kconfig options
        sony-laptop: fix sparse non-ANSI function warning
        intel_ips: fix sparse non-ANSI function warning
        Support KHLB2 in the compal laptop driver
        acer-wmi: Enabled Acer Launch Manager mode
        [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem
        ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf()
        acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state
        acer-wmi: Detect the WiFi/Bluetooth/3G devices available
        acer-wmi: Add 3G rfkill sysfs file
        acer-wmi: Add acer wmi hotkey events support
        platform/x86: Kconfig: Replace select by depends on ACPI_WMI
        ideapad: pass ideapad_priv as argument (part 2)
        ideapad: pass ideapad_priv as argument (part 1)
        ideapad: add markups, unify comments and return result when init
        ideapad: add hotkey support
        ideapad: let camera power control entry under platform driver
        ideapad: add platform driver for ideapad
        fujitsu-laptop: fix compiler warning on pnp_ids
        ...
      443e6221
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 0caca697
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68knommu: Need to check __get_user()/__put_user() result
        m68knommu: signal.c __user annotations
        m68knommu: Equivalent of "m68k: handle new gcc's"
        m68knommu: f_pcr has been gone since headers' merge
        m68knommu: Don't lose state if sigframe setup fails
        m68knommu: Handle multiple pending signals
        m68knommu: Switch to saner sigsuspend
        m68knommu: Don't bother with SA_ONESHOT
        m68k: Check __get_user()/__put_user() return value
        m68k: Missing syscall_trace() on sigreturn
        m68k: Fix stack mangling logics in sigreturn
        m68k: If we fail to set sigframe up, just leave regs alone...
        m68k: Don't lose state if sigframe setup fails
        m68k: Simplify the singlestepping handling in signals
        m68k: Switch to saner sigsuspend()
        m68k: Resetting sa_handler in local copy of k_sigaction is pointless
        m68k/sun3: Kill pte_unmap() warnings
      0caca697
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · ecacc6c7
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Avoid array overflow if there are too many cpus in SRAT table
        [IA64] Remove unlikely from cpu_is_offline
        [IA64] irq_ia64, use set_irq_chip
        [IA64] perfmon: Change vmalloc to vzalloc and drop memset.
        [IA64] eliminate race condition in smp_flush_tlb_mm
      ecacc6c7