1. 15 Jan, 2017 1 commit
    • Arnd Bergmann's avatar
      ahci: imx: fix building without hwmon or thermal · d7969f59
      Arnd Bergmann authored
      When CONFIG_HWMON is disabled, we now get a link failure:
      
      ERROR: "devm_hwmon_device_register_with_groups" [drivers/ata/ahci_imx.ko] undefined!
      drivers/ata/ahci_imx.o: In function `imx_ahci_probe':
      ahci_imx.c:(.text.imx_ahci_probe+0x304): undefined reference to `devm_thermal_zone_of_sensor_register'
      
      This makes the code calling into the hwmon subsystem compile-time
      conditional, and adds a Kconfig dependency to avoid the corner
      case of having HWMON=m and AHCI_IMX=y, by forcing AHCI_IMX=m in this
      case. The thermal subsystem already has a check in its header, but
      that also doesn't cover the THERMAL=m case, so we need a somewhat
      complex Kconfig expression to handle all cases.
      
      Fixes: 54643a83 ("ahci: imx: Add imx53 SATA temperature sensor support")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarReviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      d7969f59
  2. 10 Jan, 2017 9 commits
  3. 09 Jan, 2017 3 commits
  4. 06 Jan, 2017 14 commits
  5. 05 Jan, 2017 7 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
    • 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
  6. 04 Jan, 2017 6 commits
    • 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