1. 02 7月, 2016 11 次提交
  2. 01 7月, 2016 11 次提交
  3. 30 6月, 2016 18 次提交
    • P
      Merge tag 'kvm-arm-for-v4.7-rc6' of... · f5c5c225
      Paolo Bonzini 提交于
      Merge tag 'kvm-arm-for-v4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
      
      KVM/ARM Fixes for v4.7-rc6:
      
      Fixes a build issue without CONFIG_ARM_PMU and plugs pid leak on arm/arm64.
      f5c5c225
    • S
      ACPI,PCI,IRQ: correct operator precedence · 54794580
      Sinan Kaya 提交于
      The omitted parenthesis prevents the addition operation when
      acpi_penalize_isa_irq function is called.
      
      Fixes: 103544d8 (ACPI,PCI,IRQ: reduce resource requirements)
      Signed-off-by: NSinan Kaya <okaya@codeaurora.org>
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      54794580
    • S
      mfd: da9053: Fix compiler warning message for uninitialised variable · ba4a1c28
      Steve Twiss 提交于
      Fix compiler warning caused by an uninitialised variable inside
      da9052_group_write() function. Defaulting the value to zero covers
      the trivial case.
      Signed-off-by: NSteve Twiss <stwiss.opensource@diasemi.com>
      Reported-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      ba4a1c28
    • R
      mfd: max77620: Fix FPS switch statements · 82d8eb40
      Rhyland Klein 提交于
      When configuring FPS during probe, assuming a DT node is present for
      FPS, the code can run into a problem with the switch statements in
      max77620_config_fps() and max77620_get_fps_period_reg_value(). Namely,
      in the case of chip->chip_id == MAX77620, it will set
      fps_[mix|max]_period but then fall through to the default switch case
      and return -EINVAL. Returning this from max77620_config_fps() will
      cause probe to fail.
      Signed-off-by: NRhyland Klein <rklein@nvidia.com>
      Reviewed-by: NLaxman Dewangan <ldewangan@nvidia.com>
      Reviewed-by: NThierry Reding <treding@nvidia.com>
      Tested-by: NThierry Reding <treding@nvidia.com>
      Tested-by: NAlexandre Courbot <acourbot@nvidia.com>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      82d8eb40
    • L
      phy: phy-stih407-usb: Inform the reset framework that our reset line may be shared · 9278e707
      Lee Jones 提交于
      On the STiH410 B2120 development board the ports on the Generic PHY
      share their reset lines with each other.  New functionality in the
      reset subsystems forces consumers to be explicit when requesting
      shared/exclusive reset lines.
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      9278e707
    • L
      usb: dwc3: st: Inform the reset framework that our reset line may be shared · 002f17bc
      Lee Jones 提交于
      On the STiH410 B2120 development board the MiPHY28lp shares its reset
      line with the Synopsys DWC3 SuperSpeed (SS) USB 3.0 Dual-Role-Device
      (DRD).  New functionality in the reset subsystems forces consumers to
      be explicit when requesting shared/exclusive reset lines.
      Acked-by: NFelipe Balbi <felipe.balbi@linux.intel.com>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      002f17bc
    • L
      usb: host: ehci-st: Inform the reset framework that our reset line may be shared · 19599304
      Lee Jones 提交于
      On the STiH410 B2120 development board the ST EHCI IP shares its reset
      line with the OHCI IP.  New functionality in the reset subsystems forces
      consumers to be explicit when requesting shared/exclusive reset lines.
      Acked-by: NPeter Griffin <peter.griffin@linaro.org>
      Acked-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      19599304
    • L
      usb: host: ohci-st: Inform the reset framework that our reset line may be shared · f5ee3f2b
      Lee Jones 提交于
      On the STiH410 B2120 development board the ST EHCI IP shares its reset
      line with the OHCI IP.  New functionality in the reset subsystems forces
      consumers to be explicit when requesting shared/exclusive reset lines.
      Acked-by: NAlan Stern <stern@rowland.harvard.edu>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      f5ee3f2b
    • L
      Merge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs · e7bdea77
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Anna Schumaker:
       "Stable bugfixes:
         - Fix _cancel_empty_pagelist
         - Fix a double page unlock
         - Make nfs_atomic_open() call d_drop() on all ->open_context() errors.
         - Fix another OPEN_DOWNGRADE bug
      
        Other bugfixes:
         - Ensure we handle delegation errors in nfs4_proc_layoutget()
         - Layout stateids start out as being invalid
         - Add sparse lock annotations for pnfs_find_alloc_layout
         - Handle bad delegation stateids in nfs4_layoutget_handle_exception
         - Fix up O_DIRECT results
         - Fix potential use after free of state in nfs4_do_reclaim.
         - Mark the layout stateid invalid when all segments are removed
         - Don't let readdirplus revalidate an inode that was marked as stale
         - Fix potential race in nfs_fhget()
         - Fix an unused variable warning"
      
      * tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        NFS: Fix another OPEN_DOWNGRADE bug
        make nfs_atomic_open() call d_drop() on all ->open_context() errors.
        NFS: Fix an unused variable warning
        NFS: Fix potential race in nfs_fhget()
        NFS: Don't let readdirplus revalidate an inode that was marked as stale
        NFSv4.1/pnfs: Mark the layout stateid invalid when all segments are removed
        NFS: Fix a double page unlock
        pnfs_nfs: fix _cancel_empty_pagelist
        nfs4: Fix potential use after free of state in nfs4_do_reclaim.
        NFS: Fix up O_DIRECT results
        NFS/pnfs: handle bad delegation stateids in nfs4_layoutget_handle_exception
        NFSv4.1/pnfs: Add sparse lock annotations for pnfs_find_alloc_layout
        NFSv4.1/pnfs: Layout stateids start out as being invalid
        NFSv4.1/pnfs: Ensure we handle delegation errors in nfs4_proc_layoutget()
      e7bdea77
    • L
      Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit · 89a82a92
      Linus Torvalds 提交于
      Pull audit fixes from Paul Moore:
       "Two small patches to fix audit problems in 4.7-rcX: the first fixes a
        potential kref leak, the second removes some header file noise.
      
        The first is an important bug fix that really should go in before 4.7
        is released, the second is not critical, but falls into the very-nice-
        to-have category so I'm including in the pull request.
      
        Both patches are straightforward, self-contained, and pass our
        testsuite without problem"
      
      * 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit:
        audit: move audit_get_tty to reduce scope and kabi changes
        audit: move calcs after alloc and check when logging set loginuid
      89a82a92
    • G
      Merge tag 'iio-fixes-for-4.7c' of... · d8397221
      Greg Kroah-Hartman 提交于
      Merge tag 'iio-fixes-for-4.7c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus
      
      Jonathan writes:
      
      Third set of fixes for IIO in the 4.7 cycle.
      
      A couple of really old bugs and the results of Mark taking a close look at
      some nasty regulator handling.
      
      * ad7266
        - Fix broken regulator handling that won't play well with dummy regulators.
        - Correctly handle and optional regulator.
        - Fix probe deferral for the vref regulator.
      * kxsd9
        - Fix a wrong error check that leads to an inability to write or read
        the scale.
      * sca3000
        - Fix a wrong error check that leads to an inability to read back the
        sampling frequency.
      d8397221
    • L
      reset: TRIVIAL: Add line break at same place for similar APIs · 0bcc0eab
      Lee Jones 提交于
      Standardise the way inline functions:
      
        devm_reset_control_get_shared_by_index
        devm_reset_control_get_exclusive_by_index
      
      ... are formatted.
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Signed-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
      0bcc0eab
    • L
      reset: Supply *_shared variant calls when using *_optional APIs · c33d61a0
      Lee Jones 提交于
      Consumers need to be able to specify whether they are requesting an
      'exclusive' or 'shared' reset line no matter which API (of_*, devm_*,
      etc) they are using.  This change allows users of the optional_* API
      in particular to specify that their request is for a 'shared' line.
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Signed-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
      c33d61a0
    • L
      reset: Supply *_shared variant calls when using of_* API · 40faee8e
      Lee Jones 提交于
      Consumers need to be able to specify whether they are requesting an
      'exclusive' or 'shared' reset line no matter which API (of_*, devm_*,
      etc) they are using.  This change allows users of the of_* API in
      particular to specify that their request is for a 'shared' line.
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Signed-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
      40faee8e
    • L
      reset: Ensure drivers are explicit when requesting reset lines · a53e35db
      Lee Jones 提交于
      Phasing out generic reset line requests enables us to make some better
      decisions on when and how to (de)assert said lines.  If an 'exclusive'
      line is requested, we know a device *requires* a reset and that it's
      preferable to act upon a request right away.  However, if a 'shared'
      reset line is requested, we can reasonably assume sure that placing a
      device into reset isn't a hard requirement, but probably a measure to
      save power and is thus able to cope with not being asserted if another
      device is still in use.
      
      In order allow gentle adoption and not to forcing all consumers to
      move to the API immediately, causing administration headache between
      subsystems, this patch adds some temporary stand-in shim-calls.  This
      will ease the burden at merge time and allow subsystems to migrate over
      to the new API in a more realistic time-frame.
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Signed-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
      a53e35db
    • L
      reset: Reorder inline reset_control_get*() wrappers · 3c35f6ed
      Lee Jones 提交于
      We're about to split the current API into two, where consumers will
      be forced to be explicit when requesting reset lines.  The choice
      will be to either the call the *_exclusive or *_shared variant
      depending on whether they can actually tolorate not being asserted
      when that request is made.
      
      The new API will look like this once reorded and complete:
      
        reset_control_get_exclusive()
        reset_control_get_shared()
        reset_control_get_optional_exclusive()
        reset_control_get_optional_shared()
        of_reset_control_get_exclusive()
        of_reset_control_get_shared()
        of_reset_control_get_exclusive_by_index()
        of_reset_control_get_shared_by_index()
        devm_reset_control_get_exclusive()
        devm_reset_control_get_shared()
        devm_reset_control_get_optional_exclusive()
        devm_reset_control_get_optional_shared()
        devm_reset_control_get_exclusive_by_index()
        devm_reset_control_get_shared_by_index()
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Signed-off-by: NPhilipp Zabel <p.zabel@pengutronix.de>
      3c35f6ed
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 32826ac4
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "I've been traveling so this accumulates more than week or so of bug
        fixing.  It perhaps looks a little worse than it really is.
      
         1) Fix deadlock in ath10k driver, from Ben Greear.
      
         2) Increase scan timeout in iwlwifi, from Luca Coelho.
      
         3) Unbreak STP by properly reinjecting STP packets back into the
            stack.  Regression fix from Ido Schimmel.
      
         4) Mediatek driver fixes (missing malloc failure checks, leaking of
            scratch memory, wrong indexing when mapping TX buffers, etc.) from
            John Crispin.
      
         5) Fix endianness bug in icmpv6_err() handler, from Hannes Frederic
            Sowa.
      
         6) Fix hashing of flows in UDP in the ruseport case, from Xuemin Su.
      
         7) Fix netlink notifications in ovs for tunnels, delete link messages
            are never emitted because of how the device registry state is
            handled.  From Nicolas Dichtel.
      
         8) Conntrack module leaks kmemcache on unload, from Florian Westphal.
      
         9) Prevent endless jump loops in nft rules, from Liping Zhang and
            Pablo Neira Ayuso.
      
        10) Not early enough spinlock initialization in mlx4, from Eric
            Dumazet.
      
        11) Bind refcount leak in act_ipt, from Cong WANG.
      
        12) Missing RCU locking in HTB scheduler, from Florian Westphal.
      
        13) Several small MACSEC bug fixes from Sabrina Dubroca (missing RCU
            barrier, using heap for SG and IV, and erroneous use of async flag
            when allocating AEAD conext.)
      
        14) RCU handling fix in TIPC, from Ying Xue.
      
        15) Pass correct protocol down into ipv4_{update_pmtu,redirect}() in
            SIT driver, from Simon Horman.
      
        16) Socket timer deadlock fix in TIPC from Jon Paul Maloy.
      
        17) Fix potential deadlock in team enslave, from Ido Schimmel.
      
        18) Memory leak in KCM procfs handling, from Jiri Slaby.
      
        19) ESN generation fix in ipv4 ESP, from Herbert Xu.
      
        20) Fix GFP_KERNEL allocations with locks held in act_ife, from Cong
            WANG.
      
        21) Use after free in netem, from Eric Dumazet.
      
        22) Uninitialized last assert time in multicast router code, from Tom
            Goff.
      
        23) Skip raw sockets in sock_diag destruction broadcast, from Willem
            de Bruijn.
      
        24) Fix link status reporting in thunderx, from Sunil Goutham.
      
        25) Limit resegmentation of retransmit queue so that we do not
            retransmit too large GSO frames.  From Eric Dumazet.
      
        26) Delay bpf program release after grace period, from Daniel
            Borkmann"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (141 commits)
        openvswitch: fix conntrack netlink event delivery
        qed: Protect the doorbell BAR with the write barriers.
        neigh: Explicitly declare RCU-bh read side critical section in neigh_xmit()
        e1000e: keep VLAN interfaces functional after rxvlan off
        cfg80211: fix proto in ieee80211_data_to_8023 for frames without LLC header
        qlcnic: use the correct ring in qlcnic_83xx_process_rcv_ring_diag()
        bpf, perf: delay release of BPF prog after grace period
        net: bridge: fix vlan stats continue counter
        tcp: do not send too big packets at retransmit time
        ibmvnic: fix to use list_for_each_safe() when delete items
        net: thunderx: Fix TL4 configuration for secondary Qsets
        net: thunderx: Fix link status reporting
        net/mlx5e: Reorganize ethtool statistics
        net/mlx5e: Fix number of PFC counters reported to ethtool
        net/mlx5e: Prevent adding the same vxlan port
        net/mlx5e: Check for BlueFlame capability before allocating SQ uar
        net/mlx5e: Change enum to better reflect usage
        net/mlx5: Add ConnectX-5 PCIe 4.0 to list of supported devices
        net/mlx5: Update command strings
        net: marvell: Add separate config ANEG function for Marvell 88E1111
        ...
      32826ac4
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 653c574a
      Linus Torvalds 提交于
      Pull s390 fixes from Martin Schwidefsky:
       "Another two bug fixes for 4.7:
      
         - The revert of patch which removed boot information for systems
           using an intermediate boot kernel, e.g. the SLES12 grub setup.
      
         - A fix for an incorrect inline assembly constraint that causes
           broken code to be generated with gcc 4.8.5"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: fix test_fp_ctl inline assembly contraints
        Revert "s390/kdump: Clear subchannel ID to signal non-CCW/SCSI IPL"
      653c574a