Skip to content
  1. May 22, 2018
  2. May 21, 2018
    • Linus Torvalds's avatar
      Merge tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 6741c4bb
      Linus Torvalds authored
      Pull MIPS fixes from James Hogan:
      
       - fix build with DEBUG_ZBOOT and MACH_JZ4770 (4.16)
      
       - include xilfpga FDT in fitImage and stop generating dtb.o (4.15)
      
       - fix software IO coherence on CM SMP systems (4.8)
      
       - ptrace: Fix PEEKUSR/POKEUSR to o32 FGRs (3.14)
      
       - ptrace: Expose FIR register through FP regset (3.13)
      
       - fix typo in KVM debugfs file name (3.10)
      
      * tag 'mips_fixes_4.17_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
        MIPS: Fix ptrace(2) PTRACE_PEEKUSR and PTRACE_POKEUSR accesses to o32 FGRs
        MIPS: xilfpga: Actually include FDT in fitImage
        MIPS: xilfpga: Stop generating useless dtb.o
        KVM: Fix spelling mistake: "cop_unsuable" -> "cop_unusable"
        MIPS: ptrace: Expose FIR register through FP regset
        MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
        MIPS: c-r4k: Fix data corruption related to cache coherence
      6741c4bb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 5aef268a
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix refcounting bug for connections in on-packet scheduling mode of
          IPVS, from Julian Anastasov.
      
       2) Set network header properly in AF_PACKET's packet_snd, from Willem
          de Bruijn.
      
       3) Fix regressions in 3c59x by converting to generic DMA API. It was
          relying upon the hack that the PCI DMA interfaces would accept NULL
          for EISA devices. From Christoph Hellwig.
      
       4) Remove RDMA devices before unregistering netdev in QEDE driver, from
          Michal Kalderon.
      
       5) Use after free in TUN driver ptr_ring usage, from Jason Wang.
      
       6) Properly check for missing netlink attributes in SMC_PNETID
          requests, from Eric Biggers.
      
       7) Set DMA mask before performaing any DMA operations in vmxnet3
          driver, from Regis Duchesne.
      
       8) Fix mlx5 build with SMP=n, from Saeed Mahameed.
      
       9) Classifier fixes in bcm_sf2 driver from Florian Fainelli.
      
      10) Tuntap use after free during release, from Jason Wang.
      
      11) Don't use stack memory in scatterlists in tls code, from Matt
          Mullins.
      
      12) Not fully initialized flow key object in ipv4 routing code, from
          David Ahern.
      
      13) Various packet headroom bug fixes in ip6_gre driver, from Petr
          Machata.
      
      14) Remove queues from XPS maps using correct index, from Amritha
          Nambiar.
      
      15) Fix use after free in sock_diag, from Eric Dumazet.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (64 commits)
        net: ip6_gre: fix tunnel metadata device sharing.
        cxgb4: fix offset in collecting TX rate limit info
        net: sched: red: avoid hashing NULL child
        sock_diag: fix use-after-free read in __sk_free
        sh_eth: Change platform check to CONFIG_ARCH_RENESAS
        net: dsa: Do not register devlink for unused ports
        net: Fix a bug in removing queues from XPS map
        bpf: fix truncated jump targets on heavy expansions
        bpf: parse and verdict prog attach may race with bpf map update
        bpf: sockmap update rollback on error can incorrectly dec prog refcnt
        net: test tailroom before appending to linear skb
        net: ip6_gre: Fix ip6erspan hlen calculation
        net: ip6_gre: Split up ip6gre_changelink()
        net: ip6_gre: Split up ip6gre_newlink()
        net: ip6_gre: Split up ip6gre_tnl_change()
        net: ip6_gre: Split up ip6gre_tnl_link_config()
        net: ip6_gre: Fix headroom request in ip6erspan_tunnel_xmit()
        net: ip6_gre: Request headroom in __gre6_xmit()
        selftests/bpf: check return value of fopen in test_verifier.c
        erspan: fix invalid erspan version.
        ...
      5aef268a
    • David S. Miller's avatar
      mv88e6xxx: Fix uninitialized variable warning. · 7ddae24f
      David S. Miller authored
      In mv88e6xxx_probe(), ("np" or "pdata") might be an invariant
      but GCC can't see that, therefore:
      
      drivers/net/dsa/mv88e6xxx/chip.c: In function ‘mv88e6xxx_probe’:
      drivers/net/dsa/mv88e6xxx/chip.c:4420:13: warning: ‘compat_info’ may be used uninitialized in this function [-Wmaybe-uninitialized]
        chip->info = compat_info;
      
      Actually, it should have warned on the "if (!compat_info)" test, but
      whatever.
      
      Explicitly initialize to NULL in the variable declaration to
      deal with this.
      
      Fixes: 877b7cb0
      
       ("net: dsa: mv88e6xxx: Add minimal platform_data support")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7ddae24f
    • Florian Fainelli's avatar
      net: dsa: b53: Extend platform data to include DSA ports · bf3c592b
      Florian Fainelli authored
      
      
      The b53 driver already defines and internally uses platform data to let the
      glue drivers specify parameters such as the chip id.  What we were missing was
      a way to tell the core DSA layer about the ports and their type.
      
      Place a dsa_chip_data structure at the beginning of b53_platform_data for
      dsa_register_switch() to access it. This does not require modifications to
      b53_common.c which will pass platform_data trough.
      
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bf3c592b
    • David S. Miller's avatar
      Merge branch 'mv88exxx-pdata' · bf4bd7a7
      David S. Miller authored
      
      
      Andrew Lunn says:
      
      ====================
      Platform data support for mv88exxx
      
      There are a few Intel based platforms making use of the mv88exxx.
      These don't easily have access to device tree in order to instantiate
      the switch driver. These patches allow the use of platform data to
      hold the configuration.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bf4bd7a7
    • Andrew Lunn's avatar
      net: dsa: mv88e6xxx: Add support for EEPROM via platform data · 00baabe5
      Andrew Lunn authored
      
      
      Add the size of the EEPROM to the platform data, so it can also be
      instantiated by a platform device.
      
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      00baabe5
    • Andrew Lunn's avatar
      net: dsa: mv88e6xxx: Add minimal platform_data support · 877b7cb0
      Andrew Lunn authored
      
      
      Not all the world uses device tree. Some parts of the world still use
      platform devices and platform data. Add basic support for probing a
      Marvell switch via platform data.
      
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      877b7cb0
    • Andrew Lunn's avatar
      net: dsa: mv88e6xxx: Remove OF check for IRQ domain · 577941eb
      Andrew Lunn authored
      
      
      An IRQ domain will work without an OF node. It is not possible to
      reference interrupts via a phandle, but C code can still use
      irq_find_mapping() to get an interrupt from the domain.
      
      Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      577941eb
    • David S. Miller's avatar
      Merge branch 'sh_eth-typos' · 81ee33d8
      David S. Miller authored
      
      
      Sergei Shtylyov says:
      
      ====================
      sh_eth: fix typos/grammar
      
      Here's a set of 3 patches against DaveM's 'net-next.git' repo plus the R8A77980
      support patches posted earlier. They fix the comments typos/grammar and another
      typo in the EESR bit...
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      81ee33d8
    • Sergei Shtylyov's avatar
      sh_eth: fix typo in comment to BCULR write · 6b14787a
      Sergei Shtylyov authored
      
      
      Simon has noticed a typo in the comment accompaining the BCULR write --
      fix it and move the comment before the write (following the style of
      the other comments), while at it...
      
      Reported-by: default avatarSimon Horman <horms@verge.net.au>
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6b14787a
    • Sergei Shtylyov's avatar
      sh_eth: fix comment grammar in 'struct sh_eth_cpu_data' · 9c59c9a8
      Sergei Shtylyov authored
      
      
      All the verbs in the comments to the 'struct sh_eth_cpu_data' declaration
      should  be in a  3rd person singular, to match the nouns.
      
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9c59c9a8
    • Sergei Shtylyov's avatar
      sh_eth: fix typo in EESR.TRO bit name · 27164491
      Sergei Shtylyov authored
      
      
      The  correct name of the EESR bit 8 is TRO (transmit retry over), not RTO.
      Note that EESIPR bit 8, TROIP remained correct...
      
      Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      27164491
    • David S. Miller's avatar
      Merge branch 'hns3-next' · 6c8598b7
      David S. Miller authored
      
      
      Salil Mehta says:
      
      ====================
      Misc. bug fixes and cleanup for HNS3 driver
      
      This patch-set presents miscellaneous bug fixes and cleanups found
      during internal review, system testing and cleanup.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6c8598b7
    • Yunsheng Lin's avatar
      net: hns3: Fix for CMDQ and Misc. interrupt init order problem · eddf0462
      Yunsheng Lin authored
      When vf module is loading, the cmd queue initialization should
      happen before misc interrupt initialization, otherwise the misc
      interrupt handle will cause using uninitialized cmd queue problem.
      There is also the same issue when vf module is unloading.
      
      This patch fixes it by adjusting the location of some function.
      
      Fixes: e2cb1dec
      
       ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) Support")
      Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      eddf0462
    • Xi Wang's avatar
      net: hns3: Fixes kernel panic issue during rmmod hns3 driver · 7bb572fd
      Xi Wang authored
      If CONFIG_ARM_SMMU_V3 is enabled, arm64's dma_ops will replace
      arm64_swiotlb_dma_ops with iommu_dma_ops. When releasing contiguous
      dma memory, the new ops will call the vunmap function which cannot
      be run in interrupt context.
      
      Currently, spin_lock_bh is called before vunmap is executed. This
      disables BH and causes the interrupt context to be detected to
      generate a kernel panic like below:
      
      [ 2831.573400] kernel BUG at mm/vmalloc.c:1621!
      [ 2831.577659] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP
      ...
      [ 2831.699907] Process rmmod (pid: 1893, stack limit = 0x0000000055103ee2)
      [ 2831.706507] Call trace:
      [ 2831.708941]  vunmap+0x48/0x50
      [ 2831.711897]  dma_common_free_remap+0x78/0x88
      [ 2831.716155]  __iommu_free_attrs+0xa8/0x1c0
      [ 2831.720255]  hclge_free_cmd_desc+0xc8/0x118 [hclge]
      [ 2831.725128]  hclge_destroy_cmd_queue+0x34/0x68 [hclge]
      [ 2831.730261]  hclge_uninit_ae_dev+0x90/0x100 [hclge]
      [ 2831.735127]  hnae3_unregister_ae_dev+0xb0/0x868 [hnae3]
      [ 2831.740345]  hns3_remove+0x3c/0x90 [hns3]
      [ 2831.744344]  pci_device_remove+0x48/0x108
      [ 2831.748342]  device_release_driver_internal+0x164/0x200
      [ 2831.753553]  driver_detach+0x4c/0x88
      [ 2831.757116]  bus_remove_driver+0x60/0xc0
      [ 2831.761026]  driver_unregister+0x34/0x60
      [ 2831.764935]  pci_unregister_driver+0x30/0xb0
      [ 2831.769197]  hns3_exit_module+0x10/0x978 [hns3]
      [ 2831.773715]  SyS_delete_module+0x1f8/0x248
      [ 2831.777799]  el0_svc_naked+0x30/0x34
      
      This patch fixes it by using spin_lock instead of spin_lock_bh.
      
      Fixes: 68c0a5c7
      
       ("net: hns3: Add HNS3 IMP(Integrated Mgmt Proc) Cmd Interface Support")
      Signed-off-by: default avatarXi Wang <wangxi11@huawei.com>
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7bb572fd
    • Fuyun Liang's avatar
      net: hns3: Fix for netdev not running problem after calling net_stop and net_open · f30dfddc
      Fuyun Liang authored
      The link status update function is called by timer every second. But
      net_stop and net_open may be called with very short intervals. The link
      status update function can not detect the link state has changed. It
      causes the netdev not running problem.
      
      This patch fixes it by updating the link state in ae_stop function.
      
      Fixes: 46a3df9f
      
       ("net: hns3: Add HNS3 Acceleration Engine & Compatibility Layer Support")
      Signed-off-by: default avatarFuyun Liang <liangfuyun1@huawei.com>
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f30dfddc
    • Huazhong Tan's avatar
      net: hns3: Use enums instead of magic number in hclge_is_special_opcode · 42687543
      Huazhong Tan authored
      
      
      This patch does bit of a clean-up by using already defined enums for
      certain values in function hclge_is_special_opcode(). Below enums from
      have been used as replacements for magic values:
      
      enum hclge_opcode_type{
      	<snip>
      	HCLGE_OPC_STATS_64_BIT		= 0x0030,
      	HCLGE_OPC_STATS_32_BIT		= 0x0031,
      	HCLGE_OPC_STATS_MAC		= 0x0032,
      	<snip>
      };
      
      Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      42687543
    • Xi Wang's avatar
      net: hns3: Fix for hns3 module is loaded multiple times problem · 3c7624d8
      Xi Wang authored
      If the hns3 driver has been built into kernel and then loaded with
      the same driver which built as KLM, it may trigger an error like
      below:
      
      [   20.009555] hns3: Hisilicon Ethernet Network Driver for Hip08 Family - version
      [   20.016789] hns3: Copyright (c) 2017 Huawei Corporation.
      [   20.022100] Error: Driver 'hns3' is already registered, aborting...
      [   23.517397] Unable to handle kernel NULL pointer dereference at virtual address 00000000
      ...
      [   23.691583] Process insmod (pid: 1982, stack limit = 0x00000000cd5f21cb)
      [   23.698270] Call trace:
      [   23.700705]  __list_del_entry_valid+0x2c/0xd8
      [   23.705049]  hnae3_unregister_client+0x68/0xa8
      [   23.709487]  hns3_init_module+0x98/0x1000 [hns3]
      [   23.714093]  do_one_initcall+0x5c/0x170
      [   23.717918]  do_init_module+0x64/0x1f4
      [   23.721654]  load_module+0x1d14/0x24b0
      [   23.725390]  SyS_init_module+0x158/0x208
      [   23.729300]  el0_svc_naked+0x30/0x34
      
      This patch fixes it by adding module version info.
      
      Fixes: 38caee9d
      
       ("net: hns3: Add support of the HNAE3 framework")
      Signed-off-by: default avatarXi Wang <wangxi11@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3c7624d8
    • Xi Wang's avatar
      net: hns3: Fix the missing client list node initialization · 13562d1f
      Xi Wang authored
      This patch fixes the missing initialization of the client list node
      in the hnae3_register_client() function.
      
      Fixes: 76ad4f0e
      
       ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")
      Signed-off-by: default avatarXi Wang <wangxi11@huawei.com>
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      13562d1f
    • Jian Shen's avatar
      net: hns3: cleanup of return values in hclge_init_client_instance() · 99a6993a
      Jian Shen authored
      
      
      Removes the goto and directly returns in case of errors as part of the
      cleanup.
      
      Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      99a6993a
    • Peng Li's avatar
      net: hns3: Fixes API to fetch ethernet header length with kernel default · e63cd65f
      Peng Li authored
      During the RX leg driver needs to fetch the ethernet header
      length from the RX'ed Buffer Descriptor. Currently, proprietary
      version hns3_nic_get_headlen is being used to fetch the header
      length which uses l234info present in the Buffer Descriptor
      which might not be valid for the first Buffer Descriptor if the
      packet is spanning across multiple descriptors.
      Kernel default eth_get_headlen API does the job correctly.
      
      Fixes: 76ad4f0e
      
       ("net: hns3: Add support of HNS3 Ethernet Driver for hip08 SoC")
      Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
      Reviewed-by: default avatarYisen Zhuang <yisen.zhuang@huawei.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e63cd65f
    • Salil Mehta's avatar
      net: hns3: Fixes error reported by Kbuild and internal review · 743e1a84
      Salil Mehta authored
      
      
      This patch fixes the error reported by Intel's kbuild and fixes a
      return value in one of the legs, caught during review of the original
      patch sent by kbuild.
      
      Fixes: fdb793670a00 ("net: hns3: Add support of .sriov_configure in HNS3 driver")
      Signed-off-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarSalil Mehta <salil.mehta@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      743e1a84
    • Heiner Kallweit's avatar
      r8169: fix network error on resume from suspend · 52f8560e
      Heiner Kallweit authored
      
      
      This commit removed calls to rtl_set_rx_mode(). This is ok for the
      standard path if the link is brought up, however it breaks system
      resume from suspend. Link comes up but no network traffic.
      
      Meanwhile common code from rtl_hw_start_8169/8101/8168() was moved
      to rtl_hw_start(), therefore re-add the call to rtl_set_rx_mode()
      there.
      
      Due to adding this call we have to move definition of rtl_hw_start()
      after definition of rtl_set_rx_mode().
      
      Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
      Fixes: 82d3ff6d
      
       ("r8169: remove calls to rtl_set_rx_mode")
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      52f8560e
    • William Tu's avatar
      erspan: set bso bit based on mirrored packet's len · d48f1958
      William Tu authored
      
      
      Before the patch, the erspan BSO bit (Bad/Short/Oversized) is not
      handled.  BSO has 4 possible values:
        00 --> Good frame with no error, or unknown integrity
        11 --> Payload is a Bad Frame with CRC or Alignment Error
        01 --> Payload is a Short Frame
        10 --> Payload is an Oversized Frame
      
      Based the short/oversized definitions in RFC1757, the patch sets
      the bso bit based on the mirrored packet's size.
      
      Reported-by: default avatarXiaoyan Jin <xiaoyanj@vmware.com>
      Signed-off-by: default avatarWilliam Tu <u9012063@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d48f1958
    • Linus Torvalds's avatar
      Linux 4.17-rc6 · 771c577c
      Linus Torvalds authored
      v4.17-rc6
      771c577c
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 2c71ab4b
      David S. Miller authored
      
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2018-05-18
      
      Here's the first bluetooth-next pull request for the 4.18 kernel:
      
       - Refactoring of the btbcm driver
       - New USB IDs for QCA_ROME and LiteOn controllers
       - Buffer overflow fix if the controller sends invalid advertising data length
       - Various cleanups & fixes for Qualcomm controllers
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2c71ab4b
    • Jeff Kirsher's avatar
      Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()" · f0b99e3a
      Jeff Kirsher authored
      This reverts commit 6710f970
      
      .
      
      Gotta love when developers have offline discussions, thinking everyone
      is reading their responses/dialog.
      
      The change had the potential for a number of race conditions on
      shutdown, which is why we are reverting the change.
      
      Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f0b99e3a
    • Hemanth Puranik's avatar
      net: qcom/emac: Allocate buffers from local node · 1bc49fd1
      Hemanth Puranik authored
      
      
      Currently we use non-NUMA aware allocation for TPD and RRD buffers,
      this patch modifies to use NUMA friendly allocation.
      
      Signed-off-by: default avatarHemanth Puranik <hpuranik@codeaurora.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1bc49fd1
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 6fd5a36a
      Linus Torvalds authored
      Pull parisc fixlets from Helge Deller:
       "Three small section mismatch fixes, one of them was found by 0-day
        test infrastructure"
      
      * 'parisc-4.17-5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Move ccio_cujo20_fixup() into init section
        parisc: Move setup_profiling_timer() out of init section
        parisc: Move find_pa_parent_type() out of init section
      6fd5a36a
    • Linus Torvalds's avatar
      Merge tag 'for-4.17-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · e5e03ad9
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "We've accumulated some fixes during the last week, some of them were
        in the works for a longer time but there are some newer ones too.
      
        Most of the fixes have a reproducer and fix user visible problems,
        also candidates for stable kernels. They IMHO qualify for a late rc,
        though I did not expect that many"
      
      * tag 'for-4.17-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: fix crash when trying to resume balance without the resume flag
        btrfs: Fix delalloc inodes invalidation during transaction abort
        btrfs: Split btrfs_del_delalloc_inode into 2 functions
        btrfs: fix reading stale metadata blocks after degraded raid1 mounts
        btrfs: property: Set incompat flag if lzo/zstd compression is set
        Btrfs: fix duplicate extents after fsync of file with prealloc extents
        Btrfs: fix xattr loss after power failure
        Btrfs: send, fix invalid access to commit roots due to concurrent snapshotting
      e5e03ad9
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · 132ce5d4
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
      
       - Łukasz Stelmach spotted a couple of issues with the decompressor.
      
       - a couple of kdump fixes found while testing kdump
      
       - replace some perl with shell code
      
       - resolve SIGFPE breakage
      
       - kprobes fixes
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: fix kill( ,SIGFPE) breakage
        ARM: 8772/1: kprobes: Prohibit kprobes on get_user functions
        ARM: 8771/1: kprobes: Prohibit kprobes on do_undefinstr
        ARM: 8770/1: kprobes: Prohibit probing on optimized_callback
        ARM: 8769/1: kprobes: Fix to use get_kprobe_ctlblk after irq-disabed
        ARM: replace unnecessary perl with sed and the shell $(( )) operator
        ARM: kexec: record parent context registers for non-crash CPUs
        ARM: kexec: fix kdump register saving on panic()
        ARM: 8758/1: decompressor: restore r1 and r2 just before jumping to the kernel
        ARM: 8753/1: decompressor: add a missing parameter to the addruart macro
      132ce5d4
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8a6bd2f4
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
       "An unfortunately larger set of fixes, but a large portion is
        selftests:
      
         - Fix the missing clusterid initializaiton for x2apic cluster
           management which caused boot failures due to IPIs being sent to the
           wrong cluster
      
         - Drop TX_COMPAT when a 64bit executable is exec()'ed from a compat
           task
      
         - Wrap access to __supported_pte_mask in __startup_64() where clang
           compile fails due to a non PC relative access being generated.
      
         - Two fixes for 5 level paging fallout in the decompressor:
      
            - Handle GOT correctly for paging_prepare() and
              cleanup_trampoline()
      
            - Fix the page table handling in cleanup_trampoline() to avoid
              page table corruption.
      
         - Stop special casing protection key 0 as this is inconsistent with
           the manpage and also inconsistent with the allocation map handling.
      
         - Override the protection key wen moving away from PROT_EXEC to
           prevent inaccessible memory.
      
         - Fix and update the protection key selftests to address breakage and
           to cover the above issue
      
         - Add a MOV SS self test"
      
      [ Part of the x86 fixes were in the earlier core pull due to dependencies ]
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        x86/mm: Drop TS_COMPAT on 64-bit exec() syscall
        x86/apic/x2apic: Initialize cluster ID properly
        x86/boot/compressed/64: Fix moving page table out of trampoline memory
        x86/boot/compressed/64: Set up GOT for paging_prepare() and cleanup_trampoline()
        x86/pkeys: Do not special case protection key 0
        x86/pkeys/selftests: Add a test for pkey 0
        x86/pkeys/selftests: Save off 'prot' for allocations
        x86/pkeys/selftests: Fix pointer math
        x86/pkeys: Override pkey when moving away from PROT_EXEC
        x86/pkeys/selftests: Fix pkey exhaustion test off-by-one
        x86/pkeys/selftests: Add PROT_EXEC test
        x86/pkeys/selftests: Factor out "instruction page"
        x86/pkeys/selftests: Allow faults on unknown keys
        x86/pkeys/selftests: Avoid printf-in-signal deadlocks
        x86/pkeys/selftests: Remove dead debugging code, fix dprint_in_signal
        x86/pkeys/selftests: Stop using assert()
        x86/pkeys/selftests: Give better unexpected fault error messages
        x86/selftests: Add mov_to_ss test
        x86/mpx/selftests: Adjust the self-test to fresh distros that export the MPX ABI
        x86/pkeys/selftests: Adjust the self-test to fresh distros that export the pkeys ABI
        ...
      8a6bd2f4
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · b9aad922
      Linus Torvalds authored
      Pull UP timer fix from Thomas Gleixner:
       "Work around the for_each_cpu() oddity on UP kernels in the tick
        broadcast code which causes boot failures because the CPU0 bit is
        always reported as set independent of the cpumask content"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tick/broadcast: Use for_each_cpu() specially on UP kernels
      b9aad922