1. 29 Apr, 2015 7 commits
  2. 28 Apr, 2015 3 commits
  3. 27 Apr, 2015 19 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 2decb268
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) mlx4 doesn't check fully for supported valid RSS hash function, fix
          from Amir Vadai
      
       2) Off by one in ibmveth_change_mtu(), from David Gibson
      
       3) Prevent altera chip from reporting false error interrupts in some
          circumstances, from Chee Nouk Phoon
      
       4) Get rid of that stupid endless loop trying to allocate a FIN packet
          in TCP, and in the process kill deadlocks.  From Eric Dumazet
      
       5) Fix get_rps_cpus() crash due to wrong invalid-cpu value, also from
          Eric Dumazet
      
       6) Fix two bugs in async rhashtable resizing, from Thomas Graf
      
       7) Fix topology server listener socket namespace bug in TIPC, from Ying
          Xue
      
       8) Add some missing HAS_DMA kconfig dependencies, from Geert
          Uytterhoeven
      
       9) bgmac driver intends to force re-polling but does so by returning
          the wrong value from it's ->poll() handler.  Fix from Rafał Miłecki
      
      10) When the creater of an rhashtable configures a max size for it,
          don't bark in the logs and drop insertions when that is exceeded.
          Fix from Johannes Berg
      
      11) Recover from out of order packets in ppp mppe properly, from Sylvain
          Rochet
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (41 commits)
        bnx2x: really disable TPA if 'disable_tpa' option is set
        net:treewide: Fix typo in drivers/net
        net/mlx4_en: Prevent setting invalid RSS hash function
        mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions
        netfilter; Add some missing default cases to switch statements in nft_reject.
        ppp: mppe: discard late packet in stateless mode
        ppp: mppe: sanity error path rework
        net/bonding: Make DRV macros private
        net: rfs: fix crash in get_rps_cpus()
        altera tse: add support for fixed-links.
        pxa168: fix double deallocation of managed resources
        net: fix crash in build_skb()
        net: eth: altera: Resolve false errors from MSGDMA to TSE
        ehea: Fix memory hook reference counting crashes
        net/tg3: Release IRQs on permanent error
        net: mdio-gpio: support access that may sleep
        inet: fix possible panic in reqsk_queue_unlink()
        rhashtable: don't attempt to grow when at max_size
        bgmac: fix requests for extra polling calls from NAPI
        tcp: avoid looping in tcp_send_fin()
        ...
      2decb268
    • Michal Schmidt's avatar
      bnx2x: really disable TPA if 'disable_tpa' option is set · 22a8f237
      Michal Schmidt authored
      bnx2x's 'disable_tpa=1' module option is not respected properly and TPA
      (transparent packet aggregation) remains enabled. Even though the
      module option causes LRO to be disabled, TPA is enabled in GRO mode.
      
      Additionally, disabling GRO via ethtool then has no effect. One can
      still observe tpa_* statistics increase and large packets being received
      in tcpdump.
      
      The bug was an unintended consequence of commit aebf6244 "bnx2x: Be
      more forgiving toward SW GRO".
      
      Fix it by following the bp->disable_tpa flag when initializing fp's.
      Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      22a8f237
    • Masanari Iida's avatar
      net:treewide: Fix typo in drivers/net · 94435f76
      Masanari Iida authored
      This patch fix spelling typo in printk.
      Signed-off-by: default avatarMasanari Iida <standby24x7@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      94435f76
    • Amir Vadai's avatar
      net/mlx4_en: Prevent setting invalid RSS hash function · b3706909
      Amir Vadai authored
      mlx4_en_check_rxfh_func() was checking for hardware support before
      setting a known RSS hash function, but didn't do any check before
      setting unknown RSS hash function. Need to make it fail on such values.
      In this occasion, moved the actual setting of the new value from the
      check function into mlx4_en_set_rxfh().
      
      Fixes: 947cbb0a ("net/mlx4_en: Support for configurable RSS hash function")
      Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b3706909
    • Rojhalat Ibrahim's avatar
      mdio-mux-gpio: use new gpiod_get_array and gpiod_put_array functions · 33df10e2
      Rojhalat Ibrahim authored
      Use the new gpiod_get_array and gpiod_put_array functions
      (added to mainline in the v4.1 merge window) for obtaining and
      disposing of GPIO descriptors.
      
      Cc: David Miller <davem@davemloft.net>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarRojhalat Ibrahim <imr@rtschenk.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      33df10e2
    • David S. Miller's avatar
      netfilter; Add some missing default cases to switch statements in nft_reject. · 129d23a5
      David S. Miller authored
      This fixes:
      
      ====================
      net/netfilter/nft_reject.c: In function ‘nft_reject_dump’:
      net/netfilter/nft_reject.c:61:2: warning: enumeration value ‘NFT_REJECT_TCP_RST’ not handled in switch [-Wswitch]
        switch (priv->type) {
        ^
      net/netfilter/nft_reject.c:61:2: warning: enumeration value ‘NFT_REJECT_ICMPX_UNREACH’ not handled in switch [-Wswi\
      tch]
      net/netfilter/nft_reject_inet.c: In function ‘nft_reject_inet_dump’:
      net/netfilter/nft_reject_inet.c:105:2: warning: enumeration value ‘NFT_REJECT_TCP_RST’ not handled in switch [-Wswi\
      tch]
        switch (priv->type) {
        ^
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      129d23a5
    • David S. Miller's avatar
      Merge branch 'ppp_mppe_desync' · 8e9b29cc
      David S. Miller authored
      Sylvain Rochet says:
      
      ====================
      ppp: mppe: fixes MPPE desync on links which don't guarantee packet ordering
      
      I am currently having an issue with PPP over L2TP (UDP) and MPPE in
      stateless mode (default mode), UDP does not guarantee packet ordering so
      we might get out of order packet. MPPE needs to be continuously synched
      so we should drop late UDP packet.
      
      I added a printk on the number of time we rekeyed in MPPE decompressor,
      this is what we currently have if we receive a slightly out of order UDP
      packet:
      
      [1731001.049206] mppe_decompress[1]: ccount 1559
      [1731001.049216] mppe_decompress[1]: rekeyed 1 times
      
      [1731001.049228] mppe_decompress[1]: ccount 1560
      [1731001.049232] mppe_decompress[1]: rekeyed 1 times
      
      [1731001.050170] mppe_decompress[1]: ccount 1562
      [1731001.050182] mppe_decompress[1]: rekeyed 2 times
      
      [1731001.050191] mppe_decompress[1]: ccount 1561
      [1731001.062576] mppe_decompress[1]: rekeyed 4095 times
                                                   ^^^^
      This is obviously wrong, we missed packet 1561 and we already rekeyed 2
      times for 1562 we previously received, we can't recover the decryption
      key we need for 1561, we should drop it instead of rekeying 4095 times.
      
      This patch series drop any packet with are not within the 4096/2 forward
      window.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8e9b29cc
    • Sylvain Rochet's avatar
      ppp: mppe: discard late packet in stateless mode · 03654763
      Sylvain Rochet authored
      When PPP is used over a link which does not guarantee packet ordering,
      we might get late MPPE packets. This is a problem because MPPE must be
      kept synchronized and the current implementation does not drop them and
      rekey 4095 times instead of 0, which is wrong.
      
      In order to prevent rekeying about a whole count space times (~ 4095
      times), drop packets which are not within the forward 4096/2 window and
      increase sanity error counter.
      Signed-off-by: default avatarSylvain Rochet <sylvain.rochet@finsecur.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      03654763
    • Sylvain Rochet's avatar
      ppp: mppe: sanity error path rework · 32530189
      Sylvain Rochet authored
      We are going to need sanity error path a little further, rework to be
      able to use the sanity error path anywhere in decompressor.
      Signed-off-by: default avatarSylvain Rochet <sylvain.rochet@finsecur.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32530189
    • Matan Barak's avatar
      net/bonding: Make DRV macros private · 73b5a6f2
      Matan Barak authored
      The bonding modules currently defines four macros with
      general names that pollute the global namespace:
      DRV_VERSION
      DRV_RELDATE
      DRV_NAME
      DRV_DESCRIPTION
      
      Fixing that by defining a private bonding_priv.h
      header files which includes those defines.
      Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      73b5a6f2
    • Linus Torvalds's avatar
      Linux 4.1-rc1 · b787f68c
      Linus Torvalds authored
      b787f68c
    • Andy Lutomirski's avatar
      x86_64, asm: Work around AMD SYSRET SS descriptor attribute issue · 61f01dd9
      Andy Lutomirski authored
      AMD CPUs don't reinitialize the SS descriptor on SYSRET, so SYSRET with
      SS == 0 results in an invalid usermode state in which SS is apparently
      equal to __USER_DS but causes #SS if used.
      
      Work around the issue by setting SS to __KERNEL_DS __switch_to, thus
      ensuring that SYSRET never happens with SS set to NULL.
      
      This was exposed by a recent vDSO cleanup.
      
      Fixes: e7d6eefa x86/vdso32/syscall.S: Do not load __USER32_DS to %ss
      Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
      Cc: Peter Anvin <hpa@zytor.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Denys Vlasenko <vda.linux@googlemail.com>
      Cc: Brian Gerst <brgerst@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      61f01dd9
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 1190944f
      Linus Torvalds authored
      Pull intel drm fixes from Dave Airlie.
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
        drm/i915: Workaround to avoid lite restore with HEAD==TAIL
        drm/i915: cope with large i2c transfers
      1190944f
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/intel-iommu · 9f86262d
      Linus Torvalds authored
      Pull intel iommu updates from David Woodhouse:
       "This lays a little of the groundwork for upcoming Shared Virtual
        Memory support — fixing some bogus #defines for capability bits and
        adding the new ones, and starting to use the new wider page tables
        where we can, in anticipation of actually filling in the new fields
        therein.
      
        It also allows graphics devices to be assigned to VM guests again.
        This got broken in 3.17 by disallowing assignment of RMRR-afflicted
        devices.  Like USB, we do understand why there's an RMRR for graphics
        devices — and unlike USB, it's actually sane.  So we can make an
        exception for graphics devices, just as we do USB controllers.
      
        Finally, tone down the warning about the X2APIC_OPT_OUT bit, due to
        persistent requests.  X2APIC_OPT_OUT was added to the spec as a nasty
        hack to allow broken BIOSes to forbid us from using X2APIC when they
        do stupid and invasive things and would break if we did.
      
        Someone noticed that since Windows doesn't have full IOMMU support for
        DMA protection, setting the X2APIC_OPT_OUT bit made Windows avoid
        initialising the IOMMU on the graphics unit altogether.
      
        This means that it would be available for use in "driver mode", where
        the IOMMU registers are made available through a BAR of the graphics
        device and the graphics driver can do SVM all for itself.
      
        So they started setting the X2APIC_OPT_OUT bit on *all* platforms with
        SVM capabilities.  And even the platforms which *might*, if the
        planets had been aligned correctly, possibly have had SVM capability
        but which in practice actually don't"
      
      * git://git.infradead.org/intel-iommu:
        iommu/vt-d: support extended root and context entries
        iommu/vt-d: Add new extended capabilities from v2.3 VT-d specification
        iommu/vt-d: Allow RMRR on graphics devices too
        iommu/vt-d: Print x2apic opt out info instead of printing a warning
        iommu/vt-d: kill bogus ecap_niotlb_iunits()
      9f86262d
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 85f2901b
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "This has a mixture of merge window cleanups and bugfixes"
      
      * 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: st: add include for pinctrl
        i2c: mux: use proper dev when removing "channel-X" symlinks
        i2c: digicolor: remove duplicate include
        i2c: Mark adapter devices with pm_runtime_no_callbacks
        i2c: pca-platform: fix broken email address
        i2c: mxs: fix broken email address
        i2c: rk3x: report number of messages transmitted
      85f2901b
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · f583381f
      Linus Torvalds authored
      Pull btrfs fixes from Chris Mason:
       "Filipe hit two problems in my block group cache patches.  We finalized
        the fixes last week and ran through more tests"
      
      * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: prevent list corruption during free space cache processing
        Btrfs: fix inode cache writeout
      f583381f
    • Dave Airlie's avatar
      Merge tag 'drm-intel-next-fixes-2015-04-25' of... · 59fd7e4b
      Dave Airlie authored
      Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm-intel into drm-fixes
      
      three fixes for i915.
      
      * tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: vlv: fix save/restore of GFX_MAX_REQ_COUNT reg
        drm/i915: Workaround to avoid lite restore with HEAD==TAIL
        drm/i915: cope with large i2c transfers
      59fd7e4b
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 59953fba
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Another set of mainly bugfixes and a couple of cleanups.  No new
        functionality in this round.
      
        Highlights include:
      
        Stable patches:
         - Fix a regression in /proc/self/mountstats
         - Fix the pNFS flexfiles O_DIRECT support
         - Fix high load average due to callback thread sleeping
      
        Bugfixes:
         - Various patches to fix the pNFS layoutcommit support
         - Do not cache pNFS deviceids unless server notifications are enabled
         - Fix a SUNRPC transport reconnection regression
         - make debugfs file creation failure non-fatal in SUNRPC
         - Another fix for circular directory warnings on NFSv4 "junctioned"
           mountpoints
         - Fix locking around NFSv4.2 fallocate() support
         - Truncating NFSv4 file opens should also sync O_DIRECT writes
         - Prevent infinite loop in rpcrdma_ep_create()
      
        Features:
         - Various improvements to the RDMA transport code's handling of
           memory registration
         - Various code cleanups"
      
      * tag 'nfs-for-4.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (55 commits)
        fs/nfs: fix new compiler warning about boolean in switch
        nfs: Remove unneeded casts in nfs
        NFS: Don't attempt to decode missing directory entries
        Revert "nfs: replace nfs_add_stats with nfs_inc_stats when add one"
        NFS: Rename idmap.c to nfs4idmap.c
        NFS: Move nfs_idmap.h into fs/nfs/
        NFS: Remove CONFIG_NFS_V4 checks from nfs_idmap.h
        NFS: Add a stub for GETDEVICELIST
        nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes
        nfs: fix DIO good bytes calculation
        nfs: Fetch MOUNTED_ON_FILEID when updating an inode
        sunrpc: make debugfs file creation failure non-fatal
        nfs: fix high load average due to callback thread sleeping
        NFS: Reduce time spent holding the i_mutex during fallocate()
        NFS: Don't zap caches on fallocate()
        xprtrdma: Make rpcrdma_{un}map_one() into inline functions
        xprtrdma: Handle non-SEND completions via a callout
        xprtrdma: Add "open" memreg op
        xprtrdma: Add "destroy MRs" memreg op
        xprtrdma: Add "reset MRs" memreg op
        ...
      59953fba
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 9ec3a646
      Linus Torvalds authored
      Pull fourth vfs update from Al Viro:
       "d_inode() annotations from David Howells (sat in for-next since before
        the beginning of merge window) + four assorted fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        RCU pathwalk breakage when running into a symlink overmounting something
        fix I_DIO_WAKEUP definition
        direct-io: only inc/dec inode->i_dio_count for file systems
        fs/9p: fix readdir()
        VFS: assorted d_backing_inode() annotations
        VFS: fs/inode.c helpers: d_inode() annotations
        VFS: fs/cachefiles: d_backing_inode() annotations
        VFS: fs library helpers: d_inode() annotations
        VFS: assorted weird filesystems: d_inode() annotations
        VFS: normal filesystems (and lustre): d_inode() annotations
        VFS: security/: d_inode() annotations
        VFS: security/: d_backing_inode() annotations
        VFS: net/: d_inode() annotations
        VFS: net/unix: d_backing_inode() annotations
        VFS: kernel/: d_inode() annotations
        VFS: audit: d_backing_inode() annotations
        VFS: Fix up some ->d_inode accesses in the chelsio driver
        VFS: Cachefiles should perform fs modifications on the top layer only
        VFS: AF_UNIX sockets should call mknod on the top layer only
      9ec3a646
  4. 26 Apr, 2015 11 commits
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c8b3fd0c
      Linus Torvalds authored
      Pull more power management and ACPI updates from Rafael Wysocki:
       "These are fixes mostly (intel_pstate, ACPI core, ACPI EC driver,
        cpupower tool), a new CPU ID for the Intel RAPL driver and one
        intel_pstate driver improvement that didn't make it to my previous
        pull requests due to timing.
      
        Specifics:
      
         - Fix a build warning in the intel_pstate driver showing up in
           non-SMP builds (Borislav Petkov)
      
         - Change one of the intel_pstate's P-state selection parameters for
           Baytrail and Cherrytrail CPUs to significantly improve performance
           at the cost of a small increase in energy consumption (Kristen
           Carlson Accardi)
      
         - Fix a NULL pointer dereference in the ACPI EC driver due to an
           unsafe list walk in the query handler removal routine (Chris
           Bainbridge)
      
         - Get rid of a false-positive lockdep warning in the ACPI container
           hot-remove code (Rafael J Wysocki)
      
         - Prevent the ACPI device enumeration code from creating device
           objects of a wrong type in some cases (Rafael J Wysocki)
      
         - Add Skylake processors support to the Intel RAPL power capping
           driver (Brian Bian)
      
         - Drop the stale MAINTAINERS entry for the ACPI dock driver that is
           regarded as part of the ACPI core and maintained along with it now
           (Chao Yu)
      
         - Fix cpupower tool breakage caused by a library API change in libpci
           3.3.0 (Lucas Stach)"
      
      * tag 'pm+acpi-4.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / scan: Add a scan handler for PRP0001
        ACPI / scan: Annotate physical_node_lock in acpi_scan_is_offline()
        ACPI / EC: fix NULL pointer dereference in acpi_ec_remove_query_handler()
        MAINTAINERS: remove maintainship entry of docking station driver
        powercap / RAPL: Add support for Intel Skylake processors
        cpufreq: intel_pstate: Fix an annoying !CONFIG_SMP warning
        intel_pstate: Change the setpoint for Atom params
        cpupower: fix breakage from libpci API change
      c8b3fd0c
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d89b3e19
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This push fixes a build problem with img-hash under non-standard
        configurations and a serious regression with sha512_ssse3 which can
        lead to boot failures"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
        crypto: x86/sha512_ssse3 - fixup for asm function prototype change
      d89b3e19
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.1-1' of... · 78d42567
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver updates from Darren Hart:
       "This series includes significant updates to the toshiba_acpi driver
        and the reintroduction of the dell-laptop keyboard backlight additions
        I had to revert previously.  Also included are various fixes for
        typos, warnings, correctness, and minor bugs.
      
        Specifics:
      
        dell-laptop:
           - add support for keyboard backlight.
      
        toshiba_acpi:
           - adaptive keyboard, hotkey, USB sleep and charge, and backlight
             updates.  Update sysfs documentation.
      
        toshiba_bluetooth:
           - fix enabling/disabling loop on recent devices
      
        apple-gmux:
           - lock iGP IO to protect from vgaarb changes
      
        other:
           - Fix typos, clear gcc warnings, clarify pr_* messages, correct
             return types, update MAINTAINERS"
      
      * tag 'platform-drivers-x86-v4.1-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (25 commits)
        toshiba_acpi: Do not register vendor backlight when acpi_video bl is available
        MAINTAINERS: Add me on list of Dell laptop drivers
        platform: x86: dell-laptop: Add support for keyboard backlight
        Documentation/ABI: Update sysfs-driver-toshiba_acpi entry
        toshiba_acpi: Fix pr_* messages from USB Sleep Functions
        toshiba_acpi: Update and fix USB Sleep and Charge modes
        wmi: Use bool function return values of true/false not 1/0
        toshiba_bluetooth: Fix enabling/disabling loop on recent devices
        toshiba_bluetooth: Clean up *_add function and disable BT device at removal
        toshiba_bluetooth: Add three new functions to the driver
        toshiba_acpi: Fix the enabling of the Special Functions
        toshiba_acpi: Use the Hotkey Event Type function for keymap choosing
        toshiba_acpi: Add Hotkey Event Type function and definitions
        x86/wmi: delete unused wmi_data_lock mutex causing gcc warning
        apple-gmux: lock iGP IO to protect from vgaarb changes
        MAINTAINERS: Add missing Toshiba devices and add myself as maintainer
        toshiba_acpi: Update events in toshiba_acpi_notify
        intel-oaktrail: Fix trivial typo in comment
        thinkpad_acpi: off by one in adaptive_keyboard_hotkey_notify_hotkey()
        thinkpad_acpi: signedness bugs getting current_mode
        ...
      78d42567
    • Linus Torvalds's avatar
      Merge tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform · 36a8032d
      Linus Torvalds authored
      Pull chrome platform updates from Olof Johansson:
       "Here's a set of updates to the Chrome OS platform drivers for this
        merge window.
      
        Main new things this cycle is:
      
         - Driver changes to expose the lightbar to users.  With this, you can
           make your own blinkenlights on Chromebook Pixels.
      
         - Changes in the way that the atmel_mxt trackpads are probed.  The
           laptop driver is trying to be smart and not instantiate the devices
           that don't answer to probe.  For the trackpad that can come up in
           two modes (bootloader or regular), this gets complicated since the
           driver already knows how to handle the two modes including the
           actual addresses used.  So now the laptop driver needs to know more
           too, instantiating the regular address even if the bootloader one
           is the probe that passed.
      
         - mfd driver improvements by Javier Martines Canillas, and a few
           bugfixes from him, kbuild and myself"
      
      * tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
        platform/chrome: chromeos_laptop - instantiate Atmel at primary address
        platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST
        platform/chrome: cros_ec_lpc - Include linux/io.h header file
        platform/chrome: fix platform_no_drv_owner.cocci warnings
        platform/chrome: cros_ec_lightbar - fix duplicate const warning
        platform/chrome: cros_ec_dev - fix Unknown escape '%' warning
        platform/chrome: Expose Chrome OS Lightbar to users
        platform/chrome: Create sysfs attributes for the ChromeOS EC
        mfd: cros_ec: Instantiate ChromeOS EC character device
        platform/chrome: Add Chrome OS EC userspace device interface
        platform/chrome: Add cros_ec_lpc driver for x86 devices
        mfd: cros_ec: Add char dev and virtual dev pointers
        mfd: cros_ec: Use fixed size arrays to transfer data with the EC
      36a8032d
    • Linus Torvalds's avatar
      Merge tag 'cris-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris · 7f9f4430
      Linus Torvalds authored
      Pull arch/cris updates from Jesper Nilsson:
       "Some much needed love for the CRIS-port.
      
        There's a bunch of changes this time, giving the CRISv32 port a bit of
        modern makeover with device-tree, irq domain and gpiolib support, and
        more switchover to generic frameworks.
      
        Some small fixes and removal of the theoretical SMP support brings up
        the rear"
      
      * tag 'cris-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
        cris: fix integer overflow in ELF_ET_DYN_BASE
        CRISv32: use GENERIC_SCHED_CLOCK
        CRISv32: use MMIO clocksource
        CRISv32: use generic clockevents
        CRIS: use generic headers via Kbuild
        CRIS: use generic cmpxchg.h
        CRIS: use generic atomic.h
        CRIS: use generic atomic bitops
        CRISv10: remove redundant macros from system.h
        CRIS: remove SMP code
        CRISv32: don't enable irqs in INIT_THREAD
        CRISv32: handle multiple signals
        CRISv32: prevent bogus restarts on sigreturn
        CRISv32: don't attempt syscall restart on irq exit
        Add binding documentation for CRIS
        CRIS: add Axis 88 board device tree
        CRISv32: add device tree support
        CRISv32: add irq domains support
        CRIS: enable GPIOLIB
      7f9f4430
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux · 63905bba
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
      
       - fix for mm_dec_nr_pmds() from Scott.
      
       - fixes for oopses seen with KVM + THP from Aneesh.
      
       - build fixes from Aneesh & Shreyas.
      
      * tag 'powerpc-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux:
        powerpc/mm: Fix build error with CONFIG_PPC_TRANSACTIONAL_MEM disabled
        powerpc/kvm: Fix ppc64_defconfig + PPC_POWERNV=n build error
        powerpc/mm/thp: Return pte address if we find trans_splitting.
        powerpc/mm/thp: Make page table walk safe against thp split/collapse
        KVM: PPC: Remove page table walk helpers
        KVM: PPC: Use READ_ONCE when dereferencing pte_t pointer
        powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range()
      63905bba
    • Eric Dumazet's avatar
      net: rfs: fix crash in get_rps_cpus() · a31196b0
      Eric Dumazet authored
      Commit 567e4b79 ("net: rfs: add hash collision detection") had one
      mistake :
      
      RPS_NO_CPU is no longer the marker for invalid cpu in set_rps_cpu()
      and get_rps_cpu(), as @next_cpu was the result of an AND with
      rps_cpu_mask
      
      This bug showed up on a host with 72 cpus :
      next_cpu was 0x7f, and the code was trying to access percpu data of an
      non existent cpu.
      
      In a follow up patch, we might get rid of compares against nr_cpu_ids,
      if we init the tables with 0. This is silly to test for a very unlikely
      condition that exists only shortly after table initialization, as
      we got rid of rps_reset_sock_flow() and similar functions that were
      writing this RPS_NO_CPU magic value at flow dismantle : When table is
      old enough, it never contains this value anymore.
      
      Fixes: 567e4b79 ("net: rfs: add hash collision detection")
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: Tom Herbert <tom@herbertland.com>
      Cc: Ben Hutchings <ben@decadent.org.uk>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a31196b0
    • Andreas Oetken's avatar
      altera tse: add support for fixed-links. · 7cdbc6f7
      Andreas Oetken authored
      Add support for fixed-links in configurations without PHY.
      (e.g. connection to a switch, SGMII point to point, SFPs)
      
      Check: Documentation/devicetree/bindings/net/fixed-link.txt.
      Signed-off-by: default avatarAndreas Oetken <ennoerlangen@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7cdbc6f7
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · eadf16a9
      Linus Torvalds authored
      Pull second batch of KVM changes from Paolo Bonzini:
       "This mostly includes the PPC changes for 4.1, which this time cover
        Book3S HV only (debugging aids, minor performance improvements and
        some cleanups).  But there are also bug fixes and small cleanups for
        ARM, x86 and s390.
      
        The task_migration_notifier revert and real fix is still pending
        review, but I'll send it as soon as possible after -rc1"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (29 commits)
        KVM: arm/arm64: check IRQ number on userland injection
        KVM: arm: irqfd: fix value returned by kvm_irq_map_gsi
        KVM: VMX: Preserve host CR4.MCE value while in guest mode.
        KVM: PPC: Book3S HV: Use msgsnd for signalling threads on POWER8
        KVM: PPC: Book3S HV: Translate kvmhv_commence_exit to C
        KVM: PPC: Book3S HV: Streamline guest entry and exit
        KVM: PPC: Book3S HV: Use bitmap of active threads rather than count
        KVM: PPC: Book3S HV: Use decrementer to wake napping threads
        KVM: PPC: Book3S HV: Don't wake thread with no vcpu on guest IPI
        KVM: PPC: Book3S HV: Get rid of vcore nap_count and n_woken
        KVM: PPC: Book3S HV: Move vcore preemption point up into kvmppc_run_vcpu
        KVM: PPC: Book3S HV: Minor cleanups
        KVM: PPC: Book3S HV: Simplify handling of VCPUs that need a VPA update
        KVM: PPC: Book3S HV: Accumulate timing information for real-mode code
        KVM: PPC: Book3S HV: Create debugfs file for each guest's HPT
        KVM: PPC: Book3S HV: Add ICP real mode counters
        KVM: PPC: Book3S HV: Move virtual mode ICP functions to real-mode
        KVM: PPC: Book3S HV: Convert ICS mutex lock to spin lock
        KVM: PPC: Book3S HV: Add guest->host real mode completion counters
        KVM: PPC: Book3S HV: Add helpers for lock/unlock hpte
        ...
      eadf16a9
    • Alexey Khoroshilov's avatar
      pxa168: fix double deallocation of managed resources · 0e03fd3e
      Alexey Khoroshilov authored
      Commit 43d3ddf8 ("net: pxa168_eth: add device tree support") starts
      to use managed resources by adding devm_clk_get() and
      devm_ioremap_resource(), but it leaves explicit iounmap() and clock_put()
      in pxa168_eth_remove() and in failure handling code of pxa168_eth_probe().
      As a result double free can happen.
      
      The patch removes explicit resource deallocation. Also it converts
      clk_disable() to clk_disable_unprepare() to make it symmetrical with
      clk_prepare_enable().
      
      Found by Linux Driver Verification project (linuxtesting.org).
      Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0e03fd3e
    • Stephen Rothwell's avatar