Skip to content
Permalink
Tree: 9a33b36996
Commits on Apr 9, 2019
  1. vhost, kcov: annotate vhost_worker

    xairy committed Jan 17, 2019
    Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
  2. usb, kcov: annotate hub_event

    xairy committed Jan 17, 2019
    Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
  3. kcov: remote coverage support

    xairy committed Jan 17, 2019
    Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
  4. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

    torvalds committed Apr 9, 2019
    Pull networking fixes from David Miller:
    
     1) Off by one and bounds checking fixes in NFC, from Dan Carpenter.
    
     2) There have been many weird regressions in r8169 since we turned ASPM
        support on, some are still not understood nor completely resolved.
        Let's turn this back off for now. From Heiner Kallweit.
    
     3) Signess fixes for ethtool speed value handling, from Michael
        Zhivich.
    
     4) Handle timestamps properly in macb driver, from Paul Thomas.
    
     5) Two erspan fixes, it's the usual "skb ->data potentially reallocated
        and we're holding a stale protocol header pointer". From Lorenzo
        Bianconi.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
      bnxt_en: Reset device on RX buffer errors.
      bnxt_en: Improve RX consumer index validity check.
      net: macb driver, check for SKBTX_HW_TSTAMP
      qlogic: qlcnic: fix use of SPEED_UNKNOWN ethtool constant
      broadcom: tg3: fix use of SPEED_UNKNOWN ethtool constant
      ethtool: avoid signed-unsigned comparison in ethtool_validate_speed()
      net: ip6_gre: fix possible use-after-free in ip6erspan_rcv
      net: ip_gre: fix possible use-after-free in erspan_rcv
      r8169: disable ASPM again
      MAINTAINERS: ieee802154: update documentation file pattern
      net: vrf: Fix ping failed when vrf mtu is set to 0
      selftests: add a tc matchall test case
      nfc: nci: Potential off by one in ->pipes[] array
      NFC: nci: Add some bounds checking in nci_hci_cmd_received()
  5. Merge branch 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds committed Apr 9, 2019
    …l/git/jmorris/linux-security
    
    Pull TPM fixes from James Morris:
     "From Jarkko: These are critical fixes for v5.1. Contains also couple
      of new selftests for v5.1 features (partial reads in /dev/tpm0)"
    
    * 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      selftests/tpm2: Open tpm dev in unbuffered mode
      selftests/tpm2: Extend tests to cover partial reads
      KEYS: trusted: fix -Wvarags warning
      tpm: Fix the type of the return value in calc_tpm2_event_size()
      KEYS: trusted: allow trusted.ko to initialize w/o a TPM
      tpm: fix an invalid condition in tpm_common_poll
      tpm: turn on TPM on suspend for TPM 1.x
  6. Merge tag 'xtensa-20190408' of git://github.com/jcmvbkbc/linux-xtensa

    torvalds committed Apr 9, 2019
    Pull xtensa fixes from Max Filippov:
    
     - fix syscall number passed to trace_sys_exit
    
     - fix syscall number initialization in start_thread
    
     - fix level interpretation in the return_address
    
     - fix format string warning in init_pmd
    
    * tag 'xtensa-20190408' of git://github.com/jcmvbkbc/linux-xtensa:
      xtensa: fix format string warning in init_pmd
      xtensa: fix return_address
      xtensa: fix initialization of pt_regs::syscall in start_thread
      xtensa: use actual syscall number in do_syscall_trace_leave
