16 Dec, 2009

17 commits

  • Christoph pointed out inc_zone_page_state(NR_ISOLATED) should be placed
    in right after isolate_page().

    This patch does it.

    Reviewed-by: Christoph Lameter
    Signed-off-by: KOSAKI Motohiro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     
  • Signed-off-by: Wu Fengguang
    Cc: Andi Kleen
    Cc: Avi Kivity
    Cc: Greg Kroah-Hartman
    Cc: Johannes Berg
    Cc: Marcelo Tosatti
    Cc: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wu Fengguang
     
  • Also rename "len" to "sz". No behavior change.

    Signed-off-by: Wu Fengguang
    Cc: Andi Kleen
    Cc: Avi Kivity
    Cc: Greg Kroah-Hartman
    Cc: Johannes Berg
    Cc: Marcelo Tosatti
    Cc: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wu Fengguang
     
  • Also convert more size_inside_page() users.

    Signed-off-by: Wu Fengguang
    Cc: Andi Kleen
    Cc: Avi Kivity
    Cc: Greg Kroah-Hartman
    Cc: Johannes Berg
    Cc: Marcelo Tosatti
    Cc: Mark Brown
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wu Fengguang
     
  • No behaviour change.

    [akpm@linux-foundation.org: cleanuplets]
    [akpm@linux-foundation.org: remove unused `ret']
    Signed-off-by: Wu Fengguang
    Acked-by: Andi Kleen
    Cc: Marcelo Tosatti
    Cc: Greg Kroah-Hartman
    Cc: Mark Brown
    Cc: Johannes Berg
    Cc: Avi Kivity
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wu Fengguang
     
  • Introduce size_inside_page() to replace duplicate /dev/mem code.

    Also apply it to /dev/kmem, whose alignment logic was buggy.

    Signed-off-by: Wu Fengguang
    Acked-by: Andi Kleen
    Cc: Marcelo Tosatti
    Cc: Greg Kroah-Hartman
    Cc: Mark Brown
    Cc: Johannes Berg
    Cc: Avi Kivity
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wu Fengguang
     
  • The len test in write_kmem() is always true, so can be reduced.

    Signed-off-by: Wu Fengguang
    Acked-by: Andi Kleen
    Cc: Marcelo Tosatti
    Cc: Greg Kroah-Hartman
    Cc: Mark Brown
    Cc: Johannes Berg
    Cc: Avi Kivity
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Wu Fengguang
     
  • On ia64, the following test program exit abnormally, because glibc thread
    library called abort().

    ========================================================
    (gdb) bt
    #0 0xa000000000010620 in __kernel_syscall_via_break ()
    #1 0x20000000003208e0 in raise () from /lib/libc.so.6.1
    #2 0x2000000000324090 in abort () from /lib/libc.so.6.1
    #3 0x200000000027c3e0 in __deallocate_stack () from /lib/libpthread.so.0
    #4 0x200000000027f7c0 in start_thread () from /lib/libpthread.so.0
    #5 0x200000000047ef60 in __clone2 () from /lib/libc.so.6.1
    ========================================================

    The fact is, glibc call munmap() when thread exitng time for freeing
    stack, and it assume munlock() never fail. However, munmap() often make
    vma splitting and it with many mapcount make -ENOMEM.

    Oh well, that's crazy, because stack unmapping never increase mapcount.
    The maxcount exceeding is only temporary. internal temporary exceeding
    shouldn't make ENOMEM.

    This patch does it.

    test_max_mapcount.c
    ==================================================================
    #include
    #include
    #include
    #include
    #include
    #include

    #define THREAD_NUM 30000
    #define MAL_SIZE (8*1024*1024)

    void *wait_thread(void *args)
    {
    void *addr;

    addr = malloc(MAL_SIZE);
    sleep(10);

    return NULL;
    }

    void *wait_thread2(void *args)
    {
    sleep(60);

    return NULL;
    }

    int main(int argc, char *argv[])
    {
    int i;
    pthread_t thread[THREAD_NUM], th;
    int ret, count = 0;
    pthread_attr_t attr;

    ret = pthread_attr_init(&attr);
    if(ret) {
    perror("pthread_attr_init");
    }

    ret = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
    if(ret) {
    perror("pthread_attr_setdetachstate");
    }

    for (i = 0; i < THREAD_NUM; i++) {
    ret = pthread_create(&th, &attr, wait_thread, NULL);
    if(ret) {
    fprintf(stderr, "[%d] ", count);
    perror("pthread_create");
    } else {
    printf("[%d] create OK.\n", count);
    }
    count++;

    ret = pthread_create(&thread[i], &attr, wait_thread2, NULL);
    if(ret) {
    fprintf(stderr, "[%d] ", count);
    perror("pthread_create");
    } else {
    printf("[%d] create OK.\n", count);
    }
    count++;
    }

    sleep(3600);
    return 0;
    }
    ==================================================================

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: KOSAKI Motohiro
    Signed-off-by: Hugh Dickins
    Cc: KAMEZAWA Hiroyuki
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    KOSAKI Motohiro
     
  • On a system with large amount of memory (256GB), invoking page-types can
    take quite a long time, which is unreasonable considering the user only
    wants a description of the flags:

    # time ./page-types -d 0x10
    0x0000000000000010 ____D_____________________________ dirty

    real 0m34.285s
    user 0m1.966s
    sys 0m32.313s

    This is because we still walk the entire address range.

    Exiting early seems like a reasonble solution:

    # time ./page-types -d 0x10
    0x0000000000000010 ____D_____________________________ dirty

    real 0m0.007s
    user 0m0.001s
    sys 0m0.005s

    Signed-off-by: Alex Chiang
    Cc: Andi Kleen
    Cc: Haicheng Li
    Acked-by: Wu Fengguang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alex Chiang
     
  • Align the output when page-type -h is invoked.

    Signed-off-by: Alex Chiang
    Acked-by: Wu Fengguang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alex Chiang
     
  • Teach page-types to describe page flags directly from the command line.

    Why is this useful? For instance, if you're using memory hotplug and see
    this in /var/log/messages:

    kernel: removing from LRU failed 3836dd0/1/1e00000000000010

    It would be nice to decode those page flags without staring at the source.

    Example usage and output:

    # Documentation/vm/page-types -d 0x10
    0x0000000000000010 ____D_____________________________ dirty

    # Documentation/vm/page-types -d anon
    0x0000000000001000 ____________a_____________________ anonymous

    # Documentation/vm/page-types -d anon,0x10
    0x0000000000001010 ____D_______a_____________________ dirty,anonymous

    [achiang@hp.com: documentation]
    Signed-off-by: Alex Chiang
    Signed-off-by: Wu Fengguang
    Cc: Andi Kleen
    Cc: Haicheng Li
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alex Chiang
     
  • If not signed, testing of the read() return value in this function
    will not work.

    Signed-off-by: Roel Kluin
    Cc: Wu Fengguang
    Cc: Randy Dunlap
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Roel Kluin
     
  • Signed-off-by: Tommi Rantala
    Cc: Randy Dunlap
    Cc: Wu Fengguang
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Tommi Rantala
     
  • The oom killer header, including information such as the allocation order
    and gfp mask, current's cpuset and memory controller, call trace, and VM
    state information is currently only shown when the oom killer has selected
    a task to kill.

    This information is omitted, however, when the oom killer panics either
    because of panic_on_oom sysctl settings or when no killable task was
    found. It is still relevant to know crucial pieces of information such as
    the allocation order and VM state when diagnosing such issues, especially
    at boot.

    This patch displays the oom killer header whenever it panics so that bug
    reports can include pertinent information to debug the issue, if possible.

    Signed-off-by: David Rientjes
    Reviewed-by: KOSAKI Motohiro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Rientjes
     
  • Sam was fine with handing over kbuild maintainership to me. The git
    trees are already in linux-next, a merge request will follow shortly.

    Acked-by: Sam Ravnborg
    Signed-off-by: Michal Marek
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michal Marek
     
  • A specially-crafted Hierarchical File System (HFS) filesystem could cause
    a buffer overflow to occur in a process's kernel stack during a memcpy()
    call within the hfs_bnode_read() function (at fs/hfs/bnode.c:24). The
    attacker can provide the source buffer and length, and the destination
    buffer is a local variable of a fixed length. This local variable (passed
    as "&entry" from fs/hfs/dir.c:112 and allocated on line 60) is stored in
    the stack frame of hfs_bnode_read()'s caller, which is hfs_readdir().
    Because the hfs_readdir() function executes upon any attempt to read a
    directory on the filesystem, it gets called whenever a user attempts to
    inspect any filesystem contents.

    [amwang@redhat.com: modify this patch and fix coding style problems]
    Signed-off-by: WANG Cong
    Cc: Eugene Teo
    Cc: Roman Zippel
    Cc: Al Viro
    Cc: Christoph Hellwig
    Cc: Alexey Dobriyan
    Cc: Dave Anderson
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Amerigo Wang
     
  • commit d8e180dcd5bbbab9cd3ff2e779efcf70692ef541 "bsdacct: switch
    credentials for writing to the accounting file" introduced credential
    switching during final acct data collecting. However, uid/gid pair
    continued to be collected from current which became credentials of who
    created acct file, not who exits.

    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14676

    Signed-off-by: Alexey Dobriyan
    Reported-by: Juho K. Juopperi
    Acked-by: Serge Hallyn
    Acked-by: David Howells
    Reviewed-by: Michal Schmidt
    Cc: James Morris
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     

15 Dec, 2009

23 commits

  • * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
    i2c-core: i2c bus should support PM entries in struct dev_pm_ops
    i2c: Get rid of I2C_CLIENT_MODULE_PARM
    i2c: Drop I2C_CLIENT_INSMOD_2 to 8
    i2c: Drop I2C_CLIENT_INSMOD_1
    i2c: Get rid of struct i2c_client_address_data
    i2c: Drop the kind parameter from detect callbacks

    Linus Torvalds
     
  • * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
    udf: Avoid IO in udf_clear_inode
    udf: Try harder when looking for VAT inode
    udf: Fix compilation with UDFFS_DEBUG enabled

    Linus Torvalds
     
  • It is not very good to do IO in udf_clear_inode. First, VFS does not really
    expect inode to become dirty there and thus we have to write it ourselves,
    second, memory reclaim gets blocked waiting for IO when it does not really
    expect it, third, the IO pattern (e.g. on umount) resulting from writes in
    udf_clear_inode is bad and it slows down writing a lot.

    The reason why UDF needed to do IO in udf_clear_inode is that UDF standard
    mandates extent length to exactly match inode size. But when we allocate
    extents to a file or directory, we don't really know what exactly the final
    file size will be and thus temporarily set it to block boundary and later
    truncate it to exact length in udf_clear_inode. Now, this is changed to
    truncate to final file size in udf_release_file for regular files. For
    directories and symlinks, we do the truncation at the moment when learn
    what the final file size will be.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Some disks do not contain VAT inode in the last recorded block as required
    by the standard but a few blocks earlier (or the number of recorded blocks
    is wrong). So look for the VAT inode a bit before the end of the media.

    Signed-off-by: Jan Kara

    Jan Kara
     
  • Signed-off-by: Jan Kara

    Jan Kara
     
  • …git/tip/linux-2.6-tip

    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86, mce: Clean up thermal init by introducing intel_thermal_supported()
    x86, mce: Thermal monitoring depends on APIC being enabled
    x86: Gart: fix breakage due to IOMMU initialization cleanup
    x86: Move swiotlb initialization before dma32_free_bootmem
    x86: Fix build warning in arch/x86/mm/mmio-mod.c
    x86: Remove usedac in feature-removal-schedule.txt
    x86: Fix duplicated UV BAU interrupt vector
    nvram: Fix write beyond end condition; prove to gcc copy is safe
    mm: Adjust do_pages_stat() so gcc can see copy_from_user() is safe
    x86: Limit the number of processor bootup messages
    x86: Remove enabling x2apic message for every CPU
    doc: Add documentation for bootloader_{type,version}
    x86, msr: Add support for non-contiguous cpumasks
    x86: Use find_e820() instead of hard coded trampoline address
    x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks

    Trivial percpu-naming-introduced conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
    pcmcia: CodingStyle fixes
    pcmcia: remove unused IRQ_FIRST_SHARED

    Linus Torvalds
     
  • Struct dev_pm_ops is not configured in current i2c bus type. i2c drivers
    only depends on suspend/resume entries in struct dev_pm_ops are not
    informed of PM suspend and resume events by i2c framework.

    Signed-off-by: Sonic Zhang
    Signed-off-by: Jean Delvare

    sonic zhang
     
  • There is no user left of I2C_CLIENT_MODULE_PARM, so we can finally
    get rid of this ugly macro.

    Signed-off-by: Jean Delvare
    Tested-by: Wolfram Sang

    Jean Delvare
     
  • These macros simply declare an enum, so drivers might as well declare
    it themselves. This puts an end to the arbitrary limit of 8 chip types
    per i2c driver.

    Signed-off-by: Jean Delvare
    Tested-by: Wolfram Sang

    Jean Delvare
     
  • This macro simply declares an enum, so drivers might as well declare
    it themselves.

    Signed-off-by: Jean Delvare
    Tested-by: Wolfram Sang

    Jean Delvare
     
  • Struct i2c_client_address_data only contains one field at this point,
    which makes its usefulness questionable. Get rid of it and pass simple
    address lists around instead.

    Signed-off-by: Jean Delvare
    Tested-by: Wolfram Sang

    Jean Delvare
     
  • The "kind" parameter always has value -1, and nobody is using it any
    longer, so we can remove it.

    Signed-off-by: Jean Delvare
    Tested-by: Wolfram Sang

    Jean Delvare
     
  • * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
    spi: fix probe/remove section markings
    Add OMAP spi100k driver
    spi-imx: don't access struct device directly but use dev_get_platdata
    spi-imx: Add mx25 support
    spi-imx: use positive logic to distinguish cpu variants
    spi-imx: correct check for platform_get_irq failing
    ARM: NUC900: Add spi driver support for nuc900
    spi: SuperH MSIOF SPI Master driver V2
    spi: fix spidev compilation failure when VERBOSE is defined
    spi/au1550_spi: fix setupxfer not to override cfg with zeros
    spi/mpc8xxx: don't use __exit_p to wrap plat_mpc8xxx_spi_remove
    spi/i.MX: fix broken error handling for gpio_request
    spi/i.mx: drain MXC SPI transfer buffer when probing device
    MAINTAINERS: add SPI co-maintainer.
    spi/xilinx_spi: fix incorrect casting
    spi/mpc52xx-spi: minor cleanups
    xilinx_spi: add a platform driver using the xilinx_spi common module.
    xilinx_spi: add support for the DS570 IP.
    xilinx_spi: Switch to iomem functions and support little endian.
    xilinx_spi: Split into of driver and generic part.
    ...

    Linus Torvalds
     
  • …/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:
    perf sched: Fix build failure on sparc
    perf bench: Add "all" pseudo subsystem and "all" pseudo suite
    perf tools: Introduce perf_session class
    perf symbols: Ditch dso->find_symbol
    perf symbols: Allow lookups by symbol name too
    perf symbols: Add missing "Variables" entry to map_type__name
    perf symbols: Add support for 'variable' symtabs
    perf symbols: Introduce ELF counterparts to symbol_type__is_a
    perf symbols: Introduce symbol_type__is_a
    perf symbols: Rename kthreads to kmaps, using another abstraction for it
    perf tools: Allow building for ARM
    hw-breakpoints: Handle bad modify_user_hw_breakpoint off-case return value
    perf tools: Allow cross compiling
    tracing, slab: Fix no callsite ifndef CONFIG_KMEMTRACE
    tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING

    Trivial conflict due to different fixes to modify_user_hw_breakpoint()
    in include/linux/hw_breakpoint.h

    Linus Torvalds
     
  • Global variable declarations must match the definitions in section attributes
    as the compiler is at liberty to vary the method it uses to access a variable,
    depending on the section it is in.

    When building the FRV arch, I now see:

    drivers/built-in.o: In function `pci_apply_final_quirks':
    drivers/pci/quirks.c:2606: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o
    drivers/pci/quirks.c:2623: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o
    drivers/pci/quirks.c:2630: relocation truncated to fit: R_FRV_GPREL12 against symbol `pci_dfl_cache_line_size' defined in .devinit.data section in drivers/built-in.o

    because the declaration of pci_dfl_cache_line_size in linux/pci.h does not
    match the definition in drivers/pci/pci.c.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • If there is no hardware breakpoint support, modify_user_hw_breakpoint()
    tries to return a NULL pointer through as an 'int' return value:

    In file included from kernel/exit.c:53:
    include/linux/hw_breakpoint.h: In function 'modify_user_hw_breakpoint':
    include/linux/hw_breakpoint.h:96: warning: return makes integer from pointer without a cast

    Return 0 instead.

    Signed-off-by: David Howells
    Signed-off-by: Linus Torvalds

    David Howells
     
  • * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (46 commits)
    microblaze: Remove rt_sigsuspend wrapper
    microblaze: nommu: Don't clobber R11 on syscalls
    microblaze: Remove show_tmem function
    microblaze: Support for WB cache
    microblaze: Add PVR for Microblaze v7.30.a
    microblaze: Remove ancient and fake microblaze version from cpu_ver table
    microblaze: Remove panic_timeout init value
    microblaze: Do not count system calls in default
    microblaze: Enable DTC compilation
    microblaze: Core oprofile configs and hooks
    microblaze: Fix level interrupt ACKing
    microblaze: Enable futimesat syscall
    microblaze: Checking DTS against PVR for write-back cache
    microblaze: Remove duplicity from pgalloc.h
    microblaze: Futex support
    microblaze: Adding dev_arch_data functions
    microblaze: Fix the heartbeat gpio to be more robust
    microblaze: Simple __copy_tofrom_user for noMMU
    microblaze: Export memory_start for modules
    microblaze: Use lowest-common-denominator default CPU settings
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://neil.brown.name/md: (27 commits)
    md: add 'recovery_start' per-device sysfs attribute
    md: rcu_read_lock() walk of mddev->disks in md_do_sync()
    md: integrate spares into array at earliest opportunity.
    md: move compat_ioctl handling into md.c
    md: revise Kconfig help for MD_MULTIPATH
    md: add MODULE_DESCRIPTION for all md related modules.
    raid: improve MD/raid10 handling of correctable read errors.
    md/raid10: print more useful messages on device failure.
    md/bitmap: update dirty flag when bitmap bits are explicitly set.
    md: Support write-intent bitmaps with externally managed metadata.
    md/bitmap: move setting of daemon_lastrun out of bitmap_read_sb
    md: support updating bitmap parameters via sysfs.
    md: factor out parsing of fixed-point numbers
    md: support bitmap offset appropriate for external-metadata arrays.
    md: remove needless setting of thread->timeout in raid10_quiesce
    md: change daemon_sleep to be in 'jiffies' rather than 'seconds'.
    md: move offset, daemon_sleep and chunksize out of bitmap structure
    md: collect bitmap-specific fields into one structure.
    md/raid1: add takeover support for raid5->raid1
    md: add honouring of suspend_{lo,hi} to raid1.
    ...

    Linus Torvalds
     
  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (58 commits)
    mfd: Add twl6030 regulator subdevices
    regulator: Add support for twl6030 regulators
    rtc: Add twl6030 RTC support
    mfd: Add support for twl6030 irq framework
    mfd: Rename twl4030_ routines in twl-regulator.c
    mfd: Rename twl4030_ routines in rtc-twl.c
    mfd: Rename all twl4030_i2c*
    mfd: Rename twl4030* driver files to enable re-use
    mfd: Clarify twl4030 return value for read and write
    mfd: Add all twl4030 regulators to the twl4030 mfd driver
    mfd: Don't set mc13783 ADREFMODE for touch conversions
    mfd: Remove ezx-pcap defines for custom led gpio encoding
    mfd: Near complete mc13783 rewrite
    mfd: Remove build time warning for WM835x register default tables
    mfd: Force I2C to be built in when building WM831x
    mfd: Don't allow wm831x to be built as a module
    mfd: Fix incorrect error check for wm8350-core
    mfd: Fix twl4030 warning
    gpiolib: Implement gpio_to_irq() for wm831x
    mfd: Remove default selection of AB4500
    ...

    Linus Torvalds
     
  • * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm:
    ARM: fix lh7a40x build
    ARM: fix sa1100 build
    ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug
    ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions
    ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq
    [ARM] pxa/zeus: default configuration for Arcom Zeus SBC.
    [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus
    [ARM] pxa/zeus: basic support for Arcom Zeus SBC
    [ARM] pxa/em-x270: fix usb hub power up/reset sequence
    PCMCIA: fix pxa2xx_lubbock modular build error
    ARM: RealView: Fix typo in the RealView/PBX Kconfig entry
    ARM: Do not allow the probing of the local timer
    ARM: Add an earlyprintk debug console

    Linus Torvalds
     
  • * git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (75 commits)
    NFS: Fix nfs_migrate_page()
    rpc: remove unneeded function parameter in gss_add_msg()
    nfs41: Invoke RECLAIM_COMPLETE on all new client ids
    SUNRPC: IS_ERR/PTR_ERR confusion
    NFSv41: Fix a potential state leakage when restarting nfs4_close_prepare
    nfs41: Handle NFSv4.1 session errors in the delegation recall code
    nfs41: Retry delegation return if it failed with session error
    nfs41: Handle session errors during delegation return
    nfs41: Mark stateids in need of reclaim if state manager gets stale clientid
    NFS: Fix up the declaration of nfs4_restart_rpc when NFSv4 not configured
    nfs41: Don't clear DRAINING flag on NFS4ERR_STALE_CLIENTID
    nfs41: nfs41_setup_state_renewal
    NFSv41: More cleanups
    NFSv41: Fix up some bugs in the NFS4CLNT_SESSION_DRAINING code
    NFSv41: Clean up slot table management
    NFSv41: Fix nfs4_proc_create_session
    nfs41: Invoke RECLAIM_COMPLETE
    nfs41: RECLAIM_COMPLETE functionality
    nfs41: RECLAIM_COMPLETE XDR functionality
    Cleanup some NFSv4 XDR decode comments
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)
    m68k: rename global variable vmalloc_end to m68k_vmalloc_end
    percpu: add missing per_cpu_ptr_to_phys() definition for UP
    percpu: Fix kdump failure if booted with percpu_alloc=page
    percpu: make misc percpu symbols unique
    percpu: make percpu symbols in ia64 unique
    percpu: make percpu symbols in powerpc unique
    percpu: make percpu symbols in x86 unique
    percpu: make percpu symbols in xen unique
    percpu: make percpu symbols in cpufreq unique
    percpu: make percpu symbols in oprofile unique
    percpu: make percpu symbols in tracer unique
    percpu: make percpu symbols under kernel/ and mm/ unique
    percpu: remove some sparse warnings
    percpu: make alloc_percpu() handle array types
    vmalloc: fix use of non-existent percpu variable in put_cpu_var()
    this_cpu: Use this_cpu_xx in trace_functions_graph.c
    this_cpu: Use this_cpu_xx for ftrace
    this_cpu: Use this_cpu_xx in nmi handling
    this_cpu: Use this_cpu operations in RCU
    this_cpu: Use this_cpu ops for VM statistics
    ...

    Fix up trivial (famous last words) global per-cpu naming conflicts in
    arch/x86/kvm/svm.c
    mm/slab.c

    Linus Torvalds