1. 06 Jan, 2017 7 commits
    • Linus Torvalds's avatar
      Merge tag 'acpi-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7397e1e8
      Linus Torvalds authored
      Pull ACPI fixes from Rafael Wysocki:
       "These fix a device enumeration problem related to _ADR matching and an
        IOMMU initialization issue related to the DMAR table missing, remove
        an excessive function call from the core ACPI code, update an error
        message in the ACPI WDAT watchdog driver and add a way to work around
        problems with unhandled GPE notifications.
      
        Specifics:
      
         - Fix a device enumeration issue leading to incorrect associations
           between ACPI device objects and platform device objects
           representing physical devices if the given device object has both
           _ADR and _HID (Rafael Wysocki).
      
         - Avoid passing NULL to acpi_put_table() during IOMMU initialization
           which triggers a (rightful) warning from ACPICA (Rafael Wysocki).
      
         - Drop an excessive call to acpi_dma_deconfigure() from the core code
           that binds ACPI device objects to device objects representing
           physical devices (Lorenzo Pieralisi).
      
         - Update an error message in the ACPI WDAT watchdog driver to make it
           provide more useful information (Mika Westerberg).
      
         - Add a mechanism to work around issues with unhandled GPE
           notifications that occur during system initialization and cannot be
           prevented by means of sysfs (Lv Zheng)"
      
      * tag 'acpi-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / DMAR: Avoid passing NULL to acpi_put_table()
        ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
        ACPI / watchdog: Print out error number when device creation fails
        ACPI / sysfs: Provide quirk mechanism to prevent GPE flooding
        ACPI: Drop misplaced acpi_dma_deconfigure() call from acpi_bind_one()
      7397e1e8
    • Linus Torvalds's avatar
      Merge tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · b937a869
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These fix a few issues in the intel_pstate driver, a documetation
        issue, a false-positive compiler warning in the generic power domains
        framework and two problems in the devfreq subsystem. They also update
        the MAINTAINERS entry for devfreq and add a new "compatible" string to
        the generic cpufreq-dt driver.
      
        Specifics:
      
         - Fix a few intel_pstate driver issues: add missing locking it two
           places, avoid exposing a useless debugfs interface and keep the
           attribute values in sysfs in sync (Rafael Wysocki).
      
         - Drop confusing kernel-doc references related to power management
           and ACPI from the driver API manual (Rafael Wysocki).
      
         - Make a false-positive compiler warning in the generic power domains
           framework go away (Augusto Mecking Caringi).
      
         - Fix two initialization issues in the devfreq subsystem and update
           the MAINTAINERS entry for it (Chanwoo Choi).
      
         - Add a new "compatible" string for APM X-Gene 2 to the generic DT
           cpufreq driver (Hoan Tran)"
      
      * tag 'pm-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: dt: Add support for APM X-Gene 2
        PM / devfreq: exynos-bus: Fix the wrong return value
        PM / devfreq: Fix the bug of devfreq_add_device when governor is NULL
        MAINTAINERS: Add myself as reviewer for DEVFREQ subsystem support
        PM / docs: Drop confusing kernel-doc references from infrastructure.rst
        PM / domains: Fix 'may be used uninitialized' build warning
        cpufreq: intel_pstate: Always keep all limits settings in sync
        cpufreq: intel_pstate: Use locking in intel_cpufreq_verify_policy()
        cpufreq: intel_pstate: Use locking in intel_pstate_resume()
        cpufreq: intel_pstate: Do not expose PID parameters in passive mode
      b937a869
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-scan', 'acpi-sysfs', 'acpi-wdat' and 'acpi-tables' · f1dabf0b
      Rafael J. Wysocki authored
      * acpi-scan:
        ACPI / scan: Prefer devices without _HID/_CID for _ADR matching
        ACPI: Drop misplaced acpi_dma_deconfigure() call from acpi_bind_one()
      
      * acpi-sysfs:
        ACPI / sysfs: Provide quirk mechanism to prevent GPE flooding
      
      * acpi-wdat:
        ACPI / watchdog: Print out error number when device creation fails
      
      * acpi-tables:
        ACPI / DMAR: Avoid passing NULL to acpi_put_table()
      f1dabf0b
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-domains', 'pm-docs' and 'pm-devfreq' · 7e2b9d85
      Rafael J. Wysocki authored
      * pm-domains:
        PM / domains: Fix 'may be used uninitialized' build warning
      
      * pm-docs:
        PM / docs: Drop confusing kernel-doc references from infrastructure.rst
      
      * pm-devfreq:
        PM / devfreq: exynos-bus: Fix the wrong return value
        PM / devfreq: Fix the bug of devfreq_add_device when governor is NULL
        MAINTAINERS: Add myself as reviewer for DEVFREQ subsystem support
      7e2b9d85
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-cpufreq' · 3baad655
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: dt: Add support for APM X-Gene 2
        cpufreq: intel_pstate: Always keep all limits settings in sync
        cpufreq: intel_pstate: Use locking in intel_cpufreq_verify_policy()
        cpufreq: intel_pstate: Use locking in intel_pstate_resume()
        cpufreq: intel_pstate: Do not expose PID parameters in passive mode
      3baad655
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.10-3' of... · 88ba6cae
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver fixes from Darren Hart:
       "Just two small fixes for platform drivers x86:
      
         - use brightness_set_blocking for LED-setting callbacks on Fujitsu
           laptops
      
         - fix surface3_button build errors"
      
      * tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        platform/x86: fujitsu-laptop: use brightness_set_blocking for LED-setting callbacks
        platform/x86: fix surface3_button build errors
      88ba6cae
    • Linus Torvalds's avatar
      Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit · 6989606a
      Linus Torvalds authored
      Pull audit fixes from Paul Moore:
       "Two small fixes relating to audit's use of fsnotify.
      
        The first patch plugs a leak and the second fixes some lock
        shenanigans. The patches are small and I banged on this for an
        afternoon with our testsuite and didn't see anything odd"
      
      * 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit:
        audit: Fix sleep in atomic
        fsnotify: Remove fsnotify_duplicate_mark()
      6989606a
  2. 05 Jan, 2017 8 commits
    • Linus Torvalds's avatar
      Merge tag 'drm-intel-fixes-2017-01-05' of git://anongit.freedesktop.org/git/drm-intel · ed40875d
      Linus Torvalds authored
      Pull i915 drm fixes from Jani Nikula:
       "Here's a bunch of drm/i915 fixes for v4.10-rc3. It includes GVT-g
        fixes.
      
        My new year's resolution is to start using signed tags for pulls. If
        that feels like a déjà vu, it's ((new year's) resolution), not (new
        (year's resolution))"
      
      [ Taking this directly from Jani because Dave Airlie is only partially
        connected right now.  - Linus ]
      
      * tag 'drm-intel-fixes-2017-01-05' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915: Prevent timeline updates whilst performing reset
        drm/i915: Silence allocation failure during sg_trim()
        drm/i915: Don't clflush before release phys object
        drm/i915: Fix oops in overlay due to frontbuffer tracking
        drm/i915: Fix oopses in the overlay code due to i915_gem_active stuff
        drm/i915: Initialize overlay->last_flip properly
        drm/i915: Move the min_pixclk[] handling to the end of readout
        drm/i915: Force VDD off on the new power seqeuencer before starting to use it
        drm/i915/gvt: fix typo in cfg_space range check
        drm/i915/gvt: fix an issue in emulating cfg space PCI_COMMAND
        drm/i915/gvt/kvmgt: trival: code cleanup
        drm/i915/gvt/kvmgt: prevent double-release of vgpu
        drm/i915/gvt/kvmgt: check returned slot for gfn
        drm/i915/gvt/kvmgt: dereference the pointer within lock
        drm/i915/gvt: reset the GGTT entry when vGPU created
        drm/i915/gvt: fix an error in opregion handling
      ed40875d
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · c433eb70
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
       "Three small pin control fixes for the v4.10 series. Very little to say
        about them, just driver fixes.
      
         - one fix to the AMD pinctrl ACPI glue
      
         - fix requests on the Meson driver
      
         - fix bitfield widths on Samsungs Exynos 5433"
      
      * tag 'pinctrl-v4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: samsung: Fix the width of PINCFG_TYPE_DRV bitfields for Exynos5433
        pinctrl: meson: fix gpio request disabling other modes
        pinctrl/amd: Set the level based on ACPI tables
      c433eb70
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b4007927
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "This is a rather large set of bugfixes, as we just returned from the
        Christmas break. Most of these are relatively unimportant fixes for
        regressions introduced during the merge window, and about half of the
        changes are for mach-omap2.
      
        A couple of patches are just cleanups and dead code removal that I
        would not normally have considered for merging after -rc2, but I
        decided to take them along with the fixes this time.
      
        Notable fixes include:
      
         - removing the skeleton.dtsi include broke a number of machines, and
           we have to put empty /chosen nodes back to be able to pass kernel
           command lines as before
      
         - enabling Samsung platforms no longer hardwires CONFIG_HZ to 200, as
           it had been for no good reason for a long time"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (46 commits)
        MAINTAINERS: extend PSCI entry to cover the newly add PSCI checker code
        drivers: psci: annotate timer on stack to silence odebug messages
        ARM64: defconfig: enable DRM_MESON as module
        ARM64: dts: meson-gx: Add Graphic Controller nodes
        ARM64: dts: meson-gxl: fix GPIO include
        ARM: dts: imx6: Disable "weim" node in the dtsi files
        ARM: dts: qcom: apq8064: Add missing scm clock
        ARM: davinci: da8xx: Fix sleeping function called from invalid context
        ARM: davinci: Make __clk_{enable,disable} functions public
        ARM: davinci: da850: don't add emac clock to lookup table twice
        ARM: davinci: da850: fix infinite loop in clk_set_rate()
        ARM: i.MX: remove map_io callback
        ARM: dts: vf610-zii-dev-rev-b: Add missing newline
        ARM: dts: imx6qdl-nitrogen6x: remove duplicate iomux entry
        ARM: dts: imx31: fix AVIC base address
        ARM: dts: am572x-idk: Add gpios property to control PCIE_RESETn
        arm64: dts: vexpress: Support GICC_DIR operations
        ARM: dts: vexpress: Support GICC_DIR operations
        firmware: arm_scpi: fix reading sensor values on pre-1.0 SCPI firmwares
        arm64: dts: msm8996: Add required memory carveouts
        ...
      b4007927
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 383378d1
      Linus Torvalds authored
      Pull xen fixes and cleanups from Juergen Gross:
      
       - small fixes for xenbus driver
      
       - one fix for xen dom0 boot on huge system
      
       - small cleanups
      
      * tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        Xen: ARM: Zero reserved fields of xatp before making hypervisor call
        xen: events: Replace BUG() with BUG_ON()
        xen: remove stale xs_input_avail() from header
        xen: return xenstore command failures via response instead of rc
        xen: xenbus driver must not accept invalid transaction ids
        xen/evtchn: use rb_entry()
        xen/setup: Don't relocate p2m over existing one
      383378d1
    • Nicholas Piggin's avatar
      kbuild: initramfs cleanup, set target from Kconfig · 9e3596b0
      Nicholas Piggin authored
      Rather than keep a list of all possible compression types in the
      Makefile, set the target explicitly from Kconfig.
      Reviewed-by: default avatarFrancisco Blas Izquierdo Riera (klondike) <klondike@klondike.es>
      Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9e3596b0
    • Nicholas Piggin's avatar
      kbuild: initramfs fix dependency checking for compressed target · ae30ab4c
      Nicholas Piggin authored
      When using initramfs compression, the data file compression suffix
      gets quotes pulled in from Kconfig, e.g., initramfs_data.cpio".gz"
      which make does not match a target and causes rebuild.
      
      Fix this by filtering out quotes from the Kconfig string.
      
      Fixes: 35e669e1 ("initramfs: select builtin initram compression algorithm on KConfig instead of Makefile")
      Reviewed-by: default avatarFrancisco Blas Izquierdo Riera (klondike) <klondike@klondike.es>
      Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ae30ab4c
    • Rafael J. Wysocki's avatar
      ACPI / DMAR: Avoid passing NULL to acpi_put_table() · 696c7f8e
      Rafael J. Wysocki authored
      Linus reported that commit 174cc718 "ACPICA: Tables: Back port
      acpi_get_table_with_size() and early_acpi_os_unmap_memory() from
      Linux kernel" added a new warning on his desktop system:
      
       ACPI Warning: Table ffffffff9fe6c0a0, Validation count is zero before decrement
      
      which turns out to come from the acpi_put_table() in
      detect_intel_iommu().
      
      This happens if the DMAR table is not present in which case NULL is
      passed to acpi_put_table() which doesn't check against that and
      attempts to handle it regardless.
      
      For this reason, check the pointer passed to acpi_put_table()
      before invoking it.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Tested-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Fixes: 6b11d1d6 ("ACPI / osl: Remove acpi_get_table_with_size()/early_acpi_os_unmap_memory() users")
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      696c7f8e
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · e02003b5
      Linus Torvalds authored
      Pull xfs fixes from Darrick Wong:
      
       - fixes for crashes and double-cleanup errors
      
       - XFS maintainership handover
      
       - fix to prevent absurdly large block reservations
      
       - fix broken sysfs getter/setters
      
      * tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: fix max_retries _show and _store functions
        xfs: update MAINTAINERS
        xfs: fix crash and data corruption due to removal of busy COW extents
        xfs: use the actual AG length when reserving blocks
        xfs: fix double-cleanup when CUI recovery fails
      e02003b5
  3. 04 Jan, 2017 25 commits
    • Hoan Tran's avatar
      cpufreq: dt: Add support for APM X-Gene 2 · e11b6293
      Hoan Tran authored
      Add the compatible string for supporting the generic device tree cpufreq-dt
      driver on APM's X-Gene 2 SoC.
      Signed-off-by: default avatarHoan Tran <hotran@apm.com>
      Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      e11b6293
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 4cf18463
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) stmmac_drv_probe() can race with stmmac_open() because we register
          the netdevice too early. Fix from Florian Fainelli.
      
       2) UFO handling in __ip6_append_data() and ip6_finish_output() use
          different tests for deciding whether a frame will be fragmented or
          not, put them in sync. Fix from Zheng Li.
      
       3) The rtnetlink getstats handlers need to validate that the netlink
          request is large enough, fix from Mathias Krause.
      
       4) Use after free in mlx4 driver, from Jack Morgenstein.
      
       5) Fix setting of garbage UID value in sockets during setattr() calls,
          from Eric Biggers.
      
       6) Packet drop_monitor doesn't format the netlink messages properly
          such that nlmsg_next fails to work, fix from Reiter Wolfgang.
      
       7) Fix handling of wildcard addresses in l2tp lookups, from Guillaume
          Nault.
      
       8) __skb_flow_dissect() can crash on pptp packets, from Ian Kumlien.
      
       9) IGMP code doesn't reset group query timers properly, from Michal
          Tesar.
      
      10) Fix overzealous MAIN/LOCAL route table combining in ipv4, from
          Alexander Duyck.
      
      11) vxlan offload check needs to be more strict in be2net driver, from
          Sabrina Dubroca.
      
      12) Moving l3mdev to packet hooks lost RX stat counters unintentionally,
          fix from David Ahern.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits)
        sh_eth: enable RX descriptor word 0 shift on SH7734
        sfc: don't report RX hash keys to ethtool when RSS wasn't enabled
        dpaa_eth: Initialize CGR structure before init
        dpaa_eth: cleanup after init_phy() failure
        net: systemport: Pad packet before inserting TSB
        net: systemport: Utilize skb_put_padto()
        LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK
        libcxgb: fix error check for ip6_route_output()
        net: usb: asix_devices: add .reset_resume for USB PM
        net: vrf: Add missing Rx counters
        drop_monitor: consider inserted data in genlmsg_end
        benet: stricter vxlan offloading check in be_features_check
        ipv4: Do not allow MAIN to be alias for new LOCAL w/ custom rules
        net: macb: Updated resource allocation function calls to new version of API.
        net: stmmac: dwmac-oxnas: use generic pm implementation
        net: stmmac: dwmac-oxnas: fix fixed-link-phydev leaks
        net: stmmac: dwmac-oxnas: fix of-node leak
        Documentation/networking: fix typo in mpls-sysctl
        igmp: Make igmp group member RFC 3376 compliant
        flow_dissector: Update pptp handling to avoid null pointer deref.
        ...
      4cf18463
    • Sergei Shtylyov's avatar
      sh_eth: enable RX descriptor word 0 shift on SH7734 · 71eae1ca
      Sergei Shtylyov authored
      The RX descriptor word 0 on SH7734 has the RFS[9:0] field in bits 16-25
      (bits  0-15 usually used for that are occupied by the packet checksum).
      Thus  we need to set the 'shift_rd0'  field in the SH7734 SoC data...
      
      Fixes: f0e81fec ("net: sh_eth: Add support SH7734")
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      71eae1ca
    • Edward Cree's avatar
      sfc: don't report RX hash keys to ethtool when RSS wasn't enabled · 4fdda958
      Edward Cree authored
      If we failed to set up RSS on EF10 (e.g. because firmware declared
       RX_RSS_LIMITED), ethtool --show-nfc $dev rx-flow-hash ... should report
       no fields, rather than confusingly reporting what fields we _would_ be
       hashing on if RSS was working.
      
      Fixes: dcb4123c ("sfc: disable RSS when unsupported")
      Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4fdda958
    • David S. Miller's avatar
      Merge branch 'dpaa_eth-fixes' · aa9773be
      David S. Miller authored
      Madalin Bucur says:
      
      ====================
      dpaa_eth: a couple of fixes
      
      Add cleanup on PHY initialization failure path, avoid using
      uninitialized memory at CGR init.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aa9773be
    • Roy Pledge's avatar
      dpaa_eth: Initialize CGR structure before init · 0fbb0f24
      Roy Pledge authored
      The QBMan CGR options needs to be zeroed before calling the init
      function
      Signed-off-by: default avatarRoy Pledge <roy.pledge@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0fbb0f24
    • Madalin Bucur's avatar
      3fe61f09
    • David S. Miller's avatar
      Merge branch 'systemport-padding-and-TSB-insertion' · c030af87
      David S. Miller authored
      Florian Fainelli says:
      
      ====================
      net: systemport: Fix padding vs. TSB insertion
      
      This patch series fixes how we pad the packets submitted to the SYSTEMPORT
      adapter, and how the transmit status block (prepended 8 bytes) fits in the
      picture. The first patch is not technically a bug fix, but is required for the
      second path to be applied and to greatly simplify the skb length calculation.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c030af87
    • Florian Fainelli's avatar
      net: systemport: Pad packet before inserting TSB · 38e5a855
      Florian Fainelli authored
      Inserting the TSB means adding an extra 8 bytes in front the of packet
      that is going to be used as metadata information by the TDMA engine, but
      stripped off, so it does not really help with the packet padding.
      
      For some odd packet sizes that fall below the 60 bytes payload (e.g: ARP)
      we can end-up padding them after the TSB insertion, thus making them 64
      bytes, but with the TDMA stripping off the first 8 bytes, they could
      still be smaller than 64 bytes which is required to ingress the switch.
      
      Fix this by swapping the padding and TSB insertion, guaranteeing that
      the packets have the right sizes.
      
      Fixes: 80105bef ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver")
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      38e5a855
    • Florian Fainelli's avatar
      net: systemport: Utilize skb_put_padto() · bb7da333
      Florian Fainelli authored
      Since we need to pad our packets, utilize skb_put_padto() which
      increases skb->len by how much we need to pad, allowing us to eliminate
      the test on skb->len right below.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb7da333
    • Nicolas Pitre's avatar
      LiquidIO VF: s/select/imply/ for PTP_1588_CLOCK · cd7aeb1f
      Nicolas Pitre authored
      Fix a minor fallout from the merge of the timers and the networking
      trees. The following error may result if the PTP_1588_CLOCK
      prerequisites are not available:
      
      drivers/built-in.o: In function `ptp_clock_unregister':
      (.text+0x40e0a5): undefined reference to `pps_unregister_source'
      drivers/built-in.o: In function `ptp_clock_unregister':
      (.text+0x40e0cc): undefined reference to `posix_clock_unregister'
      drivers/built-in.o: In function `ptp_clock_event':
      (.text+0x40e249): undefined reference to `pps_event'
      drivers/built-in.o: In function `ptp_clock_register':
      (.text+0x40e5e1): undefined reference to `pps_register_source'
      drivers/built-in.o: In function `ptp_clock_register':
      (.text+0x40e62c): undefined reference to `posix_clock_register'
      drivers/built-in.o: In function `ptp_clock_register':
      (.text+0x40e68d): undefined reference to `pps_unregister_source'
      Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
      Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      cd7aeb1f
    • Varun Prakash's avatar
      libcxgb: fix error check for ip6_route_output() · a9a8cdb3
      Varun Prakash authored
      ip6_route_output() never returns NULL so
      check dst->error instead of !dst.
      Signed-off-by: default avatarVarun Prakash <varun@chelsio.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9a8cdb3
    • Peter Chen's avatar
      net: usb: asix_devices: add .reset_resume for USB PM · 63dfb0da
      Peter Chen authored
      The USB core may call reset_resume when it fails to resume asix device.
      And USB core can recovery this abnormal resume at low level driver,
      the same .resume at asix driver can work too. Add .reset_resume can
      avoid disconnecting after backing from system resume, and NFS can
      still be mounted after this commit.
      Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      63dfb0da
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 62f8c405
      Linus Torvalds authored
      Pull block layer fixes from Jens Axboe:
       "A set of fixes for the current series, one fixing a regression with
        block size < page cache size in the alias series from Jan. Outside of
        that, two small cleanups for wbt from Bart, a nvme pull request from
        Christoph, and a few small fixes of documentation updates"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: fix up io_poll documentation
        block: Avoid that sparse complains about context imbalance in __wbt_wait()
        block: Make wbt_wait() definition consistent with declaration
        clean_bdev_aliases: Prevent cleaning blocks that are not in block range
        genhd: remove dead and duplicated scsi code
        block: add back plugging in __blkdev_direct_IO
        nvmet/fcloop: remove some logically dead code performing redundant ret checks
        nvmet: fix KATO offset in Set Features
        nvme/fc: simplify error handling of nvme_fc_create_hw_io_queues
        nvme/fc: correct some printk information
        nvme/scsi: Remove START STOP emulation
        nvme/pci: Delete misleading queue-wrap comment
        nvme/pci: Fix whitespace problem
        nvme: simplify stripe quirk
        nvme: update maintainers information
      62f8c405
    • Linus Torvalds's avatar
      Merge tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux · 9f744519
      Linus Torvalds authored
      Pull fbdev fixes from Bartlomiej Zolnierkiewicz:
      
       - bring fbdev subsystem back into Maintained mode
      
       - add missing devm_ioremap() error checking to cobalt_lcdfb driver
      
      * tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux:
        video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap
        MAINTAINERS: add myself as maintainer of fbdev
      9f744519
    • Linus Torvalds's avatar
      Merge tag 'gcc-plugins-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux · 99b9be77
      Linus Torvalds authored
      Pull gcc-plugins fixes from Kees Cook:
       "Small fixes for gcc-plugins when using certain gcc versions:
      
         - update gcc-common.h for gcc 7 (Emese Revfy)
      
         - fix latent_entropy type for early gcc on ARM (PaX Team)"
      
      * tag 'gcc-plugins-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
        gcc-plugins: update gcc-common.h for gcc-7
        latent_entropy: fix ARM build error on earlier gcc
      99b9be77
    • Arnd Bergmann's avatar
      Merge tag 'davinci-fixes-for-v4.10' of... · 1b9ec812
      Arnd Bergmann authored
      Merge tag 'davinci-fixes-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes
      
      Pull "DaVinci fixes for v4.10" from Sekhar Nori:
      
      This pull request contains fixes for the following issues
      
      1) Fix two instances of infinite loop occurring in
         clock list for DA850. This fixes kernel hangs in some
         instances and so have been marked for stable kernel.
      
      2) Fix for sleeping function called from atomic context
         with USB 2.0 clock management code introduced in v4.10
         merge window.
      
      * tag 'davinci-fixes-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
        ARM: davinci: da8xx: Fix sleeping function called from invalid context
        ARM: davinci: Make __clk_{enable,disable} functions public
        ARM: davinci: da850: don't add emac clock to lookup table twice
        ARM: davinci: da850: fix infinite loop in clk_set_rate()
      1b9ec812
    • Arnd Bergmann's avatar
      Merge tag 'amlogic-fixes' of... · e9b2aefa
      Arnd Bergmann authored
      Merge tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into fixes
      
      Pull "Amlogic fixes for v4.10" from Kevin Hilman:
      
      - DT: GXL: fix GPIO include
      - add DT and defconfig for newly merged DRM driver
      
      This pull has one real fix, as a couple non-critical ones.  The DRM
      DT/defconfig patches are coming now because I didn't expect the new
      driver to make it for the v4.10 merge window, but since it did[1], the
      DT and defconfig should go into the same release.
      
      [1] bbbe775e drm: Add support for Amlogic Meson Graphic Controller
      
      * tag 'amlogic-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM64: defconfig: enable DRM_MESON as module
        ARM64: dts: meson-gx: Add Graphic Controller nodes
        ARM64: dts: meson-gxl: fix GPIO include
      e9b2aefa
    • Arnd Bergmann's avatar
      Merge tag 'psci-fixes-4.10' of... · 5c6ec6a0
      Arnd Bergmann authored
      Merge tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into fixes
      
      Pull "PSCI fixes for v4.10" from Lorenzo Pieralisi:
      
      Two minor fixes following the merge of the PSCI checker:
      
      - Annotate the PSCI checker timer on the stack used to wake-up from
        suspend to prevent warnings when the DEBUG_OBJECTS config option
        is enabled
      - Extend the PSCI entry in the maintainers list to also include the
        PSCI checker code
      
      * tag 'psci-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux:
        MAINTAINERS: extend PSCI entry to cover the newly add PSCI checker code
        drivers: psci: annotate timer on stack to silence odebug messages
      5c6ec6a0
    • Arnd Bergmann's avatar
      Merge tag 'juno-fixes-4.10' of... · 46db9914
      Arnd Bergmann authored
      Merge tag 'juno-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
      
      Pull "ARMv8 Juno/VExpress fixes for v4.10" from Sudeep Holla:
      
      A simple fix to extend GICv2 CPU interface registers from 4K to 8K
      on AEMv8 FVP/RTSM models in order to support split priority drop and
      interrupt deactivation.
      
      * tag 'juno-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
        arm64: dts: vexpress: Support GICC_DIR operations
      46db9914
    • Arnd Bergmann's avatar
      Merge tag 'vexpress-fixes-4.10' of... · f53c1e64
      Arnd Bergmann authored
      Merge tag 'vexpress-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
      
      Pull "ARMv7 VExpress fixes for v4.10" from Sudeep Holla:
      
      A simple fix to extend GICv2 CPU interface registers from 4K to 8K
      on VExpress TC1 and TC2 platforms in order to support split priority
      drop and interrupt deactivation.
      
      * tag 'vexpress-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
        ARM: dts: vexpress: Support GICC_DIR operations
      f53c1e64
    • Arnd Bergmann's avatar
      Merge tag 'scpi-fixes-4.10' of... · 43a8df78
      Arnd Bergmann authored
      Merge tag 'scpi-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into fixes
      
      Pull "SCPI fix for v4.10" from Sudeep Holla:
      
      A simple fix for reading only lower 32-bit sensor values on pre-1.0 SCPI
      firmwares so that upper 32-bit (garbage) value is discarded properly.
      
      * tag 'scpi-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
        firmware: arm_scpi: fix reading sensor values on pre-1.0 SCPI firmwares
      43a8df78
    • Arnd Bergmann's avatar
      Merge tag 'imx-fixes-4.10' of... · ad040d8d
      Arnd Bergmann authored
      Merge tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      Pull "i.MX fixes for 4.10" from Shawn Guo:
      
       - A format fix for vf610-zii-dev-rev-b.dts, which has a very odd line
         due to misses a newline.
       - A fix to imx-weim bus error seen on board which doesn't actually use
         the bus.
       - A fix for imx6qdl-nitrogen6x board which has conflicting usage of
         pad NANDF_CS2.
       - A cleanup on i.MX1 machine to remove .map_io callback, which also
         fixes a compiling error for NOMMU build.
       - Fix AVIC base address in i.MX31 device tree source.  The problem was
         shadowed by the AVIC driver, which takes the correct base address
         from a SoC specific header file.
      
      * tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx6: Disable "weim" node in the dtsi files
        ARM: i.MX: remove map_io callback
        ARM: dts: vf610-zii-dev-rev-b: Add missing newline
        ARM: dts: imx6qdl-nitrogen6x: remove duplicate iomux entry
        ARM: dts: imx31: fix AVIC base address
      ad040d8d
    • Arnd Bergmann's avatar
      Merge tag 'qcom-arm-fixes-for-4.10-rc2' of... · fcf14b88
      Arnd Bergmann authored
      Merge tag 'qcom-arm-fixes-for-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
      
      Pull "Qualcomm ARM DTS Fixes for v4.10-rc2" from Andy Gross:
      
      * Add SCM clock for APQ8064 to fix boot failures
      
      * tag 'qcom-arm-fixes-for-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
        ARM: dts: qcom: apq8064: Add missing scm clock
      fcf14b88
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.10/fixes-rc1' of... · 46a3bf80
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.10/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Pull "omap fixes for v4.10-rc cycle" from Tony Lindgren:
      
      Fist set of fixes for omaps for v4.10-rc cycle, mostly
      to deal with various regressions noticed during the merge
      window and to fix various device tree configurations for
      boards. Also included is removal of mach-omap2/gpio.c that
      is now dead code with device tree based booting that should
      be OK for the early -rc cycle:
      
      - A series of fixes to add empty chosen node to fix regressions
        caused for bootloaders that don't create chosen node as the
        decompressor needs the chosen node to merge command line and
        ATAGs into it
      
      - Fix missing logicpd-som-lv-37xx-devkit.dtb entry in Makefile
      
      - Fix regression for am437x timers
      
      - Fix wrong strcat for non-NULL terminated string
      
      - A series of changes to fix tps65217 interrupts to not use
        defines as we don't do that for interrupts
      
      - Two patches to fix USB VBUS detection on am57xx-idk and force it
        to peripheral mode until dwc3 role detection is working
      
      - Add missing dra72-evm-tps65917 missing voltage supplies
        accidentally left out of an earlier patch
      
      - Fix n900 eMMC detection when booted on qemu
      
      - Remove unwanted pr_err on failed memory allocation for
        prm_common.c
      
      - Remove legacy mach-omap2/gpio.c that now is dead code
        since we boot mach-omap2 in device tree only mode
      
      - Fix am572x-idk pcie1 by adding the missing gpio reset pin
      
      * tag 'omap-for-v4.10/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (23 commits)
        ARM: dts: am572x-idk: Add gpios property to control PCIE_RESETn
        ARM: OMAP2+: PRM: Delete an error message for a failed memory allocation
        ARM: dts: n900: Mark eMMC slot with no-sdio and no-sd flags
        ARM: dts: dra72-evm-tps65917: Add voltage supplies to usb_phy, mmc, dss
        ARM: dts: am57xx-idk: Put USB2 port in peripheral mode
        ARM: dts: am57xx-idk: Support VBUS detection on USB2 port
        dt-bindings: input: Specify the interrupt number of TPS65217 power button
        dt-bindings: power/supply: Update TPS65217 properties
        dt-bindings: mfd: Remove TPS65217 interrupts
        ARM: dts: am335x: Fix the interrupt name of TPS65217
        ARM: omap2+: fixing wrong strcat for Non-NULL terminated string
        ARM: omap2+: am437x: rollback to use omap3_gptimer_timer_init()
        ARM: dts: omap3: Add DTS for Logic PD SOM-LV 37xx Dev Kit
        ARM: dts: dra7: Add an empty chosen node to top level DTSI
        ARM: dts: dm816x: Add an empty chosen node to top level DTSI
        ARM: dts: dm814x: Add an empty chosen node to top level DTSI
        ARM: dts: am4372: Add an empty chosen node to top level DTSI
        ARM: dts: am33xx: Add an empty chosen node to top level DTSI
        ARM: dts: omap5: Add an empty chosen node to top level DTSI
        ARM: dts: omap4: Add an empty chosen node to top level DTSI
        ...
      46a3bf80