Commits on Apr 8, 2019
  1. Merge branch 'bnxt_en-fixes'

    davem330 committed Apr 8, 2019
    Michael Chan says:
    
    ====================
    bnxt_en: 2 bug fixes.
    
    The first patch prevents possible driver crash if we get a bad RX index
    from the hardware.  The second patch resets the device when the hardware
    reports buffer error to recover from the error.
    
    Please queue these for -stable also.  Thanks.
    ====================
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. bnxt_en: Reset device on RX buffer errors.

    Michael Chan authored and davem330 committed Apr 8, 2019
    If the RX completion indicates RX buffers errors, the RX ring will be
    disabled by firmware and no packets will be received on that ring from
    that point on.  Recover by resetting the device.
    
    Fixes: c0c050c ("bnxt_en: New Broadcom ethernet driver.")
    Signed-off-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. bnxt_en: Improve RX consumer index validity check.

    Michael Chan authored and davem330 committed Apr 8, 2019
    There is logic to check that the RX/TPA consumer index is the expected
    index to work around a hardware problem.  However, the potentially bad
    consumer index is first used to index into an array to reference an entry.
    This can potentially crash if the bad consumer index is beyond legal
    range.  Improve the logic to use the consumer index for dereferencing
    after the validity check and log an error message.
    
    Fixes: fa7e281 ("bnxt_en: Add workaround to detect bad opaque in rx completion (part 2)")
    Signed-off-by: Michael Chan <michael.chan@broadcom.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. net: macb driver, check for SKBTX_HW_TSTAMP

    pthomas authored and davem330 committed Apr 8, 2019
    Make sure SKBTX_HW_TSTAMP (i.e. SOF_TIMESTAMPING_TX_HARDWARE) has been
    enabled for this skb. It does fix the issue where normal socks that
    aren't expecting a timestamp will not wake up on select, but when a
    user does want a SOF_TIMESTAMPING_TX_HARDWARE it does work.
    
    Signed-off-by: Paul Thomas <pthomas8589@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. Merge branch 'ethtool-fix-use-of-SPEED_UNKNOWN-constant'

    davem330 committed Apr 8, 2019
    Michael Zhivich says:
    
    ====================
    ethtool: fix use of SPEED_UNKNOWN constant
    
    This patch series addresses 2 related issues:
    
    1. ethtool_validate_speed() triggers a "signed-unsigned comparison"
    warning due to type difference of SPEED_UNKNOWN constant (int)
    and argument to ethtool_validate_speed (__u32).
    
    2. some drivers use u16 storage for SPEED_UNKNOWN constant,
    resulting in value truncation and thus failure to test against
    SPEED_UNKNOWN correctly.
    
    This revised series addresses several feedback comments:
    - split up the patch in to series
    - do not unnecessarily change drivers that use "int" storage
      for speed values
    ====================
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. qlogic: qlcnic: fix use of SPEED_UNKNOWN ethtool constant

    Michael Zhivich authored and davem330 committed Apr 8, 2019
    qlcnic driver uses u16 to store SPEED_UKNOWN ethtool constant,
    which is defined as -1, resulting in value truncation and
    thus incorrect test results against SPEED_UNKNOWN.
    
    For example, the following test will print "False":
    
        u16 speed = SPEED_UNKNOWN;
    
        if (speed == SPEED_UNKNOWN)
            printf("True");
        else
            printf("False");
    
    Change storage of speed to use u32 to avoid this issue.
    
    Signed-off-by: Michael Zhivich <mzhivich@akamai.com>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  7. broadcom: tg3: fix use of SPEED_UNKNOWN ethtool constant

    Michael Zhivich authored and davem330 committed Apr 8, 2019
    tg3 driver uses u16 to store SPEED_UKNOWN ethtool constant,
    which is defined as -1, resulting in value truncation and
    thus incorrect test results against SPEED_UNKNOWN.
    
    For example, the following test will print "False":
    
    	u16 speed = SPEED_UNKNOWN;
    
    	if (speed == SPEED_UNKNOWN)
    	    printf("True");
    	else
    	    printf("False");
    
    Change storage of speed to use u32 to avoid this issue.
    
    Signed-off-by: Michael Zhivich <mzhivich@akamai.com>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  8. ethtool: avoid signed-unsigned comparison in ethtool_validate_speed()

    Michael Zhivich authored and davem330 committed Apr 8, 2019
    When building C++ userspace code that includes ethtool.h
    with "-Werror -Wall", g++ complains about signed-unsigned comparison in
    ethtool_validate_speed() due to definition of SPEED_UNKNOWN as -1.
    
    Explicitly cast SPEED_UNKNOWN to __u32 to match type of
    ethtool_validate_speed() argument.
    
    Signed-off-by: Michael Zhivich <mzhivich@akamai.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  9. Merge branch 'erspan-use-after-free'

    davem330 committed Apr 8, 2019
    Lorenzo Bianconi says:
    
    ====================
    fix possible use-after-free in erspan_v{4,6}
    
    Similar to what I did in commit bb9bd81 ("ipv6: sit: reset ip
    header pointer in ipip6_rcv"), fix possible use-after-free in
    erspan_rcv and ip6erspan_rcv extracting tunnel metadata since the
    packet can be 'uncloned' running __iptunnel_pull_header
    ====================
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  10. net: ip6_gre: fix possible use-after-free in ip6erspan_rcv

    LorenzoBianconi authored and davem330 committed Apr 6, 2019
    erspan_v6 tunnels run __iptunnel_pull_header on received skbs to remove
    erspan header. This can determine a possible use-after-free accessing
    pkt_md pointer in ip6erspan_rcv since the packet will be 'uncloned'
    running pskb_expand_head if it is a cloned gso skb (e.g if the packet has
    been sent though a veth device). Fix it resetting pkt_md pointer after
    __iptunnel_pull_header
    
    Fixes: 1d7e2ed ("net: erspan: refactor existing erspan code")
    Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  11. net: ip_gre: fix possible use-after-free in erspan_rcv

    LorenzoBianconi authored and davem330 committed Apr 6, 2019
    erspan tunnels run __iptunnel_pull_header on received skbs to remove
    gre and erspan headers. This can determine a possible use-after-free
    accessing pkt_md pointer in erspan_rcv since the packet will be 'uncloned'
    running pskb_expand_head if it is a cloned gso skb (e.g if the packet has
    been sent though a veth device). Fix it resetting pkt_md pointer after
    __iptunnel_pull_header
    
    Fixes: 1d7e2ed ("net: erspan: refactor existing erspan code")
    Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  12. selftests/tpm2: Open tpm dev in unbuffered mode

    tstruk authored and James Morris committed Feb 12, 2019
    In order to have control over how many bytes are read or written
    the device needs to be opened in unbuffered mode.
    
    Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
    Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  13. selftests/tpm2: Extend tests to cover partial reads

    tstruk authored and James Morris committed Feb 12, 2019
    Three new tests added:
    1. Send get random cmd, read header in 1st read, read the rest in second
       read - expect success
    2. Send get random cmd, read only part of the response, send another
       get random command, read the response - expect success
    3. Send get random cmd followed by another get random cmd, without
       reading the first response - expect the second cmd to fail with -EBUSY
    
    Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
    Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  14. KEYS: trusted: fix -Wvarags warning

    nickdesaulniers authored and James Morris committed Oct 22, 2018
    Fixes the warning reported by Clang:
    security/keys/trusted.c:146:17: warning: passing an object that
    undergoes default
          argument promotion to 'va_start' has undefined behavior [-Wvarargs]
            va_start(argp, h3);
                           ^
    security/keys/trusted.c:126:37: note: parameter of type 'unsigned
    char' is declared here
    unsigned char *h2, unsigned char h3, ...)
                                   ^
    Specifically, it seems that both the C90 (4.8.1.1) and C11 (7.16.1.4)
    standards explicitly call this out as undefined behavior:
    
    The parameter parmN is the identifier of the rightmost parameter in
    the variable parameter list in the function definition (the one just
    before the ...). If the parameter parmN is declared with ... or with a
    type that is not compatible with the type that results after
    application of the default argument promotions, the behavior is
    undefined.
    
    Link: ClangBuiltLinux/linux#41
    Link: https://www.eskimo.com/~scs/cclass/int/sx11c.html
    Suggested-by: David Laight <David.Laight@aculab.com>
    Suggested-by: Denis Kenzior <denkenz@gmail.com>
    Suggested-by: James Bottomley <jejb@linux.vnet.ibm.com>
    Suggested-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
    Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
    Tested-by: Nathan Chancellor <natechancellor@gmail.com>
    Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  15. tpm: Fix the type of the return value in calc_tpm2_event_size()

    Yue Haibing James Morris
    Yue Haibing authored and James Morris committed Feb 20, 2019
    calc_tpm2_event_size() has an invalid signature because
    it returns a 'size_t' where as its signature says that
    it returns 'int'.
    
    Cc: <stable@vger.kernel.org>
    Fixes: 4d23cc3 ("tpm: add securityfs support for TPM 2.0 firmware event log")
    Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
    Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  16. KEYS: trusted: allow trusted.ko to initialize w/o a TPM

    jsakkine-intel authored and James Morris committed Mar 25, 2019
    Allow trusted.ko to initialize w/o a TPM. This commit also adds checks
    to the exported functions to fail when a TPM is not available.
    
    Fixes: 2407304 ("KEYS: trusted: explicitly use tpm_chip structure...")
    Cc: James Morris <jmorris@namei.org>
    Reported-by: Dan Williams <dan.j.williams@intel.com>
    Tested-by: Dan Williams <dan.j.williams@intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  17. tpm: fix an invalid condition in tpm_common_poll

    tstruk authored and James Morris committed Mar 27, 2019
    The poll condition should only check response_length,
    because reads should only be issued if there is data to read.
    The response_read flag only prevents double writes.
    The problem was that the write set the response_read to false,
    enqued a tpm job, and returned. Then application called poll
    which checked the response_read flag and returned EPOLLIN.
    Then the application called read, but got nothing.
    After all that the async_work kicked in.
    Added also mutex_lock around the poll check to prevent
    other possible race conditions.
    
    Fixes: 9488585 ("tpm: add support for partial reads")
    Reported-by: Mantas Mikulėnas <grawity@gmail.com>
    Tested-by: Mantas Mikulėnas <grawity@gmail.com>
    Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
    Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  18. tpm: turn on TPM on suspend for TPM 1.x

    jsakkine-intel authored and James Morris committed Mar 22, 2019
    tpm_chip_start/stop() should be also called for TPM 1.x devices on
    suspend. Add that functionality back. Do not lock the chip because
    it is unnecessary as there are no multiple threads using it when
    doing the suspend.
    
    Fixes: a3fbfae ("tpm: take TPM chip power gating out of tpm_transmit()")
    Reported-by: Paul Zimmerman <pauldzim@gmail.com>
    Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
    Tested-by: Domenico Andreoli <domenico.andreoli@linux.com>
    Signed-off-by: James Morris <james.morris@microsoft.com>
  19. r8169: disable ASPM again

    hkallweit authored and davem330 committed Apr 5, 2019
    There's a significant number of reports that re-enabling ASPM causes
    different issues, ranging from decreased performance to system not
    booting at all. This affects only a minority of users, but the number
    of affected users is big enough that we better switch off ASPM again.
    
    This will hurt notebook users who are not affected by the issues, they
    may see decreased battery runtime w/o ASPM. With the PCI core folks is
    being discussed to add generic sysfs attributes to control ASPM.
    Once this is in place brave enough users can re-enable ASPM on their
    system.
    
    Fixes: a99790b ("r8169: Reinstate ASPM Support")
    Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  20. MAINTAINERS: ieee802154: update documentation file pattern

    Stefan-Schmidt authored and davem330 committed Apr 8, 2019
    When moving the documentation for the ieee802154 subsystem from
    plain text to rst the file pattern in the MAINTAINERS file got wrong.
    Updating it here to fix scripts using this file.
    
    Reported-by: Joe Perches <joe@perches.com>
    Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  21. Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git…

    torvalds committed Apr 8, 2019
    …/herbert/crypto-2.6
    
    Pull crypto fix from Herbert Xu:
     "This fixes a bug in the implementation of xcbc and cmac in caam"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
      crypto: caam - fix copy of next buffer for xcbc and cmac
  22. net: vrf: Fix ping failed when vrf mtu is set to 0

    l00478643 authored and davem330 committed Apr 8, 2019
    When the mtu of a vrf device is set to 0, it would cause ping
    failed. So I think we should limit vrf mtu in a reasonable range
    to solve this problem. I set dev->min_mtu to IPV6_MIN_MTU, so it
    will works for both ipv4 and ipv6. And if dev->max_mtu still be 0
    can be confusing, so I set dev->max_mtu to ETH_MAX_MTU.
    
    Here is the reproduce step:
    
    1.Config vrf interface and set mtu to 0:
    3: enp4s0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel
    master vrf1 state UP mode DEFAULT group default qlen 1000
        link/ether 52:54:00:9e:dd:c1 brd ff:ff:ff:ff:ff:ff
    
    2.Ping peer:
    3: enp4s0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel
    master vrf1 state UP group default qlen 1000
        link/ether 52:54:00:9e:dd:c1 brd ff:ff:ff:ff:ff:ff
        inet 10.0.0.1/16 scope global enp4s0
           valid_lft forever preferred_lft forever
    connect: Network is unreachable
    
    3.Set mtu to default value, ping works:
    PING 10.0.0.2 (10.0.0.2) 56(84) bytes of data.
    64 bytes from 10.0.0.2: icmp_seq=1 ttl=64 time=1.88 ms
    
    Fixes: ad49bc6 ("net: vrf: remove MTU limits for vrf device")
    Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
    Reviewed-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  23. slab: fix a crash by reading /proc/slab_allocators

    cailca authored and torvalds committed Apr 6, 2019
    The commit 510ded3 ("slab: implement slab_root_caches list")
    changes the name of the list node within "struct kmem_cache" from "list"
    to "root_caches_node", but leaks_show() still use the "list" which
    causes a crash when reading /proc/slab_allocators.
    
    You need to have CONFIG_SLAB=y and CONFIG_MEMCG=y to see the problem,
    because without MEMCG all slab caches are root caches, and the "list"
    node happens to be the right one.
    
    Fixes: 510ded3 ("slab: implement slab_root_caches list")
    Signed-off-by: Qian Cai <cai@lca.pw>
    Reviewed-by: Tobin C. Harding <tobin@kernel.org>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  24. selftests: add a tc matchall test case

    NicolasDichtel authored and davem330 committed Apr 5, 2019
    This is a follow up of the commit 0db6f8b ("net/sched: fix ->get
    helper of the matchall cls").
    
    To test it:
    $ cd tools/testing/selftests/tc-testing
    $ ln -s ../plugin-lib/nsPlugin.py plugins/20-nsPlugin.py
    $ ./tdc.py -n -e 2638
    
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  25. Linux 5.1-rc4

    torvalds committed Apr 8, 2019
Commits on Apr 7, 2019
  1. Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds committed Apr 7, 2019
    …/git/soc/soc
    
    Pull ARM SoC fixes from Olof Johansson:
     "A collection of fixes from the last few weeks. Most of them are
      smaller tweaks and fixes to DT and hardware descriptions for boards.
      Some of the more significant ones are:
    
       - eMMC and RGMII stability tweaks for rk3288
    
       - DDC fixes for Rock PI 4
    
       - Audio fixes for two TI am335x eval boards
    
       - D_CAN clock fix for am335x
    
       - Compilation fixes for clang
    
       - !HOTPLUG_CPU compilation fix for one of the new platforms this
         release (milbeaut)
    
       - A revert of a gpio fix for nomadik that instead was fixed in the
         gpio subsystem
    
       - Whitespace fix for the DT JSON schema (no tabs allowed)"
    
    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (25 commits)
      ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU
      ARM: iop: don't use using 64-bit DMA masks
      ARM: orion: don't use using 64-bit DMA masks
      Revert "ARM: dts: nomadik: Fix polarity of SPI CS"
      dt-bindings: cpu: Fix JSON schema
      arm/mach-at91/pm : fix possible object reference leak
      ARM: dts: at91: Fix typo in ISC_D0 on PC9
      ARM: dts: Fix dcan clkctrl clock for am3
      reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev
      dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets
      ARM: dts: rockchip: Remove #address/#size-cells from rk3288-veyron gpio-keys
      ARM: dts: rockchip: Remove #address/#size-cells from rk3288 mipi_dsi
      ARM: dts: rockchip: Fix gpu opp node names for rk3288
      ARM: dts: am335x-evmsk: Correct the regulators for the audio codec
      ARM: dts: am335x-evm: Correct the regulators for the audio codec
      ARM: OMAP2+: add missing of_node_put after of_device_is_available
      ARM: OMAP1: ams-delta: Fix broken GPIO ID allocation
      arm64: dts: stratix10: add the sysmgr-syscon property from the gmac's
      arm64: dts: rockchip: fix rk3328 sdmmc0 write errors
      arm64: dts: rockchip: fix rk3328 rgmii high tx error rate
      ...
  2. Merge tag 'for-linus-20190407' of git://git.kernel.dk/linux-block

    torvalds committed Apr 7, 2019
    Pull block fixes from Jens Axboe:
    
     - Fixups for the pf/pcd queue handling (YueHaibing)
    
     - Revert of the three direct issue changes as they have been proven to
       cause an issue with dm-mpath (Bart)
    
     - Plug rq_count reset fix (Dongli)
    
     - io_uring double free in fileset registration error handling (me)
    
     - Make null_blk handle bad numa node passed in (John)
    
     - BFQ ifdef fix (Konstantin)
    
     - Flush queue leak fix (Shenghui)
    
     - Plug trace fix (Yufen)
    
    * tag 'for-linus-20190407' of git://git.kernel.dk/linux-block:
      xsysace: Fix error handling in ace_setup
      null_blk: prevent crash from bad home_node value
      block: Revert v5.0 blk_mq_request_issue_directly() changes
      paride/pcd: Fix potential NULL pointer dereference and mem leak
      blk-mq: do not reset plug->rq_count before the list is sorted
      paride/pf: Fix potential NULL pointer dereference
      io_uring: fix double free in case of fileset regitration failure
      blk-mq: add trace block plug and unplug for multiple queues
      block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
      block/bfq: fix ifdef for CONFIG_BFQ_GROUP_IOSCHED=y
  3. ARM: milbeaut: fix build with !CONFIG_HOTPLUG_CPU

    arndb authored and olofj committed Mar 13, 2019
    When HOTPLUG_CPU is disabled, some fields in the smp operations
    are not available or needed:
    
    arch/arm/mach-milbeaut/platsmp.c:90:3: error: field designator 'cpu_die' does not refer to any field in type
          'struct smp_operations'
            .cpu_die                = m10v_cpu_die,
             ^
    arch/arm/mach-milbeaut/platsmp.c:91:3: error: field designator 'cpu_kill' does not refer to any field in type
          'struct smp_operations'
            .cpu_kill               = m10v_cpu_kill,
             ^
    
    Hide them in an #ifdef like the other platforms do.
    
    Fixes: 9fb29c7 ("ARM: milbeaut: Add basic support for Milbeaut m10v SoC")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Olof Johansson <olof@lixom.net>
Older
You can’t perform that action at this time.