1. 05 8月, 2016 27 次提交
  2. 29 7月, 2016 6 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 884316de
      Linus Torvalds 提交于
      Pull HID updates from Jiri Kosina:
      
       - new hid-alps driver for ALPS Touchpad-Stick device, from Masaki Ota
      
       - much improved and generalized HID led handling, and merge of
         specialized hid-thingm driver into this generic hid-led one, from
         Heiner Kallweit
      
       - i2c-hid power management improvements from Fu Zhonghui and Guohua
         Zhong
      
       - uhid initialization race fix from Roderick Colenbrander
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (21 commits)
        HID: add usb device id for Apple Magic Keyboard
        HID: hid-led: fix Delcom support on big endian systems
        HID: hid-led: add support for Greynut Luxafor
        HID: hid-led: add support for Delcom Visual Signal Indicator G2
        HID: hid-led: remove report id from struct hidled_config
        HID: alps: a few cleanups
        HID: remove ThingM blink(1) driver
        HID: hid-led: add support for ThingM blink(1)
        HID: hid-led: add support for reading from LED devices
        HID: hid-led: add support for devices with multiple independent LEDs
        HID: i2c-hid: set power sleep before shutdown
        HID: alps: match alps devices in core
        HID: thingm: simplify debug output code
        HID: alps: pass correct sizes to hid_hw_raw_request()
        HID: alps: struct u1_dev *priv is internal to the driver
        HID: add Alps I2C HID Touchpad-Stick support
        HID: led: fix config
        usb: misc: remove outdated USB LED driver
        HID: migrate USB LED driver from usb misc to hid
        HID: i2c_hid: enable i2c-hid devices to suspend/resume asynchronously
        ...
      884316de
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 69c42894
      Linus Torvalds 提交于
      Pull trivial tree updates from Jiri Kosina.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
        fat: fix error message for bogus number of directory entries
        fat: fix typo s/supeblock/superblock/
        ASoC: max9877: Remove unused function declaration
        dw2102: don't output spurious blank lines to the kernel log
        init: fix Kconfig text
        ARM: io: fix comment grammar
        ocfs: fix ocfs2_xattr_user_get() argument name
        scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()
      69c42894
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 76d5b28b
      Linus Torvalds 提交于
      Pull quota update from Jan Kara:
       "time64 support for quota"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        quota: use time64_t internally
      76d5b28b
    • L
      Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 71e9dcc0
      Linus Torvalds 提交于
      Pull random driver fix from Ted Ts'o:
       "Fix a boot failure on systems with non-contiguous NUMA id's"
      
      * tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: use for_each_online_node() to iterate over NUMA nodes
      71e9dcc0
    • L
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 6784725a
      Linus Torvalds 提交于
      Pull vfs updates from Al Viro:
       "Assorted cleanups and fixes.
      
        Probably the most interesting part long-term is ->d_init() - that will
        have a bunch of followups in (at least) ceph and lustre, but we'll
        need to sort the barrier-related rules before it can get used for
        really non-trivial stuff.
      
        Another fun thing is the merge of ->d_iput() callers (dentry_iput()
        and dentry_unlink_inode()) and a bunch of ->d_compare() ones (all
        except the one in __d_lookup_lru())"
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
        fs/dcache.c: avoid soft-lockup in dput()
        vfs: new d_init method
        vfs: Update lookup_dcache() comment
        bdev: get rid of ->bd_inodes
        Remove last traces of ->sync_page
        new helper: d_same_name()
        dentry_cmp(): use lockless_dereference() instead of smp_read_barrier_depends()
        vfs: clean up documentation
        vfs: document ->d_real()
        vfs: merge .d_select_inode() into .d_real()
        unify dentry_iput() and dentry_unlink_inode()
        binfmt_misc: ->s_root is not going anywhere
        drop redundant ->owner initializations
        ufs: get rid of redundant checks
        orangefs: constify inode_operations
        missed comment updates from ->direct_IO() prototype change
        file_inode(f)->i_mapping is f->f_mapping
        trim fsnotify hooks a bit
        9p: new helper - v9fs_parent_fid()
        debugfs: ->d_parent is never NULL or negative
        ...
      6784725a
    • L
      Merge branch 'salted-string-hash' · 554828ee
      Linus Torvalds 提交于
      This changes the vfs dentry hashing to mix in the parent pointer at the
      _beginning_ of the hash, rather than at the end.
      
      That actually improves both the hash and the code generation, because we
      can move more of the computation to the "static" part of the dcache
      setup, and do less at lookup runtime.
      
      It turns out that a lot of other hash users also really wanted to mix in
      a base pointer as a 'salt' for the hash, and so the slightly extended
      interface ends up working well for other cases too.
      
      Users that want a string hash that is purely about the string pass in a
      'salt' pointer of NULL.
      
      * merge branch 'salted-string-hash':
        fs/dcache.c: Save one 32-bit multiply in dcache lookup
        vfs: make the string hashes salt the hash
      554828ee
  3. 28 7月, 2016 7 次提交
    • J
      Merge branch 'for-4.8/hid-led' into for-linus · 8c2f421c
      Jiri Kosina 提交于
      Conflicts:
      	drivers/hid/hid-thingm.c
      8c2f421c
    • J
      Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid',... · e82a82c1
      Jiri Kosina 提交于
      Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid-offload-hid-device-add' and 'for-4.8/upstream' into for-linus
      e82a82c1
    • T
      random: use for_each_online_node() to iterate over NUMA nodes · 59b8d4f1
      Theodore Ts'o 提交于
      This fixes a crash on s390 with fake NUMA enabled.
      Reported-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Fixes: 1e7f583a ("random: make /dev/urandom scalable for silly userspace programs")
      Signed-off-by: NTheodore Ts'o <tytso@mit.edu>
      59b8d4f1
    • L
      Add braces to avoid "ambiguous ‘else’" compiler warnings · 194dc870
      Linus Torvalds 提交于
      Some of our "for_each_xyz()" macro constructs make gcc unhappy about
      lack of braces around if-statements inside or outside the loop, because
      the loop construct itself has a "if-then-else" statement inside of it.
      
      The resulting warnings look something like this:
      
        drivers/gpu/drm/i915/i915_debugfs.c: In function ‘i915_dump_lrc’:
        drivers/gpu/drm/i915/i915_debugfs.c:2103:6: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wparentheses]
           if (ctx != dev_priv->kernel_context)
              ^
      
      even if the code itself is fine.
      
      Since the warning is fairly easy to avoid by adding a braces around the
      if-statement near the for_each_xyz() construct, do so, rather than
      disabling the otherwise potentially useful warning.
      
      (The if-then-else statements used in the "for_each_xyz()" constructs are
      designed to be inherently safe even with no braces, but in this case
      it's quite understandable that gcc isn't really able to tell that).
      
      This finally leaves the standard "allmodconfig" build with just a
      handful of remaining warnings, so new and valid warnings hopefully will
      stand out.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      194dc870
    • L
      Disable "frame-address" warning · 124a3d88
      Linus Torvalds 提交于
      Newer versions of gcc warn about the use of __builtin_return_address()
      with a non-zero argument when "-Wall" is specified:
      
        kernel/trace/trace_irqsoff.c: In function ‘stop_critical_timings’:
        kernel/trace/trace_irqsoff.c:433:86: warning: calling ‘__builtin_return_address’ with a nonzero argument is unsafe [-Wframe-address]
           stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
        [ .. repeats a few times for other similar cases .. ]
      
      It is true that a non-zero argument is somewhat dangerous, and we do not
      actually have very many uses of that in the kernel - but the ftrace code
      does use it, and as Stephen Rostedt says:
      
       "We are well aware of the danger of using __builtin_return_address() of
        > 0.  In fact that's part of the reason for having the "thunk" code in
        x86 (See arch/x86/entry/thunk_{64,32}.S).  [..] it adds extra frames
        when tracking irqs off sections, to prevent __builtin_return_address()
        from accessing bad areas.  In fact the thunk_32.S states: 'Trampoline to
        trace irqs off.  (otherwise CALLER_ADDR1 might crash)'."
      
      For now, __builtin_return_address() with a non-zero argument is the best
      we can do, and the warning is not helpful and can end up making people
      miss other warnings for real problems.
      
      So disable the frame-address warning on compilers that need it.
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      124a3d88
    • L
      Merge tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · 8448cefe
      Linus Torvalds 提交于
      Pull HSI updates from Sebastian Reichel:
      
       - proper runtime pm support for omap-ssi and ssi-protocol
      
       - misc fixes
      
      * tag 'hsi-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi: (24 commits)
        HSI: omap_ssi: drop pm_runtime_irq_safe
        HSI: omap_ssi_port: use rpm autosuspend API
        HSI: omap_ssi: call msg->complete() from process context
        HSI: omap_ssi_port: ensure clocks are kept enabled during transfer
        HSI: omap_ssi_port: replace pm_runtime_put_sync with non-sync variant
        HSI: omap_ssi_port: avoid calling runtime_pm_*_sync inside spinlock
        HSI: omap_ssi_port: avoid pm_runtime_get_sync in ssi_start_dma and ssi_start_pio
        HSI: omap_ssi_port: switch to threaded pio irq
        HSI: omap_ssi_core: remove pm_runtime_get_sync call from tasklet
        HSI: omap_ssi_core: use pm_runtime_put instead of pm_runtime_put_sync
        HSI: omap_ssi_port: prepare start_tx/stop_tx for blocking pm_runtime calls
        HSI: core: switch port event notifier from atomic to blocking
        HSI: omap_ssi_port: replace wkin_cken with atomic bitmap operations
        HSI: omap_ssi: convert cawake irq handler to thread
        HSI: ssi_protocol: fix ssip_xmit invocation
        HSI: ssi_protocol: replace spin_lock with spin_lock_bh
        HSI: ssi_protocol: avoid ssi_waketest call with held spinlock
        HSI: omap_ssi: do not reset module
        HSI: omap_ssi_port: remove useless newline
        hsi: Only descend into hsi directory when CONFIG_HSI is set
        ...
      8448cefe
    • L
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · 818e607b
      Linus Torvalds 提交于
      Pull random driver updates from Ted Ts'o:
       "A number of improvements for the /dev/random driver; the most
        important is the use of a ChaCha20-based CRNG for /dev/urandom, which
        is faster, more efficient, and easier to make scalable for
        silly/abusive userspace programs that want to read from /dev/urandom
        in a tight loop on NUMA systems.
      
        This set of patches also improves entropy gathering on VM's running on
        Microsoft Azure, and will take advantage of a hw random number
        generator (if present) to initialize the /dev/urandom pool"
      
      (It turns out that the random tree hadn't been in linux-next this time
      around, because it had been dropped earlier as being too quiet.  Oh
      well).
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: strengthen input validation for RNDADDTOENTCNT
        random: add backtracking protection to the CRNG
        random: make /dev/urandom scalable for silly userspace programs
        random: replace non-blocking pool with a Chacha20-based CRNG
        random: properly align get_random_int_hash
        random: add interrupt callback to VMBus IRQ handler
        random: print a warning for the first ten uninitialized random users
        random: initialize the non-blocking pool via add_hwgenerator_randomness()
      818e607b