1. 30 Jun, 2014 1 commit
    • Jiri Slaby's avatar
      HID: sensor-hub: fix potential memory leak · ceec6340
      Jiri Slaby authored
      hsdev is not freed in sensor_hub_probe when kasprintf inside the for
      loop fails. This is because hsdev is not set to platform_data yet (to
      be freed by the code in the err_no_mem label). So free the memory
      explicitly in the 'if' branch, as this is the only place where this is
      (and will) be needed.
      
      Reported-by: coverity
      Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
      Cc: srinivas pandruvada <srinivas.pandruvada@intel.com>
      Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
      ceec6340
  2. 27 Jun, 2014 1 commit
  3. 12 Jun, 2014 1 commit
  4. 11 Jun, 2014 1 commit
  5. 10 Jun, 2014 1 commit
  6. 04 Jun, 2014 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid into next · d6b92c2c
      Linus Torvalds authored
      Pull HID patches from Jiri Kosina:
       - RMI driver for Synaptics touchpads, by Benjamin Tissoires, Andrew
         Duggan and Jiri Kosina
       - cleanup of hid-sony driver and improved support for Sixaxis and
         Dualshock 4, by Frank Praznik
       - other usual small fixes and support for new device IDs
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (29 commits)
        HID: thingm: thingm_fwinfo[] doesn't need to be global
        HID: core: add two new usages for digitizer
        HID: hid-sensor-hub: new device id and quirk for STM Sensor hub
        HID: usbhid: enable NO_INIT_REPORTS quirk for Semico USB Keykoard
        HID: hid-sensor-hub: Set report quirk for Microsoft Surface
        HID: debug: add labels for HID Sensor Usages
        HID: uhid: Use kmemdup instead of kmalloc + memcpy
        HID: rmi: do not handle touchscreens through hid-rmi
        HID: quirk for Saitek RAT7 and MMO7 mices' mode button
        HID: core: fix validation of report id 0
        HID: rmi: fix masks for x and w_x data
        HID: rmi: fix wrong struct field name
        HID: rmi: do not fetch more than 16 bytes in a query
        HID: rmi: check for the existence of some optional queries before reading query 12
        HID: i2c-hid: hid report descriptor retrieval changes
        HID: add missing hid usages
        HID: hid-sony - allow 3rd party INTEC controller to turn off all leds
        HID: sony: Add blink support to the Sixaxis and DualShock 4 LEDs
        HID: sony: Initialize the controller LEDs with a device ID value
        HID: sony: Use the controller Bluetooth MAC address as the unique value in the battery name string
        ...
      d6b92c2c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next · 1aacb90e
      Linus Torvalds authored
      Pull trivial tree changes from Jiri Kosina:
       "Usual pile of patches from trivial tree that make the world go round"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
        staging: go7007: remove reference to CONFIG_KMOD
        aic7xxx: Remove obsolete preprocessor define
        of: dma: doc fixes
        doc: fix incorrect formula to calculate CommitLimit value
        doc: Note need of bc in the kernel build from 3.10 onwards
        mm: Fix printk typo in dmapool.c
        modpost: Fix comment typo "Modules.symvers"
        Kconfig.debug: Grammar s/addition/additional/
        wimax: Spelling s/than/that/, wording s/destinatary/recipient/
        aic7xxx: Spelling s/termnation/termination/
        arm64: mm: Remove superfluous "the" in comment
        of: Spelling s/anonymouns/anonymous/
        dma: imx-sdma: Spelling s/determnine/determine/
        ath10k: Improve grammar in comments
        ath6kl: Spelling s/determnine/determine/
        of: Improve grammar for of_alias_get_id() documentation
        drm/exynos: Spelling s/contro/control/
        radio-bcm2048.c: fix wrong overflow check
        doc: printk-formats: do not mention casts for u64/s64
        doc: spelling error changes
        ...
      1aacb90e
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm into next · b05d59df
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "At over 200 commits, covering almost all supported architectures, this
        was a pretty active cycle for KVM.  Changes include:
      
         - a lot of s390 changes: optimizations, support for migration, GDB
           support and more
      
         - ARM changes are pretty small: support for the PSCI 0.2 hypercall
           interface on both the guest and the host (the latter acked by
           Catalin)
      
         - initial POWER8 and little-endian host support
      
         - support for running u-boot on embedded POWER targets
      
         - pretty large changes to MIPS too, completing the userspace
           interface and improving the handling of virtualized timer hardware
      
         - for x86, a larger set of changes is scheduled for 3.17.  Still, we
           have a few emulator bugfixes and support for running nested
           fully-virtualized Xen guests (para-virtualized Xen guests have
           always worked).  And some optimizations too.
      
        The only missing architecture here is ia64.  It's not a coincidence
        that support for KVM on ia64 is scheduled for removal in 3.17"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (203 commits)
        KVM: add missing cleanup_srcu_struct
        KVM: PPC: Book3S PR: Rework SLB switching code
        KVM: PPC: Book3S PR: Use SLB entry 0
        KVM: PPC: Book3S HV: Fix machine check delivery to guest
        KVM: PPC: Book3S HV: Work around POWER8 performance monitor bugs
        KVM: PPC: Book3S HV: Make sure we don't miss dirty pages
        KVM: PPC: Book3S HV: Fix dirty map for hugepages
        KVM: PPC: Book3S HV: Put huge-page HPTEs in rmap chain for base address
        KVM: PPC: Book3S HV: Fix check for running inside guest in global_invalidates()
        KVM: PPC: Book3S: Move KVM_REG_PPC_WORT to an unused register number
        KVM: PPC: Book3S: Add ONE_REG register names that were missed
        KVM: PPC: Add CAP to indicate hcall fixes
        KVM: PPC: MPIC: Reset IRQ source private members
        KVM: PPC: Graciously fail broken LE hypercalls
        PPC: ePAPR: Fix hypercall on LE guest
        KVM: PPC: BOOK3S: Remove open coded make_dsisr in alignment handler
        KVM: PPC: BOOK3S: Always use the saved DAR value
        PPC: KVM: Make NX bit available with magic page
        KVM: PPC: Disable NX for old magic page using guests
        KVM: PPC: BOOK3S: HV: Add mixed page-size support for guest
        ...
      b05d59df
    • Linus Torvalds's avatar
      Merge tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy into next · daf342af
      Linus Torvalds authored
      Pull jfs changes from Dave Kleikamp.
      
      * tag 'jfs-3.16' of git://github.com/kleikamp/linux-shaggy:
        fs/jfs/super.c: convert simple_str to kstr
        fs/jfs/jfs_dmap.c: replace min/casting by min_t
        fs/jfs/super.c: remove 0 assignment to static + code clean-up
        fs/jfs/jfs_logmgr.c: remove NULL assignment on static
        JFS: Check for NULL before calling posix_acl_equiv_mode()
        fs/jfs/jfs_inode.c: atomically set inode->i_flags
      daf342af
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of... · ba1bdefe
      Linus Torvalds authored
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw into next
      
      Pull gfs2 updates from Steven Whitehouse:
       "This must be about the smallest merge window patch set ever for GFS2.
        It is probably also the first one without a single patch from me.
        That is down to a combination of factors, and I have some things in
        the works that are not quite ready yet, that I hope to put in next
        time around.
      
        Returning to what is here this time...  we have 3 patches which fix
        various warnings.  Two are bug fixes (for quotas and also a rare
        recovery race condition).  The final patch, from Ben Marzinski, is an
        important change in the freeze code which has been in progress for
        some time.  This removes the need to take and drop the transaction
        lock for every single transaction, when the only time it was used, was
        at file system freeze time.  Ben's patch integrates the freeze
        operation into the journal flush code as an alternative with lower
        overheads and also lands up resolving some difficult to fix races at
        the same time"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:
        GFS2: Prevent recovery before the local journal is set
        GFS2: fs/gfs2/file.c: kernel-doc warning fixes
        GFS2: fs/gfs2/bmap.c: kernel-doc warning fixes
        GFS2: remove transaction glock
        GFS2: lops.c: replace 0 by NULL for pointers
        GFS2: quotas not being refreshed in gfs2_adjust_quota
      ba1bdefe
    • Linus Torvalds's avatar
      Merge tag 'locks-v3.16' of git://git.samba.org/jlayton/linux into next · 74efa045
      Linus Torvalds authored
      Pull file locking changes from Jeff Layton:
       "Pretty quiet on the file-locking related front this cycle.  Just some
        small cleanups and the addition of some tracepoints in the lease
        handling code"
      
      * tag 'locks-v3.16' of git://git.samba.org/jlayton/linux:
        locks: add some tracepoints in the lease handling code
        fs/locks.c: replace seq_printf by seq_puts
        locks: ensure that fl_owner is always initialized properly in flock and lease codepaths
      74efa045
    • Linus Torvalds's avatar
      Merge tag 'firewire-updates' of... · 1b363609
      Linus Torvalds authored
      Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 into next
      
      Pull firewire updates from Stefan Richter:
       "IEEE 1394 (FireWire) subsystem changes: One optimization for some VIA
        controllers, one fix, one kconfig brushup"
      
      * tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: ohci: enable MSI for VIA VT6315 rev 1, drop cycle timer quirk
        firewire: Use COMPILE_TEST for build testing
        firewire: net: fix NULL derefencing in fwnet_probe()
      1b363609
    • Thomas Gleixner's avatar
      clocksource: versatile: Use sched_clock_register() · 1605abff
      Thomas Gleixner authored
      The newly merged versatile sched clock support uses a deprecated
      interface.  Of course that patch got routed through the ARM tree instead
      of going through the relevant maintainer tree.
      
      Use the proper interface so we can get rid of the cruft.
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1605abff
    • Jiri Kosina's avatar
      Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and... · beea3f4a
      Jiri Kosina authored
      Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus
      beea3f4a
    • Jiri Kosina's avatar
      Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus · af5666e0
      Jiri Kosina authored
      Conflicts:
      	drivers/hid/hid-sensor-hub.c
      af5666e0
  7. 03 Jun, 2014 25 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 3de0ef8d
      Linus Torvalds authored
      Pull x86/UV changes from Ingo Molnar:
       "Continued updates for SGI UV 3 hardware support"
      
      * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/UV: Fix conditional in gru_exit()
        x86/UV: Set n_lshift based on GAM_GR_CONFIG MMR for UV3
      3de0ef8d
    • Linus Torvalds's avatar
      Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 06b77b97
      Linus Torvalds authored
      Pull x86 RAS changes from Ingo Molnar:
       "Improve mcheck device initialization and bootstrap robustness"
      
      * 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mce: Panic when a core has reached a timeout
        x86/mce: Improve mcheck_init_device() error handling
      06b77b97
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of... · 4aef77b2
      Linus Torvalds authored
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 IOSF platform updates from Ingo Molnar:
       "IOSF (Intel OnChip System Fabric) updates:
      
         - generalize the IOSF interface to allow mixed mode drivers: non-IOSF
           drivers to utilize of IOSF features on IOSF platforms.
      
         - add 'Quark X1000' IOSF/MBI support
      
         - clean up BayTrail and Quark PCI ID enumeration"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, iosf: Add PCI ID macros for better readability
        x86, iosf: Add Quark X1000 PCI ID
        x86, iosf: Added Quark MBI identifiers
        x86, iosf: Make IOSF driver modular and usable by more drivers
      4aef77b2
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · e0d23cdc
      Linus Torvalds authored
      Pull x86 mm update from Ingo Molnar:
      
       - speed up 256 GB PCI BAR ioremap()s
      
       - speed up PTE swapout page reclaim case
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, ioremap: Speed up check for RAM pages
        x86/mm: In the PTE swapout page reclaim case clear the accessed bit instead of flushing the TLB
      e0d23cdc
    • Linus Torvalds's avatar
      Merge branch 'x86-microcode-for-linus' of... · c33c4054
      Linus Torvalds authored
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 microcode changes from Ingo Molnar:
       "A microcode-debugging boot flag plus related refactoring"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode: Add a disable chicken bit
        x86, boot: Carve out early cmdline parsing function
      c33c4054
    • Linus Torvalds's avatar
      Merge branch 'x86-cleanups-for-linus' of... · e30c631b
      Linus Torvalds authored
      Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 irq cleanup from Ingo Molnar:
       "A single, trivial cleanup"
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Clean up VECTOR_UNDEFINED and VECTOR_RETRIGGERED definition
      e30c631b
    • Linus Torvalds's avatar
      Merge branch 'x86-build-for-linus' of... · 33ef765e
      Linus Torvalds authored
      Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 build cleanups from Ingo Molnar:
       "Two small build related cleanups"
      
      * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/build: Supress realmode.bin is up to date message
        compiler-intel.h: Remove duplicate definition
      33ef765e
    • Linus Torvalds's avatar
      Merge branch 'x86-boot-for-linus' of... · e7a38766
      Linus Torvalds authored
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull x86 boot changes from Ingo Molnar:
       "Two small cleanups"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, boot: Remove misc.h inclusion from compressed/string.c
        x86, boot: Do not include boot.h in string.c
      e7a38766
    • Linus Torvalds's avatar
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 3d1a3bda
      Linus Torvalds authored
      Pull x86 asm cleanups from Ingo Molnar:
       "A handful of entry_64.S cleanups"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86_64, entry: Merge paranoidzeroentry_ist into idtentry
        x86_64, entry: Merge most 64-bit asm entry macros
        x86_64, entry: Add missing 'DEFAULT_FRAME 0' entry annotations
      3d1a3bda
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · c84a1e32
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull scheduler updates from Ingo Molnar:
       "The main scheduling related changes in this cycle were:
      
         - various sched/numa updates, for better performance
      
         - tree wide cleanup of open coded nice levels
      
         - nohz fix related to rq->nr_running use
      
         - cpuidle changes and continued consolidation to improve the
           kernel/sched/idle.c high level idle scheduling logic.  As part of
           this effort I pulled cpuidle driver changes from Rafael as well.
      
         - standardized idle polling amongst architectures
      
         - continued work on preparing better power/energy aware scheduling
      
         - sched/rt updates
      
         - misc fixlets and cleanups"
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (49 commits)
        sched/numa: Decay ->wakee_flips instead of zeroing
        sched/numa: Update migrate_improves/degrades_locality()
        sched/numa: Allow task switch if load imbalance improves
        sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code
        sched: Consolidate open coded implementations of nice level frobbing into nice_to_rlimit() and rlimit_to_nice()
        sched: Initialize rq->age_stamp on processor start
        sched, nohz: Change rq->nr_running to always use wrappers
        sched: Fix the rq->next_balance logic in rebalance_domains() and idle_balance()
        sched: Use clamp() and clamp_val() to make sys_nice() more readable
        sched: Do not zero sg->cpumask and sg->sgp->power in build_sched_groups()
        sched/numa: Fix initialization of sched_domain_topology for NUMA
        sched: Call select_idle_sibling() when not affine_sd
        sched: Simplify return logic in sched_read_attr()
        sched: Simplify return logic in sched_copy_attr()
        sched: Fix exec_start/task_hot on migrated tasks
        arm64: Remove TIF_POLLING_NRFLAG
        metag: Remove TIF_POLLING_NRFLAG
        sched/idle: Make cpuidle_idle_call() void
        sched/idle: Reflow cpuidle_idle_call()
        sched/idle: Delay clearing the polling bit
        ...
      c84a1e32
    • Linus Torvalds's avatar
      Merge branch 'perf-core-for-linus' of... · 3d521f91
      Linus Torvalds authored
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull perf updates from Ingo Molnar:
       "The tooling changes maintained by Jiri Olsa until Arnaldo is on
        vacation:
      
        User visible changes:
         - Add -F option for specifying output fields (Namhyung Kim)
         - Propagate exit status of a command line workload for record command
           (Namhyung Kim)
         - Use tid for finding thread (Namhyung Kim)
         - Clarify the output of perf sched map plus small sched command
           fixes (Dongsheng Yang)
         - Wire up perf_regs and unwind support for ARM64 (Jean Pihet)
         - Factor hists statistics counts processing which in turn also fixes
           several bugs in TUI report command (Namhyung Kim)
         - Add --percentage option to control absolute/relative percentage
           output (Namhyung Kim)
         - Add --list-cmds to 'kmem', 'mem', 'lock' and 'sched', for use by
           completion scripts (Ramkumar Ramachandra)
      
        Development/infrastructure changes and fixes:
         - Android related fixes for pager and map dso resolving (Michael
           Lentine)
         - Add libdw DWARF post unwind support for ARM (Jean Pihet)
         - Consolidate types.h for ARM and ARM64 (Jean Pihet)
         - Fix possible null pointer dereference in session.c (Masanari Iida)
         - Cleanup, remove unused variables in map_switch_event() (Dongsheng
           Yang)
         - Remove nr_state_machine_bugs in perf latency (Dongsheng Yang)
         - Remove usage of trace_sched_wakeup(.success) (Peter Zijlstra)
         - Cleanups for perf.h header (Jiri Olsa)
         - Consolidate types.h and export.h within tools (Borislav Petkov)
         - Move u64_swap union to its single user's header, evsel.h (Borislav
           Petkov)
         - Fix for s390 to properly parse tracepoints plus test code
           (Alexander Yarygin)
         - Handle EINTR error for readn/writen (Namhyung Kim)
         - Add a test case for hists filtering (Namhyung Kim)
         - Share map_groups among threads of the same group (Arnaldo Carvalho
           de Melo, Jiri Olsa)
         - Making some code (cpu node map and report parse callchain callback)
           global to be usable by upcomming changes (Don Zickus)
         - Fix pmu object compilation error (Jiri Olsa)
      
        Kernel side changes:
         - intrusive uprobes fixes from Oleg Nesterov.  Since the interface is
           admin-only, and the bug only affects user-space ("any probed
           jmp/call can kill the application"), we queued these fixes via the
           development tree, as a special exception.
         - more fuzzer motivated race fixes and related refactoring and
           robustization.
         - allow PMU drivers to be built as modules.  (No actual module yet,
           because the x86 Intel uncore module wasn't ready in time for this)"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (114 commits)
        perf tools: Add automatic remapping of Android libraries
        perf tools: Add cat as fallback pager
        perf tests: Add a testcase for histogram output sorting
        perf tests: Factor out print_hists_*()
        perf tools: Introduce reset_output_field()
        perf tools: Get rid of obsolete hist_entry__sort_list
        perf hists: Reset width of output fields with header length
        perf tools: Skip elided sort entries
        perf top: Add --fields option to specify output fields
        perf report/tui: Fix a bug when --fields/sort is given
        perf tools: Add ->sort() member to struct sort_entry
        perf report: Add -F option to specify output fields
        perf tools: Call perf_hpp__init() before setting up GUI browsers
        perf tools: Consolidate management of default sort orders
        perf tools: Allow hpp fields to be sort keys
        perf ui: Get rid of callback from __hpp__fmt()
        perf tools: Consolidate output field handling to hpp format routines
        perf tools: Use hpp formats to sort final output
        perf tools: Support event grouping in hpp ->sort()
        perf tools: Use hpp formats to sort hist entries
        ...
      3d521f91
    • Linus Torvalds's avatar
      Merge branch 'locking-core-for-linus' of... · 776edb59
      Linus Torvalds authored
      Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull core locking updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - reduced/streamlined smp_mb__*() interface that allows more usecases
           and makes the existing ones less buggy, especially in rarer
           architectures
      
         - add rwsem implementation comments
      
         - bump up lockdep limits"
      
      * 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (33 commits)
        rwsem: Add comments to explain the meaning of the rwsem's count field
        lockdep: Increase static allocations
        arch: Mass conversion of smp_mb__*()
        arch,doc: Convert smp_mb__*()
        arch,xtensa: Convert smp_mb__*()
        arch,x86: Convert smp_mb__*()
        arch,tile: Convert smp_mb__*()
        arch,sparc: Convert smp_mb__*()
        arch,sh: Convert smp_mb__*()
        arch,score: Convert smp_mb__*()
        arch,s390: Convert smp_mb__*()
        arch,powerpc: Convert smp_mb__*()
        arch,parisc: Convert smp_mb__*()
        arch,openrisc: Convert smp_mb__*()
        arch,mn10300: Convert smp_mb__*()
        arch,mips: Convert smp_mb__*()
        arch,metag: Convert smp_mb__*()
        arch,m68k: Convert smp_mb__*()
        arch,m32r: Convert smp_mb__*()
        arch,ia64: Convert smp_mb__*()
        ...
      776edb59
    • Linus Torvalds's avatar
      Merge branch 'core-rcu-for-linus' of... · 59a3d4c3
      Linus Torvalds authored
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull RCU changes from Ingo Molnar:
       "The main RCU changes in this cycle were:
      
         - RCU torture-test changes.
      
         - variable-name renaming cleanup.
      
         - update RCU documentation.
      
         - miscellaneous fixes.
      
         - patch to suppress RCU stall warnings while sysrq requests are being
           processed"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (68 commits)
        rcu: Provide API to suppress stall warnings while sysrc runs
        rcu: Variable name changed in tree_plugin.h and used in tree.c
        torture: Remove unused definition
        torture: Remove __init from torture_init_begin/end
        torture: Check for multiple concurrent torture tests
        locktorture: Remove reference to nonexistent Kconfig parameter
        rcutorture: Run rcu_torture_writer at normal priority
        rcutorture: Note diffs from git commits
        rcutorture: Add missing destroy_timer_on_stack()
        rcutorture: Explicitly test synchronous grace-period primitives
        rcutorture:  Add tests for get_state_synchronize_rcu()
        rcutorture: Test RCU-sched primitives in TREE_PREEMPT_RCU kernels
        torture: Use elapsed time to detect hangs
        rcutorture: Check for rcu_torture_fqs creation errors
        torture: Better summary diagnostics for build failures
        torture: Notice if an all-zero cpumask is passed inside a critical section
        rcutorture: Make rcu_torture_reader() use cond_resched()
        sched,rcu: Make cond_resched() report RCU quiescent states
        percpu: Fix raw_cpu_inc_return()
        rcutorture: Export RCU grace-period kthread wait state to rcutorture
        ...
      59a3d4c3
    • Fabian Frederick's avatar
      fs/jfs/super.c: convert simple_str to kstr · bb5e50aa
      Fabian Frederick authored
      This patch replaces obsolete simple_str functions by kstr
      
      use kstrtouint for
      -uid_t ( __kernel_uid32_t )
      -gid_t ( __kernel_gid32_t )
      -jfs_sb_info->umask
      -jfs_sb_info->minblks_trim
      (all unsigned int)
      
      newLVSize is s64 -> use kstrtol
      
      Current parse_options behaviour stays the same ie it doesn't return kstr
      rc but just 0 if function failed (parse_options callsites
      return -EINVAL when there's anything wrong).
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      bb5e50aa
    • Fabian Frederick's avatar
      fs/jfs/jfs_dmap.c: replace min/casting by min_t · 4f65b6db
      Fabian Frederick authored
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      4f65b6db
    • Fabian Frederick's avatar
      fs/jfs/super.c: remove 0 assignment to static + code clean-up · 789602e9
      Fabian Frederick authored
      -Static values are automatically initialized to NULL
      -Coalesce format fragments
      -Remove unnecessary {}
      -Small typo fixes
      -Fix lines > 80 characters
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
      789602e9
    • Fabian Frederick's avatar
      fs/jfs/jfs_logmgr.c: remove NULL assignment on static · bc4e6b28
      Fabian Frederick authored
      Static values are automatically initialized to NULL
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
      bc4e6b28
    • Linus Torvalds's avatar
      Merge branch 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping into next · ff806d03
      Linus Torvalds authored
      Pull CMA and DMA-mapping fixes from Marek Szyprowski:
       "A few fixes for dma-mapping and CMA subsystems"
      
      * 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        CMA: correct unlock target
        drivers/base/dma-contiguous.c: erratum of dev_get_cma_area
        arm: dma-mapping: add checking cma area initialized
        arm: dma-iommu: Clean up redundant variable
        cma: Remove potential deadlock situation
      ff806d03
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.16' of... · 312c76f1
      Linus Torvalds authored
      Merge tag 'regulator-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next
      
      Pull regulator updates from Mark Brown:
       "The bulk of the changes for this release are a few new drivers however
        there are a couple of noticable core changes and the usual stream of
        cleanups and fixes:
      
         - move disable of unused regulators later in init so it comes after
           deferred probe has iterated making startup smoother.
         - fixes to reference counting of the DT nodes for constraints from
           Charles Keepax.  This has little practical impact since all real
           users of the regulator bindings use FDT which doesn't need the
           reference counting.
         - lots of cleanups, especially to the Samsung drivers.
         - support for Linear Technologies LTC3589, Texas Instruments
           TPS658640 and X-Powers AXP20x"
      
      * tag 'regulator-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (64 commits)
        regulator: pbias: remove unnecessary OOM messages
        regulator: max8649: remove unnecessary OOM messages
        regulator: core: Fix the init of DT defined fixed regulators
        regulator: core: Disable unused regulators after deferred probing is done
        regulator: Don't disable unused regulators we don't have permission for
        regulator: axp20x: Use regulator_map_voltage_ascend for LDO4
        regulator: use of_property_read_{bool|u32}()
        regulator: Fix regulator_get_{optional,exclusive}() documentation
        regulators: Add definition of regulator_set_voltage_time() for !CONFIG_REGULATOR
        regulator: arizona-ldo1: add missing #include
        regulator: pfuze100: Support enable/disable for fixed regulator
        regulator: ltc3589: Remove ltc3589_list_voltage_fixed function
        regulator: ltc3589: Fix module dependency
        regulator: tps6586x: Remove unused to_tps6586x_dev() function
        regulator: tps65218: Convert to use regulator_set_voltage_time_sel
        regulator: tps6586x: Add support for the TPS658640
        regulator: tps6586x: Prepare supporting fixed regulators
        regulator: pfuze100: Don't allocate an invalid gpio
        regulator: pfuze100: Support SWB enable/disable
        regulator: fixed: use of_property_read_{bool|u32}()
        ...
      312c76f1
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into next · e13cccfd
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "For this release SPI has been exceptionally quiet, all the work has
        been on improving drivers (including taking advantage of some of the
        recent framework updates):
      
         - DMA support for the rspi driver providing a nice performance boost
         - performance improvement for the SIRF controller in PIO mode
         - new support for the Cadence SPI IP and for pxa2xx on BayTrail"
      
      * tag 'spi-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (59 commits)
        spi: rspi: Extract rspi_common_transfer()
        spi: rspi: Add DMA support for RSPI on RZ/A1H
        spi: rspi: Add DMA support for QSPI on R-Car Gen2
        spi: rspi: Absorb rspi_rz_transfer_out_in() into rspi_rz_transfer_one()
        spi: rspi: Merge rspi_*_dma() into rspi_dma_transfer()
        spi: rspi: Pass sg_tables instead of spi_tranfer to rspi_*_dma()
        spi: rspi: Move RSPI-specific setup out of DMA routines
        spi: rspi: Use SPI core DMA mapping framework
        spi: rspi: SPI DMA core needs both RX and TX DMA to function
        spi: rspi: Remove unneeded resource test in DMA setup
        spi: rspi: Extract rspi_request_dma_chan()
        spi: rspi: Don't consider DMA configuration failures fatal
        spi: rspi: Extract rspi_pio_transfer()
        spi: rspi: Use core SPI_MASTER_MUST_[RT]X handling
        spi: rspi: Remove unused 16-bit DMA support
        spi: rspi: Do not call rspi_receive_init() for TX-only
        spi: rspi: Extract rspi_wait_for_{tx_empty,rx_full}()
        spi/pxa2xx: fix runtime PM enabling order
        spi/fsl-espi: fix rx_buf in fsl_espi_cmd_trans()/fsl_espi_rw_trans()
        spi: core: Ignore unsupported spi-[tr]x-bus-width property values
        ...
      e13cccfd
    • Linus Torvalds's avatar
      Merge tag 'regmap-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into next · de6b25de
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "Another fairly quiet release, a few bug fixes and a couple of new
        features:
      
         - support for I2C devices connected to SMBus rather than full I2C
           controllers contributed by Boris Brezillon.  If the controller is
           only capable of SMBus operation the framework will transparently
           fall back to that
      
         - suport for little endian values, contributed by Xiubo Li"
      
      * tag 'regmap-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: mmio: Fix regmap_mmio_write for uneven counts
        regmap: irq: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
        regmap: Add missing initialization of this_page
        regmap: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
        regmap: i2c: fallback to SMBus if the adapter does not support standard I2C
        regmap: add reg_read/reg_write callbacks to regmap_bus struct
        regmap: rbtree: improve 64bits memory alignment
        regmap: mmio: Fix the bug of 'offset' value parsing.
        regmap: implement LE formatting/parsing for 16/32-bit values.
      de6b25de
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.16-1' of... · bd698cf6
      Linus Torvalds authored
      Merge tag 'pinctrl-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into next
      
      Pull pin control changes from Linus Walleij:
       "This is the bulk of pin control changes for the v3.16 development
        cycle:
      
         - Antoine Tenart made the get_group_pins() vtable entry optional.
      
         - Antoine also provides an entirely new driver for the Marvell Berlin
           SoC.  This is unrelated to the existing MVEBU hardware driver and
           warrants its own separate driver.
      
         - reflected from the GPIO subsystem there is a number of refactorings
           to make pin control drivers with gpiochips use the new gpiolib
           irqchip helpers.  The following drivers were converted to use the
           new infrastructure:
             * ST Microelectronics STiH416 and friends
             * The Atmel AT91
             * The CSR SiRF (Prima2)
             * The Qualcomm MSM series
      
         - massive improvements in the Qualcomm MSM driver from Bjorn
           Andersson, Andy Gross and Kumar Gala.  Among those new support for
           the IPQ8064 and MSM8x74 SoC variants.
      
         - support for the Freescale i.MX6 SoloX SoC variant.
      
         - massive improvements in the Allwinner sunxi driver from Boris
           Brezillon, Maxime Ripard and Chen-Yu Tsai.
      
         - Renesas PFC updates from Laurent Pinchart, Kuninori Morimoto,
           Wolfram Sang and Magnus Damm.
      
         - Cleanups and refactorings of the nVidia Tegra driver from Stepgen
           Warren.
      
         - the Exynos driver now supports the Exynos3250 SoC.
      
         - Intel BayTrail updates from Jin Yao, Mika Westerberg.
      
         - the MVEBU driver now supports the Orion5x SoC variants, which is
           part of the effort of getting rid of the old Marvell kludges in
           arch/arm/mach-orion5x
      
         - Rockchip driver updates from Heiko Stuebner.
      
         - a ton of cleanups and janitorial patches from Axel Lin.
      
         - some minor fixes and improvements here and there"
      
      * tag 'pinctrl-v3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (93 commits)
        pinctrl: sirf: fix a bad conflict resolution
        pinctrl: msm: Add more MSM8X74 pin definitions
        pinctrl: qcom: ipq8064: Fix naming convention
        pinctrl: msm: Add missing sdc1 and sdc3 groups
        pinctrl: sirf: switch to using allocated state container
        pinctrl: Enable "power-source" to be extracted from DT files
        pinctrl: sunxi: create irq/pin mapping during init
        pinctrl: pinconf-generic: Use kmemdup instead of kmalloc + memcpy
        pinctrl: berlin: Use devm_ioremap_resource()
        pinctrl: sirf: fix typo for GPIO bank number
        pinctrl: sunxi: depend on RESET_CONTROLLER
        pinctrl: sunxi: fix pin numbers passed to register offset helpers
        pinctrl: add pinctrl driver for imx6sx
        pinctrl/at91: Fix lockup when IRQ on PIOC and PIOD occurs
        pinctrl: msm: switch to using generic GPIO irqchip helpers
        pinctrl: sunxi: Fix multiple registration issue
        pinctrl: sunxi: Fix recursive dependency
        pinctrl: berlin: add the BG2CD pinctrl driver
        pinctrl: berlin: add the BG2 pinctrl driver
        pinctrl: berlin: add the BG2Q pinctrl driver
        ...
      bd698cf6
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of... · f4562052
      Linus Torvalds authored
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging into next
      
      Pull hwmon updates from Guenter Roeck:
       "New driver for NCT6683D
      
        New chip support to existing drivers:
         - add support for STTS2004 and AT30TSE004 to jc42 driver
         - add support for EMC1402/EMC1412/EMC1422 to emc1403 driver
      
        Other notable changes:
         - document hwmon kernel API
         - convert jc42, lm70, lm75, lm77, lm83, lm92, max1619, tmp421, and
           tmp102 drivers to use new hwmon API functions
         - replace function macros in lm80, lm92, and jc42 drivers with real
           code
         - convert emc1403 driver to use regmap, add support for additional
           attributes, and add device IDs for EMC1412, EMC1413, and EMC1414
         - various additional cleanup and minor bug fixes in several drivers"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (60 commits)
        hwmon: (nct6775) Fix probe unwind paths to properly unregister platform devices
        hwmon: (nct6683) Fix probe unwind paths to properly unregister platform devices
        hwmon: (ultra45_env) Introduce managed version of kzalloc
        hwmon: Driver for NCT6683D
        hwmon: (lm80) Rearrange code to avoid forward declarations
        hwmon: (lm80) Convert fan display function macros into functions
        hwmon: (lm80) Convert voltage display function macros into functions
        hwmon: (lm80) Convert temperature display function macros into functions
        hwmon: (lm80) Normalize all temperature values to 16 bit
        hwmon: (lm80) Simplify TEMP_FROM_REG
        hwmon: (lm83) Convert to use devm_hwmon_device_register_with_groups
        hwmon: (lm83) Rearange code to avoid forward declarations
        hwmon: (lm83) Drop FSF address
        hwmon: (max1619) Convert to use devm_hwmon_device_register_with_groups
        hwmon: (max1619) Drop function macros
        hwmon: (max1619) Rearrange code to avoid forward declarations
        hwmon: (max1619) Drop FSF address
        hwmon: (max1619) Fix critical alarm display
        hwmon: (jc42) Add support for STTS2004 and AT30TSE004
        hwmon: (jc42) Convert function macros into functions
        ...
      f4562052
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux into next · 8f5759ae
      Linus Torvalds authored
      Pull first set of s390 updates from Martin Schwidefsky:
       "The biggest change in this patchset is conversion from the bootmem
        bitmaps to the memblock code.  This conversion requires two common
        code patches to introduce the 'physmem' memblock list.
      
        We experimented with ticket spinlocks but in the end decided against
        them as they perform poorly on virtualized systems.  But the spinlock
        cleanup and some small improvements are included.
      
        The uaccess code got another optimization, the get_user/put_user calls
        are now inline again for kernel compiles targeted at z10 or newer
        machines.  This makes the text segment shorter and the code gets a
        little bit faster.
      
        And as always some bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)
        s390/lowcore: replace lowcore irb array with a per-cpu variable
        s390/lowcore: reserve 96 bytes for IRB in lowcore
        s390/facilities: remove extract-cpu-time facility check
        s390: require mvcos facility for z10 and newer machines
        s390/boot: fix boot of compressed kernel built with gcc 4.9
        s390/cio: remove weird assignment during argument evaluation
        s390/time: cast tv_nsec to u64 prior to shift in update_vsyscall
        s390/oprofile: make return of 0 explicit
        s390/spinlock: refactor arch_spin_lock_wait[_flags]
        s390/rwlock: add missing local_irq_restore calls
        s390/spinlock,rwlock: always to a load-and-test first
        s390/cio: fix multiple structure definitions
        s390/spinlock: fix system hang with spin_retry <= 0
        s390/appldata: add slab.h for kzalloc/kfree
        s390/uaccess: provide inline variants of get_user/put_user
        s390/pci: add some new arch specific pci attributes
        s390/pci: use pdev->dev.groups for attribute creation
        s390/pci: use macro for attribute creation
        s390/pci: improve state check when processing hotplug events
        s390: split TIF bits into CIF, PIF and TIF bits
        ...
      8f5759ae
    • Linus Torvalds's avatar
      Merge tag 'usb-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb into next · e5c4ecdc
      Linus Torvalds authored
      Pull USB driver updates from Greg KH:
       "Here is the big USB driver pull request for 3.16-rc1.
      
        Nothing huge here, but lots of little things in the USB core, and in
        lots of drivers.  Hopefully the USB power management will be work
        better now that it has been reworked to do per-port power control
        dynamically.  There's also a raft of gadget driver updates and fixes,
        CONFIG_USB_DEBUG is finally gone now that everything has been
        converted over to the dynamic debug inteface, the last hold-out
        drivers were cleaned up and the config option removed.  There were
        also other minor things all through the drivers/usb/ tree, the
        shortlog shows this pretty well.
      
        All have been in linux-next, including the very last patch, which came
        from linux-next to fix a build issue on some platforms"
      
      * tag 'usb-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (314 commits)
        usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
        USB: orinoco_usb: remove CONFIG_USB_DEBUG support
        USB: media: lirc: igorplugusb: remove CONFIG_USB_DEBUG support
        USB: media: streamzap: remove CONFIG_USB_DEBUG
        USB: media: redrat3: remove CONFIG_USB_DEBUG usage
        USB: media: redrat3: remove unneeded tracing macro
        usb: qcserial: add additional Sierra Wireless QMI devices
        usb: host: max3421-hcd: Use module_spi_driver
        usb: host: max3421-hcd: Allow platform-data to specify Vbus polarity
        usb: host: max3421-hcd: fix "spi_rd8" uses dynamic stack allocation warning
        usb: host: max3421-hcd: Fix missing unlock in max3421_urb_enqueue()
        usb: qcserial: add Netgear AirCard 341U
        Documentation: dt-bindings: update xhci-platform DT binding for R-Car H2 and M2
        usb: host: xhci-plat: add xhci_plat_start()
        usb: host: max3421-hcd: Fix potential NULL urb dereference
        Revert "usb: gadget: net2280: Add support for PLX USB338X"
        USB: usbip: remove CONFIG_USB_DEBUG reference
        USB: remove CONFIG_USB_DEBUG from defconfig files
        usb: resume child device when port is powered on
        usb: hub_handle_remote_wakeup() depends on CONFIG_PM_RUNTIME=y
        ...
      e5c4ecdc