1. 02 Jul, 2013 35 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1982269a
      Linus Torvalds authored
      Pull x86 mm changes from Ingo Molnar:
       "Misc improvements:
      
         - Fix /proc/mtrr reporting
         - Fix ioremap printout
         - Remove the unused pvclock fixmap entry on 32-bit
         - misc cleanups"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ioremap: Correct function name output
        x86: Fix /proc/mtrr with base/size more than 44bits
        ix86: Don't waste fixmap entries
        x86/mm: Drop unneeded include <asm/*pgtable, page*_types.h>
        x86_64: Correct phys_addr in cleanup_highmap comment
      1982269a
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · fdd78889
      Linus Torvalds authored
      Pull x86 microcode loading update from Ingo Molnar:
       "Two main changes that improve microcode loading on AMD CPUs:
      
         - Add support for all-in-one binary microcode files that concatenate
           the microcode images of multiple processor families, by Jacob Shin
      
         - Add early microcode loading (embedded in the initrd) support, also
           by Jacob Shin"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode, amd: Another early loading fixup
        x86, microcode, amd: Allow multiple families' bin files appended together
        x86, microcode, amd: Make find_ucode_in_initrd() __init
        x86, microcode, amd: Fix warnings and errors on with CONFIG_MICROCODE=m
        x86, microcode, amd: Early microcode patch loading support for AMD
        x86, microcode, amd: Refactor functions to prepare for early loading
        x86, microcode: Vendor abstract out save_microcode_in_initrd()
        x86, microcode, intel: Correct typo in printk
      fdd78889
    • Linus Torvalds's avatar
      Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · d652df0b
      Linus Torvalds authored
      Pull x86 FPU changes from Ingo Molnar:
       "There are two bigger changes in this tree:
      
         - Add an [early-use-]safe static_cpu_has() variant and other
           robustness improvements, including the new X86_DEBUG_STATIC_CPU_HAS
           configurable debugging facility, motivated by recent obscure FPU
           code bugs, by Borislav Petkov
      
         - Reimplement FPU detection code in C and drop the old asm code, by
           Peter Anvin."
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, fpu: Use static_cpu_has_safe before alternatives
        x86: Add a static_cpu_has_safe variant
        x86: Sanity-check static_cpu_has usage
        x86, cpu: Add a synthetic, always true, cpu feature
        x86: Get rid of ->hard_math and all the FPU asm fu
      d652df0b
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4d6f843a
      Linus Torvalds authored
      Pull x86 EFI changes from Ingo Molnar:
       "Two fixes that should in principle increase robustness of our
        interaction with the EFI firmware, and a cleanup"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, efi: retry ExitBootServices() on failure
        efi: Convert runtime services function ptrs
        UEFI: Don't pass boot services regions to SetVirtualAddressMap()
      4d6f843a
    • Linus Torvalds's avatar
      Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 55a0d3ff
      Linus Torvalds authored
      Pull x86 debug update from Ingo Molnar:
       "Misc debuggability improvements:
      
         - Optimize the x86 CPU register printout a bit
         - Expose the tboot TXT log via debugfs
         - Small do_debug() cleanup"
      
      * 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/tboot: Provide debugfs interfaces to access TXT log
        x86: Remove weird PTR_ERR() in do_debug
        x86/debug: Only print out DR registers if they are not power-on defaults
      55a0d3ff
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 35c23d5d
      Linus Torvalds authored
      Pull x86 cpu updates from Ingo Molnar:
       "Two changes:
      
         - Extend 32-bit double fault debugging aid to 64-bit
         - Fix a build warning"
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/intel/cacheinfo: Shut up last long-standing warning
        x86: Extend #DF debugging aid to 64-bit
      35c23d5d
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 57935b26
      Linus Torvalds authored
      Pull x86 cleanups from Ingo Molnar:
       "Misc x86 cleanups"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, reloc: Use xorl instead of xorq in relocate_kernel_64.S
        x86, cleanups: Remove extra tab in __flush_tlb_one()
        x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL
      57935b26
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5f16a8cf
      Linus Torvalds authored
      Pull x86 boot build fix from Ingo Molnar:
       "Small fixlet for the build process"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot: Close opened file descriptor
      5f16a8cf
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 002e44bf
      Linus Torvalds authored
      Pull asm/x86 changes from Ingo Molnar:
       "Misc changes, with a bigger processor-flags cleanup/reorganization by
        Peter Anvin"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, asm, cleanup: Replace open-coded control register values with symbolic
        x86, processor-flags: Fix the datatypes and add bit number defines
        x86: Rename X86_CR4_RDWRGSFS to X86_CR4_FSGSBASE
        x86, flags: Rename X86_EFLAGS_BIT1 to X86_EFLAGS_FIXED
        linux/const.h: Add _BITUL() and _BITULL()
        x86/vdso: Convert use of typedef ctl_table to struct ctl_table
        x86: __force_order doesn't need to be an actual variable
      002e44bf
    • Linus Torvalds's avatar
      Merge branch 'sched-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e13053f5
      Linus Torvalds authored
      Pull voluntary preemption fixes from Ingo Molnar:
       "This tree contains a speedup which is achieved through better
        might_sleep()/might_fault() preemption point annotations for uaccess
        functions, by Michael S Tsirkin:
      
        1. The only reason uaccess routines might sleep is if they fault.
           Make this explicit for all architectures.
      
        2. A voluntary preemption point in uaccess functions means compiler
           can't inline them efficiently, this breaks assumptions that they
           are very fast and small that e.g.  net code seems to make.  Remove
           this preemption point so behaviour matches with what callers
           assume.
      
        3. Accesses (e.g through socket ops) to kernel memory with KERNEL_DS
           like net/sunrpc does will never sleep.  Remove an unconditinal
           might_sleep() in the might_fault() inline in kernel.h (used when
           PROVE_LOCKING is not set).
      
        4. Accesses with pagefault_disable() return EFAULT but won't cause
           caller to sleep.  Check for that and thus avoid might_sleep() when
           PROVE_LOCKING is set.
      
        These changes offer a nice speedup for CONFIG_PREEMPT_VOLUNTARY=y
        kernels, here's a network bandwidth measurement between a virtual
        machine and the host:
      
         before:
              incoming: 7122.77   Mb/s
              outgoing: 8480.37   Mb/s
      
         after:
              incoming: 8619.24   Mb/s   [ +21.0% ]
              outgoing: 9455.42   Mb/s   [ +11.5% ]
      
        I kept these changes in a separate tree, separate from scheduler
        changes, because it's a mixed MM and scheduler topic"
      
      * 'sched-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mm, sched: Allow uaccess in atomic with pagefault_disable()
        mm, sched: Drop voluntary schedule from might_fault()
        x86: uaccess s/might_sleep/might_fault/
        tile: uaccess s/might_sleep/might_fault/
        powerpc: uaccess s/might_sleep/might_fault/
        mn10300: uaccess s/might_sleep/might_fault/
        microblaze: uaccess s/might_sleep/might_fault/
        m32r: uaccess s/might_sleep/might_fault/
        frv: uaccess s/might_sleep/might_fault/
        arm64: uaccess s/might_sleep/might_fault/
        asm-generic: uaccess s/might_sleep/might_fault/
      e13053f5
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2d722f6d
      Linus Torvalds authored
      Pull scheduler updates from Ingo Molnar:
       "The main changes:
      
         - load-calculation cleanups and improvements, by Alex Shi
         - various nohz related tidying up of statisics, by Frederic
           Weisbecker
         - factor out /proc functions to kernel/sched/proc.c, by Paul
           Gortmaker
         - simplify the RT policy scheduler, by Kirill Tkhai
         - various fixes and cleanups"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (42 commits)
        sched/debug: Remove CONFIG_FAIR_GROUP_SCHED mask
        sched/debug: Fix formatting of /proc/<PID>/sched
        sched: Fix typo in struct sched_avg member description
        sched/fair: Fix typo describing flags in enqueue_entity
        sched/debug: Add load-tracking statistics to task
        sched: Change get_rq_runnable_load() to static and inline
        sched/tg: Remove tg.load_weight
        sched/cfs_rq: Change atomic64_t removed_load to atomic_long_t
        sched/tg: Use 'unsigned long' for load variable in task group
        sched: Change cfs_rq load avg to unsigned long
        sched: Consider runnable load average in move_tasks()
        sched: Compute runnable load avg in cpu_load and cpu_avg_load_per_task
        sched: Update cpu load after task_tick
        sched: Fix sleep time double accounting in enqueue entity
        sched: Set an initial value of runnable avg for new forked task
        sched: Move a few runnable tg variables into CONFIG_SMP
        Revert "sched: Introduce temporary FAIR_GROUP_SCHED dependency for load-tracking"
        sched: Don't mix use of typedef ctl_table and struct ctl_table
        sched: Remove WARN_ON(!sd) from init_sched_groups_power()
        sched: Fix memory leakage in build_sched_groups()
        ...
      2d722f6d
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f0bb4c0a
      Linus Torvalds authored
      Pull perf updates from Ingo Molnar:
       "Kernel improvements:
      
         - watchdog driver improvements by Li Zefan
         - Power7 CPI stack events related improvements by Sukadev Bhattiprolu
         - event multiplexing via hrtimers and other improvements by Stephane
           Eranian
         - kernel stack use optimization by Andrew Hunter
         - AMD IOMMU uncore PMU support by Suravee Suthikulpanit
         - NMI handling rate-limits by Dave Hansen
         - various hw_breakpoint fixes by Oleg Nesterov
         - hw_breakpoint overflow period sampling and related signal handling
           fixes by Jiri Olsa
         - Intel Haswell PMU support by Andi Kleen
      
        Tooling improvements:
      
         - Reset SIGTERM handler in workload child process, fix from David
           Ahern.
         - Makefile reorganization, prep work for Kconfig patches, from Jiri
           Olsa.
         - Add automated make test suite, from Jiri Olsa.
         - Add --percent-limit option to 'top' and 'report', from Namhyung
           Kim.
         - Sorting improvements, from Namhyung Kim.
         - Expand definition of sysfs format attribute, from Michael Ellerman.
      
        Tooling fixes:
      
         - 'perf tests' fixes from Jiri Olsa.
         - Make Power7 CPI stack events available in sysfs, from Sukadev
           Bhattiprolu.
         - Handle death by SIGTERM in 'perf record', fix from David Ahern.
         - Fix printing of perf_event_paranoid message, from David Ahern.
         - Handle realloc failures in 'perf kvm', from David Ahern.
         - Fix divide by 0 in variance, from David Ahern.
         - Save parent pid in thread struct, from David Ahern.
         - Handle JITed code in shared memory, from Andi Kleen.
         - Fixes for 'perf diff', from Jiri Olsa.
         - Remove some unused struct members, from Jiri Olsa.
         - Add missing liblk.a dependency for python/perf.so, fix from Jiri
           Olsa.
         - Respect CROSS_COMPILE in liblk.a, from Rabin Vincent.
         - No need to do locking when adding hists in perf report, only 'top'
           needs that, from Namhyung Kim.
         - Fix alignment of symbol column in in the hists browser (top,
           report) when -v is given, from NAmhyung Kim.
         - Fix 'perf top' -E option behavior, from Namhyung Kim.
         - Fix bug in isupper() and islower(), from Sukadev Bhattiprolu.
         - Fix compile errors in bp_signal 'perf test', from Sukadev
           Bhattiprolu.
      
        ... and more things"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (102 commits)
        perf/x86: Disable PEBS-LL in intel_pmu_pebs_disable()
        perf/x86: Fix shared register mutual exclusion enforcement
        perf/x86/intel: Support full width counting
        x86: Add NMI duration tracepoints
        perf: Drop sample rate when sampling is too slow
        x86: Warn when NMI handlers take large amounts of time
        hw_breakpoint: Introduce "struct bp_cpuinfo"
        hw_breakpoint: Simplify *register_wide_hw_breakpoint()
        hw_breakpoint: Introduce cpumask_of_bp()
        hw_breakpoint: Simplify the "weight" usage in toggle_bp_slot() paths
        hw_breakpoint: Simplify list/idx mess in toggle_bp_slot() paths
        perf/x86/intel: Add mem-loads/stores support for Haswell
        perf/x86/intel: Support Haswell/v4 LBR format
        perf/x86/intel: Move NMI clearing to end of PMI handler
        perf/x86/intel: Add Haswell PEBS support
        perf/x86/intel: Add simple Haswell PMU support
        perf/x86/intel: Add Haswell PEBS record support
        perf/x86/intel: Fix sparse warning
        perf/x86/amd: AMD IOMMU Performance Counter PERF uncore PMU implementation
        perf/x86/amd: Add IOMMU Performance Counter resource management
        ...
      f0bb4c0a
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · a4883ef6
      Linus Torvalds authored
      Pull core irq changes from Ingo Molnar:
       "The main changes:
      
        - generic-irqchip driver additions, cleanups and fixes
      
        - 3 new irqchip drivers: ARMv7-M NVIC, TB10x and Marvell Orion SoCs
      
        - irq_get_trigger_type() simplification and cross-arch cleanup
      
        - various cleanups, simplifications
      
        - documentation updates"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
        softirq: Use _RET_IP_
        genirq: Add the generic chip to the genirq docbook
        genirq: generic-chip: Export some irq_gc_ functions
        genirq: Fix can_request_irq() for IRQs without an action
        irqchip: exynos-combiner: Staticize combiner_init
        irqchip: Add support for ARMv7-M NVIC
        irqchip: Add TB10x interrupt controller driver
        irqdomain: Use irq_get_trigger_type() to get IRQ flags
        MIPS: octeon: Use irq_get_trigger_type() to get IRQ flags
        arm: orion: Use irq_get_trigger_type() to get IRQ flags
        mfd: stmpe: use irq_get_trigger_type() to get IRQ flags
        mfd: twl4030-irq: Use irq_get_trigger_type() to get IRQ flags
        gpio: mvebu: Use irq_get_trigger_type() to get IRQ flags
        genirq: Add irq_get_trigger_type() to get IRQ flags
        genirq: Irqchip: document gcflags arg of irq_alloc_domain_generic_chips
        genirq: Set irq thread to RT priority on creation
        irqchip: Add support for Marvell Orion SoCs
        genirq: Add kerneldoc for irq_disable.
        genirq: irqchip: Add mask to block out invalid irqs
        genirq: Generic chip: Add linear irq domain support
        ...
      a4883ef6
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ab3d681e
      Linus Torvalds authored
      Pull RCU updates from Ingo Molnar:
       "The major changes:
      
        - Simplify RCU's grace-period and callback processing based on the new
          numbering for callbacks.
      
        - Removal of TINY_PREEMPT_RCU in favor of TREE_PREEMPT_RCU for
          single-CPU low-latency systems.
      
        - SRCU-related changes and fixes.
      
        - Miscellaneous fixes, including converting a few remaining printk()
          calls to pr_*().
      
        - Documentation updates"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
        rcu: Shrink TINY_RCU by reworking CPU-stall ifdefs
        rcu: Shrink TINY_RCU by moving exit_rcu()
        rcu: Remove TINY_PREEMPT_RCU tracing documentation
        rcu: Consolidate rcutiny_plugin.h ifdefs
        rcu: Remove rcu_preempt_note_context_switch()
        rcu: Remove the CONFIG_TINY_RCU ifdefs in rcutiny.h
        rcu: Remove check_cpu_stall_preempt()
        rcu: Simplify RCU_TINY RCU callback invocation
        rcu: Remove rcu_preempt_process_callbacks()
        rcu: Remove rcu_preempt_remove_callbacks()
        rcu: Remove rcu_preempt_check_callbacks()
        rcu: Remove show_tiny_preempt_stats()
        rcu: Remove TINY_PREEMPT_RCU
        powerpc,kvm: fix imbalance srcu_read_[un]lock()
        rcu: Remove srcu_read_lock_raw() and srcu_read_unlock_raw().
        rcu: Apply Dave Jones's NOCB Kconfig help feedback
        rcu: Merge adjacent identical ifdefs
        rcu: Drive quiescent-state-forcing delay from HZ
        rcu: Remove "Experimental" flags
        kthread: Add kworker kthreads to OS-jitter documentation
        ...
      ab3d681e
    • Linus Torvalds's avatar
      Merge branch 'core-mutexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 0c46d68d
      Linus Torvalds authored
      Pull WW mutex support from Ingo Molnar:
       "This tree adds support for wound/wait style locks, which the graphics
        guys would like to make use of in the TTM graphics subsystem.
      
        Wound/wait mutexes are used when other multiple lock acquisitions of a
        similar type can be done in an arbitrary order.  The deadlock handling
        used here is called wait/wound in the RDBMS literature: The older
        tasks waits until it can acquire the contended lock.  The younger
        tasks needs to back off and drop all the locks it is currently
        holding, ie the younger task is wounded.
      
        See this LWN.net description of W/W mutexes:
      
           https://lwn.net/Articles/548909/
      
        The comments there outline specific usecases for this facility (which
        have already been implemented for the DRM tree).
      
        Also see Documentation/ww-mutex-design.txt for more details"
      
      * 'core-mutexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        locking-selftests: Handle unexpected failures more strictly
        mutex: Add more w/w tests to test EDEADLK path handling
        mutex: Add more tests to lib/locking-selftest.c
        mutex: Add w/w tests to lib/locking-selftest.c
        mutex: Add w/w mutex slowpath debugging
        mutex: Add support for wound/wait style locks
        arch: Make __mutex_fastpath_lock_retval return whether fastpath succeeded or not
      0c46d68d
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3e42dee6
      Linus Torvalds authored
      Pull locking changes from Ingo Molnar:
       "Four miscellanous standalone fixes for futexes, rtmutexes and
        Kconfig.locks."
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        futex: Use freezable blocking call
        futex: Take hugepages into account when generating futex_key
        rtmutex: Document rt_mutex_adjust_prio_chain()
        locking: Fix copy/paste errors of "ARCH_INLINE_*_UNLOCK_BH"
      3e42dee6
    • Linus Torvalds's avatar
      Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 42daabf6
      Linus Torvalds authored
      Pull ARM SoC late changes from Arnd Bergmann:
       "These are changes that arrived a little late before the merge window
        or that have multiple dependencies on previous branches so they did
        not fit into one of the earlier ones.  There are 10 branches merged
        here, a total of 39 non-merge commits.  Contents are a mixed bag for
        the above reasons:
      
         * Two new SoC platforms: ST microelectronics stixxxx and the TI
           'Nspire' graphing calculator.  These should have been in the 'soc'
           branch but were a little late
         * Support for the Exynos 5420 variant in mach-exynos, which is based
           on the other exynos branches to avoid conflicts.
         * Various small changes for sh-mobile, ux500 and davinci
         * Common clk support for MSM"
      
      * tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
        ARM: ux500: bail out on alien cpus
        ARM: davinci: da850: adopt to pinctrl-single change for configuring multiple pins
        serial: sh-sci: Initialise variables before access in sci_set_termios()
        ARM: stih41x: Add B2020 board support
        ARM: stih41x: Add B2000 board support
        ARM: sti: Add DEBUG_LL console support
        ARM: sti: Add STiH416 SOC support
        ARM: sti: Add STiH415 SOC support
        ARM: msm: Migrate to common clock framework
        ARM: msm: Make proc_comm clock control into a platform driver
        ARM: msm: Prepare clk_get() users in mach-msm for clock-pcom driver
        ARM: msm: Remove clock-7x30.h include file
        ARM: msm: Remove custom clk_set_{max,min}_rate() API
        ARM: msm: Remove custom clk_set_flags() API
        msm: iommu: Use clk_set_rate() instead of clk_set_min_rate()
        msm: iommu: Convert to clk_prepare/unprepare
        msm_sdcc: Convert to clk_prepare/unprepare
        usb: otg: msm: Convert to clk_prepare/unprepare
        msm_serial: Use devm_clk_get() and properly return errors
        msm_serial: Convert to clk_prepare/unprepare
        ...
      42daabf6
    • Linus Torvalds's avatar
      Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 0bf6a210
      Linus Torvalds authored
      Pull ARM SoC driver specific changes from Arnd Bergmann:
       "These changes are all driver specific and cross over between arm-soc
        contents and some other subsystem, in these cases cpufreq, crypto,
        dma, pinctrl, mailbox and usb, and the subsystem owners agreed to have
        these changes merged through arm-soc.
      
        As we proceed to untangle the dependencies between platform code and
        driver code, the amount of changes in this category is fortunately
        shrinking, for 3.11 we have 16 branches here and 101 non-merge
        changesets, the majority of which are for the stedma40 dma engine
        driver used in the ux500 platform.  Cleaning up that code touches
        multiple subsystems, but gets rid of the dependency in the end.
      
        The mailbox code moved out from mach-omap2 to drivers/mailbox is an
        intermediate step and is still omap specific at the moment.  Patches
        exist to generalize the subsystem and add other drivers with the same
        API, but those did not make it for 3.11."
      
      * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (101 commits)
        crypto: ux500: use dmaengine_submit API
        crypto: ux500: use dmaengine_prep_slave_sg API
        crypto: ux500: use dmaengine_device_control API
        crypto: ux500/crypt: add missing __iomem qualifiers
        crypto: ux500/hash: add missing static qualifiers
        crypto: ux500/hash: use readl on iomem addresses
        dmaengine: ste_dma40: Declare memcpy config as static
        ARM: ux500: Remove mop500_snowball_ethernet_clock_enable()
        ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO
        ARM: ux500: Provide a AB8500 GPIO Device Tree node
        gpio: rcar: fix gpio_rcar_of_table
        gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections
        gpio-rcar: Reference core gpio documentation in the DT bindings
        clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
        ARM: dts: Update Samsung I2S documentation
        ARM: dts: add clock provider information for i2s controllers in Exynos5250
        ARM: dts: add Exynos audio subsystem clock controller node
        clk: samsung: register audio subsystem clocks using common clock framework
        ARM: dts: use #include for all device trees for Samsung
        pinctrl: s3c24xx: use correct header for chained_irq functions
        ...
      0bf6a210
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · ee1a8d40
      Linus Torvalds authored
      Pull ARM SoC device tree changes from Arnd Bergmann:
       "These changes from 30 individual branches for the most part update
        device tree files, but there are also a few source code changes that
        have crept in this time, usually in order to atomically move over a
        driver from using hardcoded data to DT probing.
      
        A number of platforms change their DT files to use the C preprocessor,
        which is causing a bit of churn, but that is hopefully only this once"
      
      * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
        ARM: at91: dt: rm9200ek: add spi support
        ARM: at91: dt: rm9200: add spi support
        ARM: at91/DT: at91sam9n12: add SPI DMA client infos
        ARM: at91/DT: sama5d3: add SPI DMA client infos
        ARM: at91/DT: fix SPI compatibility string
        ARM: Kirkwood: Fix the internal register ranges translation
        ARM: dts: bcm281xx: change comment to C89 style
        ARM: mmc: bcm281xx SDHCI driver (dt mods)
        ARM: nomadik: add the new clocks to the device tree
        clk: nomadik: implement the Nomadik clocks properly
        ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
        ARM: dts: omap4-panda: Fix DVI EDID reads
        ARM: dts: omap4-panda: Add USB Host support
        arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
        ARM: shmobile: irqpin: add a DT property to enable masking on parent
        ARM: dts: AM43x EPOS EVM support
        ARM: dts: OMAP5: Add bandgap DT entry
        ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
        ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
        ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
        ...
      ee1a8d40
    • Linus Torvalds's avatar
      Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 40e71e70
      Linus Torvalds authored
      Pull ARM SoC board specific changes from Arnd Bergmann:
       "These are 18 branches on 9 platforms with board specific changes,
        mostly for defconfig files, but nothing really exciting in here.
      
        Since the shmobile platform still uses board files for some of the
        newer machines, we get a few changes there as the result of drivers
        getting enabled for those boards.  This causes some conflicts with
        contents getting added from multiple branches in sh-mobile specific
        files.  Renesas is putting a lot of work into migrating to device-tree
        based setup, which will make all those files obsolete in the future
        and avoid both the conflicts and the need to have these files in the
        first place."
      
      * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
        arm: multi_v7_defconfig: Enable initrd/initramfs support
        arm: multi_v7_defconfig: Enable Zynq UART driver
        ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
        ARM: OMAP1: nokia770: enable Tahvo
        ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
        arm: omap: board-overo: reset GPIO for SMSC911x
        ARM: shmobile: BOCK-W: change Ether device name
        ARM: ux500: board-mop500: remove unused pin modes
        ARM: shmobile: bockw: add MMCIF support
        ARM: shmobile: bockw: add SPI FLASH support
        ARM: shmobile: bockw: add I2C device support
        ARM: shmobile: BOCK-W: add Ether support
        ARM: tegra: defconfig updates
        ARM: shmobile: bockw defconfig: add MMCIF support
        ARM: shmobile: bockw defconfig: add M25P80 support
        ARM: shmobile: bockw defconfig: add RTC RX8581 support
        ARM: shmobile: marzen: keep local function as static
        ARM: shmobile: bockw: add SDHI0 support
        ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC
        ARM: shmobile: lager: support GPIO switches
        ...
      40e71e70
    • Linus Torvalds's avatar
      Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 3883cbb6
      Linus Torvalds authored
      Pull ARM SoC specific changes from Arnd Bergmann:
       "These changes are all to SoC-specific code, a total of 33 branches on
        17 platforms were pulled into this.  Like last time, Renesas sh-mobile
        is now the platform with the most changes, followed by OMAP and
        EXYNOS.
      
        Two new platforms, TI Keystone and Rockchips RK3xxx are added in this
        branch, both containing almost no platform specific code at all, since
        they are using generic subsystem interfaces for clocks, pinctrl,
        interrupts etc.  The device drivers are getting merged through the
        respective subsystem maintainer trees.
      
        One more SoC (u300) is now multiplatform capable and several others
        (shmobile, exynos, msm, integrator, kirkwood, clps711x) are moving
        towards that goal with this series but need more work.
      
        Also noteworthy is the work on PCI here, which is traditionally part
        of the SoC specific code.  With the changes done by Thomas Petazzoni,
        we can now more easily have PCI host controller drivers as loadable
        modules and keep them separate from the platform code in
        drivers/pci/host.  This has already led to the discovery that three
        platforms (exynos, spear and imx) are actually using an identical PCIe
        host controller and will be able to share a driver once support for
        spear and imx is added."
      
      * tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (480 commits)
        ARM: integrator: let pciv3 use mem/premem from device tree
        ARM: integrator: set local side PCI addresses right
        ARM: dts: Add pcie controller node for exynos5440-ssdk5440
        ARM: dts: Add pcie controller node for Samsung EXYNOS5440 SoC
        ARM: EXYNOS: Enable PCIe support for Exynos5440
        pci: Add PCIe driver for Samsung Exynos
        ARM: OMAP5: voltagedomain data: remove temporary OMAP4 voltage data
        ARM: keystone: Move CPU bringup code to dedicated asm file
        ARM: multiplatform: always pick one CPU type
        ARM: imx: select syscon for IMX6SL
        ARM: keystone: select ARM_ERRATA_798181 only for SMP
        ARM: imx: Synertronixx scb9328 needs to select SOC_IMX1
        ARM: OMAP2+: AM43x: resolve SMP related build error
        dmaengine: edma: enable build for AM33XX
        ARM: edma: Add EDMA crossbar event mux support
        ARM: edma: Add DT and runtime PM support to the private EDMA API
        dmaengine: edma: Add TI EDMA device tree binding
        arm: add basic support for Rockchip RK3066a boards
        arm: add debug uarts for rockchip rk29xx and rk3xxx series
        arm: Add basic clocks for Rockchip rk3066a SoCs
        ...
      3883cbb6
    • Linus Torvalds's avatar
      Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d2033f2c
      Linus Torvalds authored
      Pull ARM SoC cleanups from Arnd Bergmann:
       "This contains cleanups as preparation for other branches adding new
        features, we pulled 16 branches for 9 platforms into this one.
      
        Most notable here is the removal of support for ATAGS based OMAP4
        systems.  Since all OMAP4 machines are fully functional with DT based
        booting in 3.10, we can remove a lot of code here.
      
        Also noteworthy is Maxime Ripard's cleanup of the machine descriptors,
        which means we need no machine descriptors in a lot more cases and can
        boot additional machines by just having the respective device drivers
        enabled."
      
      * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (76 commits)
        ARM: picoxcell: remove .nr_irqs reference
        ARM: s5p64x0: avoid build warning for uncompress.h
        ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header
        ARM: SAMSUNG: Remove legacy watchdog reset code
        ARM: SAMSUNG: Let platforms use the new watchdog reset driver
        ARM: SAMSUNG: Add watchdog reset driver
        ARM: SAMSUNG: Use local definitions of watchdog registers
        watchdog: s3c2410_wdt: Use local register definitions
        ARM: S5P64X0: Use common uncompress.h part for plat-samsung
        ARM: SAMSUNG: Consolidate uncompress subroutine
        ARM: at91: drop rm9200dk board support
        ARM: dts: msm: Fix merge resolution
        ARM: OMAP1: Remove dma.h
        ARM: OMAP1: Remove legacy irda.h and irda setup from board files
        ARM: OMAP1: Remove duplicated DMA channel definitions
        ARM: OMAP1: Remove McBSP DMA channel definitions
        ARM: OMAP2+: Remove dma.h
        ARM: OMAP2+: hwmod: Remove remaining DMA channel definitions
        ARM: OMAP2+: Remove duplicated DMA channel definitions
        ARM: OMAP2+: Remove AES crypto device DMA channel definitions
        ...
      d2033f2c
    • Linus Torvalds's avatar
      Merge tag 'fixes-non-critical-for-linus' of... · 22237d5a
      Linus Torvalds authored
      Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
      
      Pull ARM SoC non-cricitical bug fixes from Arnd Bergmann:
       "These are various bug fixes that were not considered important enough
        for merging into 3.10.
      
        The majority of the ARM fixes are for the OMAP and at91 platforms, and
        there is another set of bug fixes for device drivers that resolve
        'randconfig' build errors and that the subsystem maintainers either
        did not pick up or preferred to get merged through the arm-soc tree."
      
      * tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
        ARM: at91/PMC: use at91_usb_rate() for UTMI PLL
        ARM: at91/PMC: fix at91sam9n12 USB FS init
        ARM: at91/PMC: at91sam9n12 family has a PLLB
        ARM: at91/PMC: sama5d3 family doesn't have a PLLB
        ARM: tegra: fix section mismatch in tegra_pmc_parse_dt
        ARM: mxs: don't select HAVE_PWM
        ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
        cpuidle: calxeda: select ARM_CPU_SUSPEND
        ARM: mvebu: fix length of ethernet registers in mv78260 dtsi
        ARM: at91: cpuidle: Fix target_residency
        ARM: at91: fix at91_extern_irq usage for non-dt boards
        ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
        clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
        X.509: do not emit any informational output
        mtd: omap2: allow bulding as a module
        [SCSI] nsp32: use mdelay instead of large udelay constants
        hwrng: bcm2835: fix MODULE_LICENSE tag
        ARM: at91: Change the internal SRAM memory type MT_MEMORY_NONCACHED
        ARM: at91: Fix link breakage when !CONFIG_PHYLIB
        MAINTAINERS: Add exynos filename match to ARM/S5P EXYNOS ARM ARCHITECTURES
        ...
      22237d5a
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.11-rc1' of... · fc76a258
      Linus Torvalds authored
      Merge tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core updates from Greg KH:
       "Here's the big driver core merge for 3.11-rc1
      
        Lots of little things, and larger firmware subsystem updates, all
        described in the shortlog.  Nice thing here is that we finally get rid
        of CONFIG_HOTPLUG, after 10+ years, thanks to Stephen Rohtwell (it had
        been always on for a number of kernel releases, now it's just
        removed)"
      
      * tag 'driver-core-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (27 commits)
        driver core: device.h: fix doc compilation warnings
        firmware loader: fix another compile warning with PM_SLEEP unset
        build some drivers only when compile-testing
        firmware loader: fix compile warning with PM_SLEEP set
        kobject: sanitize argument for format string
        sysfs_notify is only possible on file attributes
        firmware loader: simplify holding module for request_firmware
        firmware loader: don't export cache_firmware and uncache_firmware
        drivers/base: Use attribute groups to create sysfs memory files
        firmware loader: fix compile warning
        firmware loader: fix build failure with !CONFIG_FW_LOADER_USER_HELPER
        Documentation: Updated broken link in HOWTO
        Finally eradicate CONFIG_HOTPLUG
        driver core: firmware loader: kill FW_ACTION_NOHOTPLUG requests before suspend
        driver core: firmware loader: don't cache FW_ACTION_NOHOTPLUG firmware
        Documentation: Tidy up some drivers/base/core.c kerneldoc content.
        platform_device: use a macro instead of platform_driver_register
        firmware: move EXPORT_SYMBOL annotations
        firmware: Avoid deadlock of usermodehelper lock at shutdown
        dell_rbu: Select CONFIG_FW_LOADER_USER_HELPER explicitly
        ...
      fc76a258
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · fe3c22bd
      Linus Torvalds authored
      Pull char/misc updates from Greg KH:
       "Here's the big char/misc driver tree merge for 3.11-rc1
      
        A variety of different driver patches here.  All of these have been in
        linux-next for a while, and the networking patches were acked-by David
        Miller, as it made sense for those patches to come through this tree"
      
      * tag 'char-misc-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (102 commits)
        Revert "char: misc: assign file->private_data in all cases"
        drivers: uio_pdrv_genirq: Use of_match_ptr() macro
        mei: check whether hw start has succeeded
        mei: check if the hardware reset succeeded
        mei: mei_cl_connect: don't multiply the timeout twice
        mei: do not override a client writing state when buffering
        mei: move mei_cl_irq_write_complete to client.c
        UIO: Fix concurrency issue
        drivers: uio_dmem_genirq: Use of_match_ptr() macro
        char: misc: assign file->private_data in all cases
        drivers: hv: allocate synic structures before hv_synic_init()
        drivers: hv: check interrupt mask before read_index
        vme: vme_tsi148.c: fix error return code in tsi148_probe()
        FMC: fix error handling in probe() function
        fmc: avoid readl/writel namespace conflict
        FMC: NULL dereference on allocation failure
        UIO: fix uio_pdrv_genirq with device tree but no interrupt
        UIO: allow binding uio_pdrv_genirq.c to devices using command line option
        FMC: add a char-device mezzanine driver
        FMC: add a driver to write mezzanine EEPROM
        ...
      fe3c22bd
    • Linus Torvalds's avatar
      Merge tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · ce49b628
      Linus Torvalds authored
      Pull staging tree update from Greg KH:
       "Here's the large staging tree merge for 3.11-rc1
      
        Huge thing here is the Lustre client code.  Unfortunatly, due to it
        not building properly on a wide variety of different architectures
        (this was production code???), it is currently disabled from the build
        so as to not annoy people.
      
        Other than Lustre, there are loads of comedi patches, working to clean
        up that subsystem, iio updates and new drivers, and a load of cleanups
        from the OPW applicants in their quest to get a summer internship.
      
        All of these have been in the linux-next releases for a while (hence
        the Lustre code being disabled)"
      
      Fixed up trivial conflict in drivers/staging/serqt_usb2/serqt_usb2.c due
      to independent renamings in the staging driver cleanup and the USB
      tree..
      
      * tag 'staging-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (868 commits)
        Revert "Revert "Revert "staging/lustre: drop CONFIG_BROKEN dependency"""
        staging: rtl8192u: fix line length in r819xU_phy.h
        staging: rtl8192u: rename variables in r819xU_phy.h
        staging: rtl8192u: fix comments in r819xU_phy.h
        staging: rtl8192u: fix whitespace in r819xU_phy.h
        staging: rtl8192u: fix newlines in r819xU_phy.c
        staging: comedi: unioxx5: use comedi_alloc_spriv()
        staging: comedi: unioxx5: fix unioxx5_detach()
        silicom: checkpatch: errors caused by macros
        Staging: silicom: remove the board_t typedef in bpctl_mod.c
        Staging: silicom: capitalize labels in the bp_media_type enum
        Staging: silicom: remove bp_media_type enum typedef
        staging: rtl8192u: replace msleep(1) with usleep_range() in r819xU_phy.c
        staging: rtl8192u: rename dwRegRead and rtStatus in r819xU_phy.c
        staging: rtl8192u: replace __FUNCTION__ in r819xU_phy.c
        staging: rtl8192u: limit line size in r819xU_phy.c
        zram: allow request end to coincide with disksize
        staging: drm/imx: use generic irq chip unused field to block out invalid irqs
        staging: drm/imx: use generic irqchip
        staging: drm/imx: ipu-dmfc: use defines for ipu channel numbers
        ...
      ce49b628
    • Linus Torvalds's avatar
      Merge tag 'tty-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 0de10f9e
      Linus Torvalds authored
      Pull tty/serial updates from Greg KH:
       "Here is the big TTY / Serial driver merge for 3.11-rc1.
      
        It's not all that big, nothing major changed in the tty api, which is
        a nice change, just a number of serial driver fixes and updates and
        new drivers, along with some n_tty fixes to help resolve some reported
        issues.
      
        All of these have been in the linux-next releases for a while, with
        the exception of the last revert patch, which was reported this past
        weekend by two different people as being needed."
      
      * tag 'tty-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (51 commits)
        Revert "serial: 8250_pci: add support for another kind of NetMos Technology PCI 9835 Multi-I/O Controller"
        pch_uart: Add uart_clk selection for the MinnowBoard
        tty: atmel_serial: prepare clk before calling enable
        tty: Reset itty for other pty
        n_tty: Buffer work should not reschedule itself
        n_tty: Fix unsafe update of available buffer space
        n_tty: Untangle read completion variables
        n_tty: Encapsulate minimum_to_wake within N_TTY
        serial: omap: Fix device tree based PM runtime
        serial: imx: Fix serial clock unbalance
        serial/mpc52xx_uart: fix kernel panic when system reboot
        serial: mfd: Add sysrq support
        serial: imx: enable the clocks for console
        tty: serial: add Freescale lpuart driver support
        serial: imx: Improve Kconfig text
        serial: imx: Allow module build
        serial: imx: Fix warning when !CONFIG_SERIAL_IMX_CONSOLE
        tty/serial/sirf: fix error propagation in sirfsoc_uart_probe()
        serial: omap: fix potential NULL pointer dereference in serial_omap_runtime_suspend()
        tty: serial: Enable uartlite for ARM zynq
        ...
      0de10f9e
    • Linus Torvalds's avatar
      Merge tag 'usb-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · a8427018
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here's the big USB 3.11-rc1 merge request.
      
        Lots of gadget and finally, chipidea driver updates (they were much
        needed), along with a new host controller driver, lots of little
        serial driver fixes, the removal of the 255 usb-serial device
        limitation, and a variety of other minor things.
      
        All of these have been in the linux-next releases for a while"
      
      * tag 'usb-3.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (254 commits)
        usb: musb: omap2430: make it compile again
        usb: chipidea: ci_hdrc_imx: access phy via private data
        xhci: Add missing unlocks on error paths
        USB: option,qcserial: move Novatel Gobi1K IDs to qcserial
        ehci-atmel.c: prepare clk before calling enable
        USB: ohci-at91: prepare clk before calling enable
        USB: HWA: fix device probe failure
        wusbcore: add entries in Documentation/ABI for new wusbhc sysfs attributes
        wusbcore: add sysfs attribute for retry count
        wusbcore: add sysfs attribute for DNTS count and interval
        usb: chipidea: drop "13xxx" infix
        usb: phy: tegra: remove duplicated include from phy-tegra-usb.c
        usb: host: xhci-plat: release mem region while removing module
        usbmisc_imx: allow autoloading on according to dt ids
        usb: fix build error without CONFIG_USB_PHY
        usb: check usb_hub_to_struct_hub() return value
        xhci: check for failed dma pool allocation
        usb: gadget: f_subset: fix missing unlock on error in geth_alloc()
        usb: gadget: f_ncm: fix missing unlock on error in ncm_alloc()
        usb: gadget: f_ecm: fix missing unlock on error in ecm_alloc()
        ...
      a8427018
    • Linus Torvalds's avatar
      Merge tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · bcd7351e
      Linus Torvalds authored
      Pull FS-Cache updates from David Howells:
       "This contains a number of fixes for various FS-Cache issues plus some
        cleanups.  The commits are, in order:
      
         1) Provide a system wait_on_atomic_t() and wake_up_atomic_t() sharing
            the bit-wait table (enhancement for #8).
      
         2) Don't put spin_lock() in a while-condition as spin_lock() may have
            a do {} while(0) wrapper (cleanup).
      
         3) Symbolically name i_mutex lock classes rather than using numbers
            in CacheFiles (cleanup).
      
         4) Don't sleep in page release if __GFP_FS is not set (deadlock vs
            ext4).
      
         5) Uninline fscache_object_init() (cleanup for #7).
      
         6) Wrap checks on object state (cleanup for #7).
      
         7) Simplify the object state machine by separating work states from
            wait states.
      
         8) Simplify cookie retention by objects (NULL pointer deref fix).
      
         9) Remove unused list_to_page() macro (cleanup).
      
        10) Make the remaining-pages counter in the retrieval op atomic
            (assertion failure fix).
      
        11) Don't use spin_is_locked() in assertions (assertion failure fix)"
      
      * tag 'fscache-20130702' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        FS-Cache: Don't use spin_is_locked() in assertions
        FS-Cache: The retrieval remaining-pages counter needs to be atomic_t
        cachefiles: remove unused macro list_to_page()
        FS-Cache: Simplify cookie retention for fscache_objects, fixing oops
        FS-Cache: Fix object state machine to have separate work and wait states
        FS-Cache: Wrap checks on object state
        FS-Cache: Uninline fscache_object_init()
        FS-Cache: Don't sleep in page release if __GFP_FS is not set
        CacheFiles: name i_mutex lock class explicitly
        fs/fscache: remove spin_lock() from the condition in while()
        Add wait_on_atomic_t() and wake_up_atomic_t()
      bcd7351e
    • Linus Torvalds's avatar
      Merge tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm · 6072a93b
      Linus Torvalds authored
      Pull dlm updates from David Teigland:
       "This set includes a number of SCTP related fixes in the dlm, and a few
        other minor fixes and changes."
      
      * tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
        dlm: Avoid LVB truncation
        dlm: log an error for unmanaged lockspaces
        dlm: config: using strlcpy instead of strncpy
        dlm: remove duplicated include from lowcomms.c
        dlm: disable nagle for SCTP
        dlm: retry failed SCTP sends
        dlm: try other IPs when sctp init assoc fails
        dlm: clear correct bit during sctp init failure handling
        dlm: set sctp assoc id during setup
        dlm: clear correct init bit during sctp setup
      6072a93b
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 3f490f7f
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "This patch-set includes the following major enhancement patches:
         - remount_fs callback function
         - restore parent inode number to enhance the fsync performance
         - xattr security labels
         - reduce the number of redundant lock/unlock data pages
         - avoid frequent write_inode calls
      
        The other minor bug fixes are as follows.
         - endian conversion bugs
         - various bugs in the roll-forward recovery routine"
      
      * tag 'for-f2fs-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (56 commits)
        f2fs: fix to recover i_size from roll-forward
        f2fs: remove the unused argument "sbi" of func destroy_fsync_dnodes()
        f2fs: remove reusing any prefree segments
        f2fs: code cleanup and simplify in func {find/add}_gc_inode
        f2fs: optimize the init_dirty_segmap function
        f2fs: fix an endian conversion bug detected by sparse
        f2fs: fix crc endian conversion
        f2fs: add remount_fs callback support
        f2fs: recover wrong pino after checkpoint during fsync
        f2fs: optimize do_write_data_page()
        f2fs: make locate_dirty_segment() as static
        f2fs: remove unnecessary parameter "offset" from __add_sum_entry()
        f2fs: avoid freqeunt write_inode calls
        f2fs: optimise the truncate_data_blocks_range() range
        f2fs: use the F2FS specific flags in f2fs_ioctl()
        f2fs: sync dir->i_size with its block allocation
        f2fs: fix i_blocks translation on various types of files
        f2fs: set sb->s_fs_info before calling parse_options()
        f2fs: support xattr security labels
        f2fs: fix iget/iput of dir during recovery
        ...
      3f490f7f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw · c4eb1b07
      Linus Torvalds authored
      Pull GFS2 updates from Steven Whitehouse:
       "There are a few bug fixes for various, mostly very minor corner cases,
        plus some interesting new features.
      
        The new features include atomic_open whose main benefit will be the
        reduction in locking overhead in case of combined lookup/create and
        open operations, sorting the log buffer lists by block number to
        improve the efficiency of AIL writeback, and aggressively issuing
        revokes in gfs2_log_flush to reduce overhead when dropping glocks."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Reserve journal space for quota change in do_grow
        GFS2: Fix fstrim boundary conditions
        GFS2: fix warning message
        GFS2: aggressively issue revokes in gfs2_log_flush
        GFS2: fix regression in dir_double_exhash
        GFS2: Add atomic_open support
        GFS2: Only do one directory search on create
        GFS2: fix error propagation in init_threads()
        GFS2: Remove no-op wrapper function
        GFS2: Cocci spatch "ptr_ret.spatch"
        GFS2: Eliminate gfs2_rg_lops
        GFS2: Sort buffer lists by inplace block number
      c4eb1b07
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9e239bb9
      Linus Torvalds authored
      Pull ext4 update from Ted Ts'o:
       "Lots of bug fixes, cleanups and optimizations.  In the bug fixes
        category, of note is a fix for on-line resizing file systems where the
        block size is smaller than the page size (i.e., file systems 1k blocks
        on x86, or more interestingly file systems with 4k blocks on Power or
        ia64 systems.)
      
        In the cleanup category, the ext4's punch hole implementation was
        significantly improved by Lukas Czerner, and now supports bigalloc
        file systems.  In addition, Jan Kara significantly cleaned up the
        write submission code path.  We also improved error checking and added
        a few sanity checks.
      
        In the optimizations category, two major optimizations deserve
        mention.  The first is that ext4_writepages() is now used for
        nodelalloc and ext3 compatibility mode.  This allows writes to be
        submitted much more efficiently as a single bio request, instead of
        being sent as individual 4k writes into the block layer (which then
        relied on the elevator code to coalesce the requests in the block
        queue).  Secondly, the extent cache shrink mechanism, which was
        introduce in 3.9, no longer has a scalability bottleneck caused by the
        i_es_lru spinlock.  Other optimizations include some changes to reduce
        CPU usage and to avoid issuing empty commits unnecessarily."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (86 commits)
        ext4: optimize starting extent in ext4_ext_rm_leaf()
        jbd2: invalidate handle if jbd2_journal_restart() fails
        ext4: translate flag bits to strings in tracepoints
        ext4: fix up error handling for mpage_map_and_submit_extent()
        jbd2: fix theoretical race in jbd2__journal_restart
        ext4: only zero partial blocks in ext4_zero_partial_blocks()
        ext4: check error return from ext4_write_inline_data_end()
        ext4: delete unnecessary C statements
        ext3,ext4: don't mess with dir_file->f_pos in htree_dirblock_to_tree()
        jbd2: move superblock checksum calculation to jbd2_write_superblock()
        ext4: pass inode pointer instead of file pointer to punch hole
        ext4: improve free space calculation for inline_data
        ext4: reduce object size when !CONFIG_PRINTK
        ext4: improve extent cache shrink mechanism to avoid to burn CPU time
        ext4: implement error handling of ext4_mb_new_preallocation()
        ext4: fix corruption when online resizing a fs with 1K block size
        ext4: delete unused variables
        ext4: return FIEMAP_EXTENT_UNKNOWN for delalloc extents
        jbd2: remove debug dependency on debug_fs and update Kconfig help text
        jbd2: use a single printk for jbd_debug()
        ...
      9e239bb9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 63580e51
      Linus Torvalds authored
      Pull VFS patches (part 1) from Al Viro:
       "The major change in this pile is ->readdir() replacement with
        ->iterate(), dealing with ->f_pos races in ->readdir() instances for
        good.
      
        There's a lot more, but I'd prefer to split the pull request into
        several stages and this is the first obvious cutoff point."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (67 commits)
        [readdir] constify ->actor
        [readdir] ->readdir() is gone
        [readdir] convert ecryptfs
        [readdir] convert coda
        [readdir] convert ocfs2
        [readdir] convert fatfs
        [readdir] convert xfs
        [readdir] convert btrfs
        [readdir] convert hostfs
        [readdir] convert afs
        [readdir] convert ncpfs
        [readdir] convert hfsplus
        [readdir] convert hfs
        [readdir] convert befs
        [readdir] convert cifs
        [readdir] convert freevxfs
        [readdir] convert fuse
        [readdir] convert hpfs
        reiserfs: switch reiserfs_readdir_dentry to inode
        reiserfs: is_privroot_deh() needs only directory inode, actually
        ...
      63580e51
    • Dave Chinner's avatar
      sync: don't block the flusher thread waiting on IO · 7747bd4b
      Dave Chinner authored
      
      
      When sync does it's WB_SYNC_ALL writeback, it issues data Io and
      then immediately waits for IO completion. This is done in the
      context of the flusher thread, and hence completely ties up the
      flusher thread for the backing device until all the dirty inodes
      have been synced. On filesystems that are dirtying inodes constantly
      and quickly, this means the flusher thread can be tied up for
      minutes per sync call and hence badly affect system level write IO
      performance as the page cache cannot be cleaned quickly.
      
      We already have a wait loop for IO completion for sync(2), so cut
      this out of the flusher thread and delegate it to wait_sb_inodes().
      Hence we can do rapid IO submission, and then wait for it all to
      complete.
      
      Effect of sync on fsmark before the patch:
      
      FSUse%        Count         Size    Files/sec     App Overhead
      .....
           0       640000         4096      35154.6          1026984
           0       720000         4096      36740.3          1023844
           0       800000         4096      36184.6           916599
           0       880000         4096       1282.7          1054367
           0       960000         4096       3951.3           918773
           0      1040000         4096      40646.2           996448
           0      1120000         4096      43610.1           895647
           0      1200000         4096      40333.1           921048
      
      And a single sync pass took:
      
        real    0m52.407s
        user    0m0.000s
        sys     0m0.090s
      
      After the patch, there is no impact on fsmark results, and each
      individual sync(2) operation run concurrently with the same fsmark
      workload takes roughly 7s:
      
        real    0m6.930s
        user    0m0.000s
        sys     0m0.039s
      
      IOWs, sync is 7-8x faster on a busy filesystem and does not have an
      adverse impact on ongoing async data write operations.
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarJan Kara <jack@suse.cz>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      7747bd4b
  2. 01 Jul, 2013 5 commits
    • Jaegeuk Kim's avatar
      f2fs: fix to recover i_size from roll-forward · a1dd3c13
      Jaegeuk Kim authored
      
      
      If user requests many data writes and fsync together, the last updated i_size
      should be stored to the inode block consistently.
      
      But, previous write_end just marks the inode as dirty and doesn't update its
      metadata into its inode block.
      After that, fsync just writes the inode block with newly updated data index
      excluding inode metadata updates.
      
      So, this patch introduces write_end in which updates inode block too when the
      i_size is changed.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      a1dd3c13
    • Gu Zheng's avatar
      f2fs: remove the unused argument "sbi" of func destroy_fsync_dnodes() · 5ebefc5b
      Gu Zheng authored
      
      
      As destroy_fsync_dnodes() is a simple list-cleanup func, so delete the unused
      and unrelated f2fs_sb_info argument of it.
      Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      5ebefc5b
    • Jaegeuk Kim's avatar
      f2fs: remove reusing any prefree segments · 763bfe1b
      Jaegeuk Kim authored
      
      
      This patch removes check_prefree_segments initially designed to enhance the
      performance by narrowing the range of LBA usage across the whole block device.
      
      When allocating a new segment, previous f2fs tries to find proper prefree
      segments, and then, if finds a segment, it reuses the segment for further
      data or node block allocation.
      
      However, I found that this was totally wrong approach since the prefree segments
      have several data or node blocks that will be used by the roll-forward mechanism
      operated after sudden-power-off.
      
      Let's assume the following scenario.
      
      /* write 8MB with fsync */
      for (i = 0; i < 2048; i++) {
      	offset = i * 4096;
      	write(fd, offset, 4KB);
      	fsync(fd);
      }
      
      In this case, naive segment allocation sequence will be like:
       data segment: x, x+1, x+2, x+3
       node segment: y, y+1, y+2, y+3.
      
      But, if we can reuse prefree segments, the sequence can be like:
       data segment: x, x+1, y, y+1
       node segment: y, y+1, y+2, y+3.
      Because, y, y+1, and y+2 became prefree segments one by one, and those are
      reused by data allocation.
      
      After conducting this workload, we should consider how to recover the latest
      inode with its data.
      If we reuse the prefree segments such as y or y+1, we lost the old node blocks
      so that f2fs even cannot start roll-forward recovery.
      
      Therefore, I suggest that we should remove reusing prefree segments.
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      763bfe1b
    • Gu Zheng's avatar
      f2fs: code cleanup and simplify in func {find/add}_gc_inode · 6cc4af56
      Gu Zheng authored
      
      
      This patch simplifies list operations in find_gc_inode and add_gc_inode.
      Just simple code cleanup.
      Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
      [Jaegeuk Kim: add description]
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      6cc4af56
    • Namjae Jeon's avatar
      f2fs: optimize the init_dirty_segmap function · 8736fbf0
      Namjae Jeon authored
      
      
      Optimize the while loop condition
      
      Since this condition will always be true and while loop will
      be terminated by the following condition in code:
      
      if (segno >= TOTAL_SEGS(sbi))
          break;
      Hence we can replace the while loop condition with while(1)
      instead of always checking for segno to be less than Total segs.
      
      Also we do not need to use TOTAL_SEGS() everytime. We can store
      this value in a local variable since this value is constant.
      Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
      Signed-off-by: default avatarPankaj Kumar <pankaj.km@samsung.com>
      Signed-off-by: default avatarJaegeuk Kim <jaegeuk.kim@samsung.com>
      8736fbf0