1. 21 Dec, 2017 13 commits
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.16/dt-clk-signed' of... · 24ff73a0
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.16/dt-clk-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
      
      Pull "Clock related dts changes for omaps for v4.16 merge window" from
      Tony Lindgren:
      
      This branch contains a series of dts changes from Tero Kristo to
      start using clkctrl clocks.
      
      Note that this branch is based on a merge of omap-for-v4.16/soc-signed
      and an immutable commit from Tero Kristo fe7020e6 ("clk: ti: omap4:
      clkctrl data fixes for opt-clocks") that is also in clk-next.
      
      * tag 'omap-for-v4.16/dt-clk-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (57 commits)
        ARM: dts: dm816x: add clkctrl nodes
        ARM: dts: dm814x: add clkctrl nodes
        ARM: dts: am43xx: add clkctrl nodes
        ARM: dts: am33xx: add clkctrl nodes
        ARM: dts: dra7: add clkctrl nodes
        ARM: dts: omap5: add clkctrl nodes
        ARM: dts: omap4: add clkctrl nodes
        ARM: dts: dm816x: add bus functionality to base PRCM node
        ARM: dts: am43xx: add bus functionality to base PRCM node
        ARM: dts: am33xx: add bus functionality to base PRCM node
        ARM: dts: dra7: add bus functionality to base PRCM nodes
        ARM: dts: omap4: add bus functionality to base PRCM nodes
        ARM: dts: omap5: add bus functionality to base PRCM nodes
        ARM: dts: dm816x: add fck under timers1/2
        ARM: dts: dm814x: add fck under timers1/2
        ARM: dts: dra7: add fck under timer1
        ARM: dts: am43xx: add fck under timers1/2
        ARM: dts: am33xx: add fck under timers1/2
        ARM: dts: omap4: add fck under timer1
        ARM: dts: omap5: add fck under timer1
        ...
      24ff73a0
    • Arnd Bergmann's avatar
      Merge tag 'amlogic-dt64' of... · 8d7ac420
      Arnd Bergmann authored
      Merge tag 'amlogic-dt64' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
      
      Pull "Amlogic 64-bit DT updates for v4.16" from Kevin Hilman
      - meson-gx: add VPU power domain support
      - odroid-c2: add HDMI and CEC nodes
      - misc cleanups
      
      * tag 'amlogic-dt64' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM64: dts: meson-gxm: fix q200 interrupt number
        ARM64: dts: meson-gxm: add the PHY interrupt line on Khadas VIM2
        ARM64: dts: meson: add comments with the GPIO for the PHY interrupts
        ARM64: dts: amlogic: use generic bus node names
        ARM64: dts: meson: drop "sana" clock from SAR ADC
        ARM64: dts: odroid-c2: Add HDMI and CEC Nodes
        ARM64: dts: meson-gx: grow reset controller memory zone
        ARM64: dts: meson-gx: Add HDMI_5V regulator on selected boards
        ARM64: dts: meson-gx: add VPU power domain
      8d7ac420
    • Arnd Bergmann's avatar
      Merge tag 'amlogic-dt' of... · c4e8db5f
      Arnd Bergmann authored
      Merge tag 'amlogic-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
      
      Pull "Amlogic 32-bit DT changes for v4.16" from Kevin Hilman:
      - meson8: GPIO IRQ support
      - switch to stable UART bindings w/correct clock
      - add more L2 cache settings
      - drop unused ADC clock
      
      * tag 'amlogic-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
        ARM: meson: enable MESON_IRQ_GPIO also for MACH_MESON8
        ARM: dts: meson8: enable the GPIO interrupt controller
        ARM: dts: meson8b: use stable UART bindings with correct gate clock
        ARM: dts: meson8: use stable UART bindings with correct gate clock
        ARM: dts: meson: drop "sana" clock from SAR ADC
        ARM: dts: meson8: add more L2 cache settings
        ARM: dts: meson8b: add more L2 cache settings
      c4e8db5f
    • Arnd Bergmann's avatar
      Merge tag 'renesas-arm64-dt-for-v4.16' of... · 7d44cc20
      Arnd Bergmann authored
      Merge tag 'renesas-arm64-dt-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Pull "Renesas ARM64 Based SoC DT Updates for v4.16" from Simon Horman:
      
      * Use r8a77970 (V3M) CPG core clock and SYSC power domain macros
      
        These may be used in place of numeric constants now that they
        are present in Linus's tree.
      
      * Add r8a77970 (V3M) Starter Kit board support
      
        This includes basic support to bring up the board with a serial
        console and EtherAVB support
      
      * Add IPMMU nodes and connections to on-chip devices
        on r8a7795 (H3), r8a7796 (M3-W), r8a77970 (V3M) and r8a77995 (D3) SoCs
      
        Simon Horman says "With these patches applied a white list enabled IPMMU
        driver may be used to check silicon revision and then enable IPMMU in the
        known working cases."
      
      * Enable DMA for SCIF2 on r8a77995 (D2) SoC
      
      * Increase the number of GPIO bank 1 ports to 29 on r8a7795 (H3) SoC
      
        This adds support for the GP-1-28 port pin of the r8a7795 (H3) ES2.0 SoC
      
      * Add support for CAN to r8a77995 (D3) SoC
      
        Ulrich Hecht says "This is a by-the-datasheet implementation, with the
        datasheet missing some bits, namely the pin map.  I filled in the gaps...
        by deducing the information from pin numbers already in the PFC driver,
        so careful scrutiny is advised."
      
      * Add support for SDHI to r8a77995 (D3) SoC
      
      * Add SoC name to file header of r8a7795 (H3) and r8a7796 (M3-W)
        Salvator-X and Salvator-XS board files
      
        Geert Uytterhoeven says "With the proliferation of Salvator-X and
        Salvator-XS boards carrying different R-Car Gen3 SoCs variants, several
        DTS files ended up having the same file headers.
      
        Add the SoC names to the file headers to avoid confusion."
      
      * Add device note for ROHM BD9571MWV PMIC to
        r8a7795 (H3) and r8a7796 (M3-W) Salvator-X and Salvator-XS boards.
      
        Geert Uytterhoeven says "This was based on the example in the DT binding
        documentation, but using IRQ0 instead of a GPIO interrupt, as that
        matches the schematics, and because INTC-EX is a simpler block."
      
      * Enable USB2.0 channel 0 on r8a77970 (V3M) ULCB Kingfisher board
      
        Vladimir Barinov says "The dedicated USB0_PWEN pin is used to control
        CN13 VBUS source from U43 power supply.  MAX3355 can also provide VBUS,
        hence it should be disabled via OTG_OFFVBUSn node coming from gpio
        expander TCA9539.  Set MAX3355 enabled using OTG_EXTLPn node to be able
        to read OTG ID of CN13."
      
      * Add support for r8a7795 (M3-W) Salvator-XS board
      
        Geert Uytterhoeven says "This patch series adds support for the version
        of the Salvator-XS development board equipped with an R-Car M3-W SiP.
      
        The DT was based on work for the Salvator-X and -XS boards with M3-W
        resp. H3 SiPs."
      
      * Add watchdog timer support to r8a77970 (V3M) eagle board
      
        Geert Uytterhoven says "This allows to use the watchdog timer to reset
        the board, until PSCI is enhanced to include such functionality."
      
      * Use Use R-Car SDHI Gen3 fallback on r8a7795 (H3) and r8a7796 (M3-W) SoCs
      
      * Set driver type for MMC on r8a7795 (H3) and r8a7796 (M3-W) Salvator-X and
        Salvator-XS boards.
      
        Wolfram Sang says "These boards are known to have eMMC issues with the
        default driver type.  Specify a working one."
      
      * tag 'renesas-arm64-dt-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (54 commits)
        arm64: dts: renesas: r8a77970: use SYSC power domain macros
        arm64: dts: renesas: r8a77970: use CPG core clock macros
        arm64: dts: renesas: v3msk: add EtherAVB support
        arm64: dts: renesas: initial V3MSK board device tree
        arm64: dts: renesas: r8a77995: Connect Ethernet-AVB to IPMMU-RT
        arm64: dts: renesas: r8a77995: Add IPMMU device nodes
        arm64: dts: renesas: r8a77970: Enable IPMMU-DS1, RT and MM
        arm64: dts: renesas: r8a77970: Connect Ethernet-AVB to IPMMU-RT
        arm64: dts: renesas: r8a77970: Tie SYS-DMAC to IPMMU-DS1
        arm64: dts: renesas: r8a77970: Add IPMMU device nodes
        arm64: dts: renesas: r8a77995: add DMA for SCIF2
        arm64: dts: renesas: r8a77970: sort includes
        arm64: dts: renesas: r8a7795: Increase the number of GPIO bank 1 ports to 29
        arm64: dts: renesas: r8a77995: Add CAN FD support
        arm64: dts: renesas: r8a77995: Add CAN support
        arm64: dts: renesas: r8a77995: Add CAN external clock support
        arm64: dts: renesas: r8a7795-salvator-xs: Add SoC name to file header
        arm64: dts: renesas: r8a7796-salvator-x: Add SoC name to file header
        arm64: dts: renesas: r8a7795-salvator-x: Add SoC name to file header
        arm64: dts: renesas: r8a7795-es1-salvator-x: Add SoC name to file header
        ...
      7d44cc20
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-for-v4.16' of... · 2c252917
      Arnd Bergmann authored
      Merge tag 'renesas-dt-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Pull "Renesas ARM Based SoC DT Updates for v4.16" from Simon Horman:
      
      * Convert to named i2c-gpio bindings
      
        Geert Uytterhoeven says "Commits 7d29f509 ("dt-bindings: i2c:
        i2c-gpio: Add support for named gpios") and 05c74778 ("i2c: gpio:
        Add support for named gpios in DT") introduced named i2c-gpio DT
        bindings, and deprecated the more error-prone unnamed variant.
      
        This patch series switches all Renesas boards to the new bindings, and
        adds the missing GPIO_OPEN_DRAIN I/O flags, which were implicitly
        assumed before..."
      
        ...  Note that after this series is applied, the i2c-gpio buses are no
        longer detected when booting new DTBs on old (v4.14 and older) kernels,
        which should not be an issue.  Booting old DTBs on new kernels is not
        affected."
      
      * Update DTS for CMT DT binding rework
      
        Geert Uytterhoeven says "This patch series updates the CMT device nodes
        in the various Renesas DTS files sh_cmt clocksource driver for the recent
        DT binding rework that was merged in v4.14-rc1 and v4.15-rc1..."
      
      * Add SMP support to r8a7794 (R-Car E2) SoC
      
        Sergei Shtylyov says "Add the device tree node for the Advanced Power
        Management Unit (APMU).  Use the "enable-method" prop to  point out that
        the APMU should be used for the SMP support."
      
      * Correct primary compatible value for eeprom
        on r7s72100 (RZ/A1H) genmai and r8a7791 (R-Car M2-W) koelsh boards
      
        Geert Uytterhoeven says "The Renesas part numbers of the two-wire serial
        interface EEPROMs do not follow the 24Cxx pattern, but the R1EX24xxx
        pattern.
      
        Hence change the primary compatible values to the appropriate variant of
        "renesas,r1ex24xxx", like is already done on Gose.""
      
      * Move cec_clock to root node on r8a7791 (R-Car M2-W) koelsh board
        r8a7791 (R-Car M2-W) koelsh board
      
      * Use R-Car SDHI and Ether Gen1 and 2 fallback compat strings
      
        Use recently posted R-Car SDHI and Ether Gen 1 and 2 fallback
        compat strings in the DT of Renesas ARM based SoCs.
      
      * Add IIC cores to dtsi of r8a7745 (RZ/G1E) SoC
      
      * Rework DT architecture for r8a7745 (RZ/G1E) iW-RainboW-G22D development
        platform and add serial support.
      
        Fabrizio Castro says "... define a new DT architecture for the
        iW-RainboW-G22D SODIMM Development Platform to include the configuration
        with the HDMI daughter board and to define the serial interfaces."
      
      * Add USB function support to
        r8a7745 (RZ/G1E) iW-RainboW-G22D development platform
      
      * Add PCIEC and ttySC3 support to r8a7743 (RZ/G1M) iW-RainboW-G20M-Qseven SoM
      
      * Add VIN support to r8a7743 (RZ/G1M) and r8a7745 (RZ/G1E) SoCs
      
      * Add CAN and HDMI support to r8a7743 (RZ/G1M) iW-RainboW-G20D-Qseven and
        r8a7745 (RZ/G1E) iW-RainboW-G22D development platforms
      
      * tag 'renesas-dt-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (61 commits)
        ARM: dts: alt: Convert to named i2c-gpio bindings
        ARM: dts: koelsch: Convert to named i2c-gpio bindings
        ARM: dts: lager: Convert to named i2c-gpio bindings
        ARM: dts: armadillo800eva: Convert to named i2c-gpio bindings
        ARM: dts: sh73a0: Remove CMT renesas,channels-mask
        ARM: dts: r8a7794: Remove CMT renesas,channels-mask
        ARM: dts: r8a7793: Remove CMT renesas,channels-mask
        ARM: dts: r8a7791: Remove CMT renesas,channels-mask
        ARM: dts: r8a7790: Remove CMT renesas,channels-mask
        ARM: dts: r8a7740: Remove CMT renesas,channels-mask
        ARM: dts: r8a73a4: Remove CMT renesas,channels-mask
        ARM: dts: r8a7794: Update CMT compat strings
        ARM: dts: r8a7793: Update CMT compat strings
        ARM: dts: r8a7791: Update CMT compat strings
        ARM: dts: r8a7790: Update CMT compat strings
        ARM: dts: r8a73a4: Update CMT compat string
        ARM: dts: r8a7794: Add SMP support
        ARM: dts: genmai: Correct primary compatible value for eeprom
        ARM: dts: koelsch: Correct primary compatible value for eeprom
        ARM: dts: r8a7745: add VIN dt support
        ...
      2c252917
    • Arnd Bergmann's avatar
      Merge tag 'renesas-dt-bindings-for-v4.16' of... · 74f256a5
      Arnd Bergmann authored
      Merge tag 'renesas-dt-bindings-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Pull "Renesas ARM Based SoC DT Bindings Updates for v4.16" from Simon Horman:
      
      * Document V3MSK board bindings
      
        These are the bindings for the R-Car V3M Starter Kit
      
      * Document M3-W-based Salvator-XS board bingigns
      
        Geert Uytterhoeven says "The Renesas Salvator-XS (Salvator-X 2nd version)
        development board can be equipped with either an R-Car H3 ES2.0 or M3-W
        ES1.x SiP, which are pin-compatible."
      
      * tag 'renesas-dt-bindings-for-v4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        arm64: renesas: document V3MSK board bindings
        ARM: shmobile: Document Renesas M3-W-based Salvator-XS board DT bindings
      74f256a5
    • Amit Kucheria's avatar
    • Amit Kucheria's avatar
    • Amit Kucheria's avatar
    • Masahiro Yamada's avatar
      ARM: make ARCH_S3C24XX select USE_OF and clean-up boot/dts/Makefile · ea04d6b4
      Masahiro Yamada authored
      ARCH_S3C24XX is a very exceptional platform that some DT files in
      arch/arm/boot/dts/, but does not select USE_OF.
      
      All the other platforms with DT files correctly select USE_OF
      directly or indirectly (Most of them are either ARCH_MULTIPLATFORM
      or ARM_SINGLE_ARMV7M).
      
      With ARCH_S3C24XX fixed, "ifeq ($(CONFIG_OF),y)" in DT Makefile
      can be deleted.
      Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      ea04d6b4
    • Javier Martinez Canillas's avatar
      ARM: dts: socfpga: Add generic compatible string for I2C EEPROM · c3aed3f6
      Javier Martinez Canillas authored
      The at24 driver allows to register I2C EEPROM chips using different vendor
      and devices, but the I2C subsystem does not take the vendor into account
      when matching using the I2C table since it only has device entries.
      
      But when matching using an OF table, both the vendor and device has to be
      taken into account so the driver defines only a set of compatible strings
      using the "atmel" vendor as a generic fallback for compatible I2C devices.
      
      So add this generic fallback to the device node compatible string to make
      the device to match the driver using the OF device ID table.
      Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      c3aed3f6
    • Javier Martinez Canillas's avatar
      ARM: dts: lpc18xx: Add generic compatible string for I2C EEPROM · 22c75545
      Javier Martinez Canillas authored
      The at24 driver allows to register I2C EEPROM chips using different vendor
      and devices, but the I2C subsystem does not take the vendor into account
      when matching using the I2C table since it only has device entries.
      
      But when matching using an OF table, both the vendor and device has to be
      taken into account so the driver defines only a set of compatible strings
      using the "atmel" vendor as a generic fallback for compatible I2C devices.
      
      So add this generic fallback to the device node compatible string to make
      the device to match the driver using the OF device ID table.
      Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      22c75545
    • Javier Martinez Canillas's avatar
      ARM: dts: efm32: Add generic compatible string for I2C EEPROM · d360ebaf
      Javier Martinez Canillas authored
      The at24 driver allows to register I2C EEPROM chips using different vendor
      and devices, but the I2C subsystem does not take the vendor into account
      when matching using the I2C table since it only has device entries.
      
      But when matching using an OF table, both the vendor and device has to be
      taken into account so the driver defines only a set of compatible strings
      using the "atmel" vendor as a generic fallback for compatible I2C devices.
      
      So add this generic fallback to the device node compatible string to make
      the device to match the driver using the OF device ID table.
      Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      d360ebaf
  2. 18 Dec, 2017 1 commit
  3. 17 Dec, 2017 20 commits
  4. 16 Dec, 2017 4 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · f3b5ad89
      Linus Torvalds authored
      Pull rdma fixes from Jason Gunthorpe:
       "More fixes from testing done on the rc kernel, including more SELinux
        testing. Looking forward, lockdep found regression today in ipoib
        which is still being fixed.
      
        Summary:
      
         - Fix for SELinux on the umad SMI path. Some old hardware does not
           fill the PKey properly exposing another bug in the newer SELinux
           code.
      
         - Check the input port as we can exceed array bounds from this user
           supplied value
      
         - Users are unable to use the hash field support as they want due to
           incorrect checks on the field restrictions, correct that so the
           feature works as intended
      
         - User triggerable oops in the NETLINK_RDMA handler
      
         - cxgb4 driver fix for a bad interaction with CQ flushing in iser
           caused by patches in this merge window, and bad CQ flushing during
           normal close.
      
         - Unbalanced memalloc_noio in ipoib in an error path"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
        IB/ipoib: Restore MM behavior in case of tx_ring allocation failure
        iw_cxgb4: only insert drain cqes if wq is flushed
        iw_cxgb4: only clear the ARMED bit if a notification is needed
        RDMA/netlink: Fix general protection fault
        IB/mlx4: Fix RSS hash fields restrictions
        IB/core: Don't enforce PKey security on SMI MADs
        IB/core: Bound check alternate path port number
      f3b5ad89
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · f25e2295
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Two bugfixes for the AT24 I2C eeprom driver and some minor corrections
        for I2C bus drivers"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: piix4: Fix port number check on release
        i2c: stm32: Fix copyrights
        i2c-cht-wc: constify platform_device_id
        eeprom: at24: change nvmem stride to 1
        eeprom: at24: fix I2C device selection for runtime PM
      f25e2295
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.15-3' of git://git.linux-nfs.org/projects/anna/linux-nfs · d025fbf1
      Linus Torvalds authored
      Pull NFS client fixes from Anna Schumaker:
       "This has two stable bugfixes, one to fix a BUG_ON() when
        nfs_commit_inode() is called with no outstanding commit requests and
        another to fix a race in the SUNRPC receive codepath.
      
        Additionally, there are also fixes for an NFS client deadlock and an
        xprtrdma performance regression.
      
        Summary:
      
        Stable bugfixes:
         - NFS: Avoid a BUG_ON() in nfs_commit_inode() by not waiting for a
           commit in the case that there were no commit requests.
         - SUNRPC: Fix a race in the receive code path
      
        Other fixes:
         - NFS: Fix a deadlock in nfs client initialization
         - xprtrdma: Fix a performance regression for small IOs"
      
      * tag 'nfs-for-4.15-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        SUNRPC: Fix a race in the receive code path
        nfs: don't wait on commit in nfs_commit_inode() if there were no commit requests
        xprtrdma: Spread reply processing over more CPUs
        nfs: fix a deadlock in nfs client initialization
      d025fbf1
    • Linus Torvalds's avatar
      Revert "mm: replace p??_write with pte_access_permitted in fault + gup paths" · f6f37321
      Linus Torvalds authored
      This reverts commits 5c9d2d5c, c7da82b8, and e7fe7b5c.
      
      We'll probably need to revisit this, but basically we should not
      complicate the get_user_pages_fast() case, and checking the actual page
      table protection key bits will require more care anyway, since the
      protection keys depend on the exact state of the VM in question.
      
      Particularly when doing a "remote" page lookup (ie in somebody elses VM,
      not your own), you need to be much more careful than this was.  Dave
      Hansen says:
      
       "So, the underlying bug here is that we now a get_user_pages_remote()
        and then go ahead and do the p*_access_permitted() checks against the
        current PKRU. This was introduced recently with the addition of the
        new p??_access_permitted() calls.
      
        We have checks in the VMA path for the "remote" gups and we avoid
        consulting PKRU for them. This got missed in the pkeys selftests
        because I did a ptrace read, but not a *write*. I also didn't
        explicitly test it against something where a COW needed to be done"
      
      It's also not entirely clear that it makes sense to check the protection
      key bits at this level at all.  But one possible eventual solution is to
      make the get_user_pages_fast() case just abort if it sees protection key
      bits set, which makes us fall back to the regular get_user_pages() case,
      which then has a vma and can do the check there if we want to.
      
      We'll see.
      
      Somewhat related to this all: what we _do_ want to do some day is to
      check the PAGE_USER bit - it should obviously always be set for user
      pages, but it would be a good check to have back.  Because we have no
      generic way to test for it, we lost it as part of moving over from the
      architecture-specific x86 GUP implementation to the generic one in
      commit e585513b ("x86/mm/gup: Switch GUP to the generic
      get_user_page_fast() implementation").
      
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Dan Williams <dan.j.williams@intel.com>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: "Jérôme Glisse" <jglisse@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f6f37321
  5. 15 Dec, 2017 2 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 7a3c296a
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Clamp timeouts to INT_MAX in conntrack, from Jay Elliot.
      
       2) Fix broken UAPI for BPF_PROG_TYPE_PERF_EVENT, from Hendrik
          Brueckner.
      
       3) Fix locking in ieee80211_sta_tear_down_BA_sessions, from Johannes
          Berg.
      
       4) Add missing barriers to ptr_ring, from Michael S. Tsirkin.
      
       5) Don't advertise gigabit in sh_eth when not available, from Thomas
          Petazzoni.
      
       6) Check network namespace when delivering to netlink taps, from Kevin
          Cernekee.
      
       7) Kill a race in raw_sendmsg(), from Mohamed Ghannam.
      
       8) Use correct address in TCP md5 lookups when replying to an incoming
          segment, from Christoph Paasch.
      
       9) Add schedule points to BPF map alloc/free, from Eric Dumazet.
      
      10) Don't allow silly mtu values to be used in ipv4/ipv6 multicast, also
          from Eric Dumazet.
      
      11) Fix SKB leak in tipc, from Jon Maloy.
      
      12) Disable MAC learning on OVS ports of mlxsw, from Yuval Mintz.
      
      13) SKB leak fix in skB_complete_tx_timestamp(), from Willem de Bruijn.
      
      14) Add some new qmi_wwan device IDs, from Daniele Palmas.
      
      15) Fix static key imbalance in ingress qdisc, from Jiri Pirko.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (76 commits)
        net: qcom/emac: Reduce timeout for mdio read/write
        net: sched: fix static key imbalance in case of ingress/clsact_init error
        net: sched: fix clsact init error path
        ip_gre: fix wrong return value of erspan_rcv
        net: usb: qmi_wwan: add Telit ME910 PID 0x1101 support
        pkt_sched: Remove TC_RED_OFFLOADED from uapi
        net: sched: Move to new offload indication in RED
        net: sched: Add TCA_HW_OFFLOAD
        net: aquantia: Increment driver version
        net: aquantia: Fix typo in ethtool statistics names
        net: aquantia: Update hw counters on hw init
        net: aquantia: Improve link state and statistics check interval callback
        net: aquantia: Fill in multicast counter in ndev stats from hardware
        net: aquantia: Fill ndev stat couters from hardware
        net: aquantia: Extend stat counters to 64bit values
        net: aquantia: Fix hardware DMA stream overload on large MRRS
        net: aquantia: Fix actual speed capabilities reporting
        sock: free skb in skb_complete_tx_timestamp on error
        s390/qeth: update takeover IPs after configuration change
        s390/qeth: lock IP table while applying takeover changes
        ...
      7a3c296a
    • Linus Torvalds's avatar
      Merge tag 'usb-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · c36c7a7c
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some USB fixes for 4.15-rc4.
      
        There is the usual handful gadget/dwc2/dwc3 fixes as always, for
        reported issues. But the most important things in here is the core fix
        from Alan Stern to resolve a nasty security bug (my first attempt is
        reverted, Alan's was much cleaner), as well as a number of usbip fixes
        from Shuah Khan to resolve those reported security issues.
      
        All of these have been in linux-next with no reported issues"
      
      * tag 'usb-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        USB: core: prevent malicious bNumInterfaces overflow
        Revert "USB: core: only clean up what we allocated"
        USB: core: only clean up what we allocated
        Revert "usb: gadget: allow to enable legacy drivers without USB_ETH"
        usb: gadget: webcam: fix V4L2 Kconfig dependency
        usb: dwc2: Fix TxFIFOn sizes and total TxFIFO size issues
        usb: dwc3: gadget: Fix PCM1 for ISOC EP with ep->mult less than 3
        usb: dwc3: of-simple: set dev_pm_ops
        usb: dwc3: of-simple: fix missing clk_disable_unprepare
        usb: dwc3: gadget: Wait longer for controller to end command processing
        usb: xhci: fix TDS for MTK xHCI1.1
        xhci: Don't add a virt_dev to the devs array before it's fully allocated
        usbip: fix stub_send_ret_submit() vulnerability to null transfer_buffer
        usbip: prevent vhci_hcd driver from leaking a socket pointer address
        usbip: fix stub_rx: harden CMD_SUBMIT path to handle malicious input
        usbip: fix stub_rx: get_pipe() to validate endpoint number
        tools/usbip: fixes potential (minor) "buffer overflow" (detected on recent gcc with -Werror)
        USB: uas and storage: Add US_FL_BROKEN_FUA for another JMicron JMS567 ID
        usb: musb: da8xx: fix babble condition handling
      c36c7a7c