1. 09 7月, 2017 6 次提交
    • L
      Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm · 09b56d5a
      Linus Torvalds 提交于
      Pull ARM updates from Russell King:
      
       - add support for ftrace-with-registers, which is needed for kgraft and
         other ftrace tools
      
       - support for mremap() for the sigpage/vDSO so that checkpoint/restore
         can work
      
       - add timestamps to each line of the register dump output
      
       - remove the unused KTHREAD_SIZE from nommu
      
       - align the ARM bitops APIs with the generic API (using unsigned long
         pointers rather than void pointers)
      
       - make the configuration of userspace Thumb support an expert option so
         that we can default it on, and avoid some hard to debug userspace
         crashes
      
      * 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8684/1: NOMMU: Remove unused KTHREAD_SIZE definition
        ARM: 8683/1: ARM32: Support mremap() for sigpage/vDSO
        ARM: 8679/1: bitops: Align prototypes to generic API
        ARM: 8678/1: ftrace: Adds support for CONFIG_DYNAMIC_FTRACE_WITH_REGS
        ARM: make configuration of userspace Thumb support an expert option
        ARM: 8673/1: Fix __show_regs output timestamps
      09b56d5a
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · fe1b5180
      Linus Torvalds 提交于
      Pull sparc updates from David Miller:
      
       1) Queued spinlocks and rwlocks for sparc64, from Babu Moger.
      
       2) Some const'ification from Arvind Yadav.
      
       3) LDC/VIO driver infrastructure changes to facilitate future upcoming
          drivers, from Jag Raman.
      
       4) Initialize sched_clock() et al. early so that the initial printk
          timestamps are all done while the implementation is available and
          functioning. From Pavel Tatashin.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (38 commits)
        sparc: kernel: pmc: make of_device_ids const.
        sparc64: fix typo in property
        sparc64: add port_id to VIO device metadata
        sparc64: Enhance search for VIO device in MDESC
        sparc64: enhance VIO device probing
        sparc64: check if a client is allowed to register for MDESC notifications
        sparc64: remove restriction on VIO device name size
        sparc64: refactor code to obtain cfg_handle property from MDESC
        sparc64: add MDESC node name property to VIO device metadata
        sparc64: mdesc: use __GFP_REPEAT action modifier for VM allocation
        sparc64: expand MDESC interface
        sparc64: skip handshake for LDC channels in RAW mode
        sparc64: specify the device class in VIO version info. packet
        sparc64: ensure VIO operations are defined while being used
        sparc: kernel: apc: make of_device_ids const
        sparc/time: make of_device_ids const
        sparc64: broken %tick frequency on spitfire cpus
        sparc64: use prom interface to get %stick frequency
        sparc64: optimize functions that access tick
        sparc64: add hot-patched and inlined get_tick()
        ...
      fe1b5180
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8b6b3172
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "Mostly fixing some light fallout from the changes that went into the
        merge window.
      
         1) Fix memory leaks on network namespace teardown in netfilter, from
            Liping Zhang.
      
         2) When comparing ipv6 nexthops, we have to take the lightweight
            tunnel state into account as well. From David Ahern.
      
         3) Fix socket option object length check in the new TLS code, from
            Matthias Rosenfelder.
      
         4) Fix memory leak in nfp driver flower support, from Jakub Kicinski.
      
         5) Several netlink attribute validation fixes in cfg80211, from
            Srinivas Dasari.
      
         6) Fix context array leak in virtio_net, from Jason Wang.
      
         7) SKB use after free in hns driver, from Yusheng Lin.
      
         8) Fix socket leak on accept() in RDS, from Sowmini Varadhan. Also
            add a WARN_ON() to sock_graft() so other protocol stacks don't
            trip over this as well"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
        net: ethernet: mediatek: remove useless code in mtk_probe()
        mpls: fix uninitialized in_label var warning in mpls_getroute
        doc: SKB_GSO_[IPIP|SIT] have been replaced
        bonding: avoid NETDEV_CHANGEMTU event when unregistering slave
        net/sock: add WARN_ON(parent->sk) in sock_graft()
        rds: tcp: use sock_create_lite() to create the accept socket
        net: hns: Fix a skb used after free bug
        net: hns: Fix a wrong op phy C45 code
        net: macb: Adding Support for Jumbo Frames up to 10240 Bytes in SAMA5D3
        net: Update networking MAINTAINERS entry.
        virtio-net: fix leaking of ctx array
        cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
        cfg80211: Define nla_policy for NL80211_ATTR_LOCAL_MESH_POWER_MODE
        cfg80211: Check if NAN service ID is of expected size
        cfg80211: Check if PMKID attribute is of expected size
        arcnet: com20020-pci: Fix an error handling path in 'com20020pci_probe()'
        nfp: flower: add missing clean up call to avoid memory leaks
        vrf: fix bug_on triggered by rx when destroying a vrf
        ptp: dte: Use LL suffix for 64-bit constants
        sctp: set the value of flowi6_oif to sk_bound_dev_if to make sctp_v6_get_dst to find the correct route entry.
        ...
      8b6b3172
    • L
      Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · b8d4c1f9
      Linus Torvalds 提交于
      Pull misc filesystem updates from Al Viro:
       "Assorted normal VFS / filesystems stuff..."
      
      * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        dentry name snapshots
        Make statfs properly return read-only state after emergency remount
        fs/dcache: init in_lookup_hashtable
        minix: Deinline get_block, save 2691 bytes
        fs: Reorder inode_owner_or_capable() to avoid needless
        fs: warn in case userspace lied about modprobe return
      b8d4c1f9
    • L
      Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 090a81d8
      Linus Torvalds 提交于
      Pull spi uaccess delousing from Al Viro:
       "Getting rid of pointless __get_user() and friends in drivers/spi.
      
        [ the only reason it's on a separate branch is that I hoped it would
          be picked by spi folks; looks like mail asking them to grab it got
          lost and I hadn't followed up on that ]"
      
      * 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        spidev: quit messing with access_ok()
      090a81d8
    • L
      Merge branch 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 46ace66b
      Linus Torvalds 提交于
      Pull __copy_in_user removal from Al Viro:
       "There used to be 6 places in the entire tree calling __copy_in_user(),
        all of them bogus.
      
        Four got killed off in work.drm branch, this takes care of the
        remaining ones and kills the definition of that sucker"
      
      * 'work.__copy_in_user' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        kill __copy_in_user()
        sanitize do_i2c_smbus_ioctl()
      46ace66b
  2. 08 7月, 2017 34 次提交
    • G
      net: ethernet: mediatek: remove useless code in mtk_probe() · e8df7603
      Gustavo A. R. Silva 提交于
      Remove useless local variables _match_, _soc_ and the code related.
      
      Notice that
      
      const struct of_device_id of_mtk_match[] = {
              { .compatible = "mediatek,mt2701-eth" },
              {},
      };
      
      So match->data is NULL.
      Suggested-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NGustavo A. R. Silva <garsilva@embeddedor.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e8df7603
    • R
      mpls: fix uninitialized in_label var warning in mpls_getroute · a906c1aa
      Roopa Prabhu 提交于
      Fix the below warning generated by static checker:
          net/mpls/af_mpls.c:2111 mpls_getroute()
          error: uninitialized symbol 'in_label'."
      
      Fixes: 397fc9e5 ("mpls: route get support")
      Reported-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NRoopa Prabhu <roopa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a906c1aa
    • N
      doc: SKB_GSO_[IPIP|SIT] have been replaced · 11bafd54
      Nicolas Dichtel 提交于
      Those enum values don't exist anymore.
      
      Fixes: 7e13318d ("net: define gso types for IPx over IPv4 and IPv6")
      CC: Tom Herbert <tom@herbertland.com>
      Signed-off-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      11bafd54
    • W
      bonding: avoid NETDEV_CHANGEMTU event when unregistering slave · f51048c3
      WANG Cong 提交于
      As Hongjun/Nicolas summarized in their original patch:
      
      "
      When a device changes from one netns to another, it's first unregistered,
      then the netns reference is updated and the dev is registered in the new
      netns. Thus, when a slave moves to another netns, it is first
      unregistered. This triggers a NETDEV_UNREGISTER event which is caught by
      the bonding driver. The driver calls bond_release(), which calls
      dev_set_mtu() and thus triggers NETDEV_CHANGEMTU (the device is still in
      the old netns).
      "
      
      This is a very special case, because the device is being unregistered
      no one should still care about the NETDEV_CHANGEMTU event triggered
      at this point, we can avoid broadcasting this event on this path,
      and avoid touching inetdev_event()/addrconf_notify() path.
      
      It requires to export __dev_set_mtu() to bonding driver.
      Reported-by: NHongjun Li <hongjun.li@6wind.com>
      Reported-by: NNicolas Dichtel <nicolas.dichtel@6wind.com>
      Cc: Jay Vosburgh <j.vosburgh@gmail.com>
      Cc: Veaceslav Falico <vfalico@gmail.com>
      Cc: Andy Gospodarek <andy@greyhouse.net>
      Signed-off-by: NCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f51048c3
    • D
      Merge branch 'rds-tcp-sock_graft-leak' · 5dc314f8
      David S. Miller 提交于
      Sowmini Varadhan says:
      
      ====================
      rds-tcp: sock_graft() leak
      
      Following up on the discussion at
        https://www.spinics.net/lists/netdev/msg442859.html
      - make rds_tcp_accept_one() call sock_create_lite()
      - add a WARN_ON() to sock_graft()
      
      Tested by running an infinite while() loop that does
      (module-load; rds-stress; module-unload) and monitors
      TCP slabinfo while the test is running.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5dc314f8
    • S
      net/sock: add WARN_ON(parent->sk) in sock_graft() · 0ffdaf5b
      Sowmini Varadhan 提交于
      sock_graft() unilaterally sets up parent->sk based on the
      assumption that the existing parent->sk is null. If this
      condition is not true, then the existing parent->sk would
      be leaked, so add a WARN_ON() to alert callers who may fall
      in this category.
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0ffdaf5b
    • S
      rds: tcp: use sock_create_lite() to create the accept socket · 0933a578
      Sowmini Varadhan 提交于
      There are two problems with calling sock_create_kern() from
      rds_tcp_accept_one()
      1. it sets up a new_sock->sk that is wasteful, because this ->sk
         is going to get replaced by inet_accept() in the subsequent ->accept()
      2. The new_sock->sk is a leaked reference in sock_graft() which
         expects to find a null parent->sk
      
      Avoid these problems by calling sock_create_lite().
      Signed-off-by: NSowmini Varadhan <sowmini.varadhan@oracle.com>
      Acked-by: NSantosh Shilimkar <santosh.shilimkar@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0933a578
    • D
      Merge branch 'hns-fixes' · 9dc351da
      David S. Miller 提交于
      Lin Yun Sheng says:
      
      ====================
      Bugfixs for hns ethernet driver
      
      This patchset fix skb used after free and C45 op code issues
      in hns driver.
      
      Patch V2:
      	1. Remove ndev->feature checking in TX description patch.
      	2. Add Fixes: Tag in patch description.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9dc351da
    • Y
      net: hns: Fix a skb used after free bug · 27463ad9
      Yunsheng Lin 提交于
      skb maybe freed in hns_nic_net_xmit_hw() and return NETDEV_TX_OK,
      which cause hns_nic_net_xmit to use a freed skb.
      
      BUG: KASAN: use-after-free in hns_nic_net_xmit_hw+0x62c/0x940...
      	[17659.112635]      alloc_debug_processing+0x18c/0x1a0
      	[17659.117208]      __slab_alloc+0x52c/0x560
      	[17659.120909]      kmem_cache_alloc_node+0xac/0x2c0
      	[17659.125309]      __alloc_skb+0x6c/0x260
      	[17659.128837]      tcp_send_ack+0x8c/0x280
      	[17659.132449]      __tcp_ack_snd_check+0x9c/0xf0
      	[17659.136587]      tcp_rcv_established+0x5a4/0xa70
      	[17659.140899]      tcp_v4_do_rcv+0x27c/0x620
      	[17659.144687]      tcp_prequeue_process+0x108/0x170
      	[17659.149085]      tcp_recvmsg+0x940/0x1020
      	[17659.152787]      inet_recvmsg+0x124/0x180
      	[17659.156488]      sock_recvmsg+0x64/0x80
      	[17659.160012]      SyS_recvfrom+0xd8/0x180
      	[17659.163626]      __sys_trace_return+0x0/0x4
      	[17659.167506] INFO: Freed in kfree_skbmem+0xa0/0xb0 age=23 cpu=1 pid=13
      	[17659.174000]      free_debug_processing+0x1d4/0x2c0
      	[17659.178486]      __slab_free+0x240/0x390
      	[17659.182100]      kmem_cache_free+0x24c/0x270
      	[17659.186062]      kfree_skbmem+0xa0/0xb0
      	[17659.189587]      __kfree_skb+0x28/0x40
      	[17659.193025]      napi_gro_receive+0x168/0x1c0
      	[17659.197074]      hns_nic_rx_up_pro+0x58/0x90
      	[17659.201038]      hns_nic_rx_poll_one+0x518/0xbc0
      	[17659.205352]      hns_nic_common_poll+0x94/0x140
      	[17659.209576]      net_rx_action+0x458/0x5e0
      	[17659.213363]      __do_softirq+0x1b8/0x480
      	[17659.217062]      run_ksoftirqd+0x64/0x80
      	[17659.220679]      smpboot_thread_fn+0x224/0x310
      	[17659.224821]      kthread+0x150/0x170
      	[17659.228084]      ret_from_fork+0x10/0x40
      
      	BUG: KASAN: use-after-free in hns_nic_net_xmit+0x8c/0xc0...
      	[17751.080490]      __slab_alloc+0x52c/0x560
      	[17751.084188]      kmem_cache_alloc+0x244/0x280
      	[17751.088238]      __build_skb+0x40/0x150
      	[17751.091764]      build_skb+0x28/0x100
      	[17751.095115]      __alloc_rx_skb+0x94/0x150
      	[17751.098900]      __napi_alloc_skb+0x34/0x90
      	[17751.102776]      hns_nic_rx_poll_one+0x180/0xbc0
      	[17751.107097]      hns_nic_common_poll+0x94/0x140
      	[17751.111333]      net_rx_action+0x458/0x5e0
      	[17751.115123]      __do_softirq+0x1b8/0x480
      	[17751.118823]      run_ksoftirqd+0x64/0x80
      	[17751.122437]      smpboot_thread_fn+0x224/0x310
      	[17751.126575]      kthread+0x150/0x170
      	[17751.129838]      ret_from_fork+0x10/0x40
      	[17751.133454] INFO: Freed in kfree_skbmem+0xa0/0xb0 age=19 cpu=7 pid=43
      	[17751.139951]      free_debug_processing+0x1d4/0x2c0
      	[17751.144436]      __slab_free+0x240/0x390
      	[17751.148051]      kmem_cache_free+0x24c/0x270
      	[17751.152014]      kfree_skbmem+0xa0/0xb0
      	[17751.155543]      __kfree_skb+0x28/0x40
      	[17751.159022]      napi_gro_receive+0x168/0x1c0
      	[17751.163074]      hns_nic_rx_up_pro+0x58/0x90
      	[17751.167041]      hns_nic_rx_poll_one+0x518/0xbc0
      	[17751.171358]      hns_nic_common_poll+0x94/0x140
      	[17751.175585]      net_rx_action+0x458/0x5e0
      	[17751.179373]      __do_softirq+0x1b8/0x480
      	[17751.183076]      run_ksoftirqd+0x64/0x80
      	[17751.186691]      smpboot_thread_fn+0x224/0x310
      	[17751.190826]      kthread+0x150/0x170
      	[17751.194093]      ret_from_fork+0x10/0x40
      
      Fixes: 13ac695e ("net:hns: Add support of Hip06 SoC to the Hislicon Network Subsystem")
      Signed-off-by: NYunsheng Lin <linyunsheng@huawei.com>
      Signed-off-by: Nlipeng <lipeng321@huawei.com>
      Reported-by: NJun He <hjat2005@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      27463ad9
    • Y
      net: hns: Fix a wrong op phy C45 code · ebe8d359
      Yunsheng Lin 提交于
      As the user manual described, the second step to write to C45 phy
      by mdio should be data, but not address. Here we should fix this
      issue.
      
      Fixes: 5b904d39 ("net: add Hisilicon Network Subsystem MDIO support")
      Signed-off-by: NYunsheng Lin <linyunsheng@huawei.com>
      Reviewed-by: Nlipeng <lipeng321@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ebe8d359
    • V
      net: macb: Adding Support for Jumbo Frames up to 10240 Bytes in SAMA5D3 · 233a1587
      vishnuvardhan 提交于
      As per the SAMA5D3 device specification it supports Jumbo frames.
      But the suggested flag and length of bytes it supports was not updated
      in this driver config_structure.
      The maximum jumbo frames the device supports :
      10240 bytes as per the device spec.
      
      While changing the MTU value greater than 1500, it threw error:
      sudo ifconfig eth1 mtu 9000
      SIOCSIFMTU: Invalid argument
      
      Add this support to driver so that it works as expected and designed.
      Signed-off-by: Nvishnuvardhan <vardhanraj4143@gmail.com>
      [nicolas.ferre@microchip.com: modify slightly commit msg]
      Signed-off-by: NNicolas Ferre <nicolas.ferre@microchip.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      233a1587
    • L
      Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · cee37d83
      Linus Torvalds 提交于
      Pull read/write fix from Al Viro:
       "file_start_write()/file_end_write() got mixed into vfs_iter_write() by
        accident; that's a deadlock for all existing callers - they already do
        that, some - quite a bit outside.
      
        Easily fixed, fortunately"
      
      * 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        move file_{start,end}_write() out of do_iter_write()
      cee37d83
    • L
      Merge branch 'uaccess-work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 6a37e940
      Linus Torvalds 提交于
      Pull iov_iter hardening from Al Viro:
       "This is the iov_iter/uaccess/hardening pile.
      
        For one thing, it trims the inline part of copy_to_user/copy_from_user
        to the minimum that *does* need to be inlined - object size checks,
        basically. For another, it sanitizes the checks for iov_iter
        primitives. There are 4 groups of checks: access_ok(), might_fault(),
        object size and KASAN.
      
         - access_ok() had been verified by whoever had set the iov_iter up.
           However, that has happened in a function far away, so proving that
           there's no path to actual copying bypassing those checks is hard
           and proving that iov_iter has not been buggered in the meanwhile is
           also not pleasant. So we want those redone in actual
           copyin/copyout.
      
         - might_fault() is better off consolidated - we know whether it needs
           to be checked as soon as we enter iov_iter primitive and observe
           the iov_iter flavour. No need to wait until the copyin/copyout. The
           call chains are short enough to make sure we won't miss anything -
           in fact, it's more robust that way, since there are cases where we
           do e.g. forced fault-in before getting to copyin/copyout. It's not
           quite what we need to check (in particular, combination of
           iovec-backed and set_fs(KERNEL_DS) is almost certainly a bug, not a
           cause to skip checks), but that's for later series. For now let's
           keep might_fault().
      
         - KASAN checks belong in copyin/copyout - at the same level where
           other iov_iter flavours would've hit them in memcpy().
      
         - object size checks should apply to *all* iov_iter flavours, not
           just iovec-backed ones.
      
        There are two groups of primitives - one gets the kernel object
        described as pointer + size (copy_to_iter(), etc.) while another gets
        it as page + offset + size (copy_page_to_iter(), etc.)
      
        For the first group the checks are best done where we actually have a
        chance to find the object size. In other words, those belong in inline
        wrappers in uio.h, before calling into iov_iter.c. Same kind as we
        have for inlined part of copy_to_user().
      
        For the second group there is no object to look at - offset in page is
        just a number, it bears no type information. So we do them in the
        common helper called by iov_iter.c primitives of that kind. All it
        currently does is checking that we are not trying to access outside of
        the compound page; eventually we might want to add some sanity checks
        on the page involved.
      
        So the things we need in copyin/copyout part of iov_iter.c do not
        quite match anything in uaccess.h (we want no zeroing, we *do* want
        access_ok() and KASAN and we want no might_fault() or object size
        checks done on that level). OTOH, these needs are simple enough to
        provide a couple of helpers (static in iov_iter.c) doing just what we
        need..."
      
      * 'uaccess-work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        iov_iter: saner checks on copyin/copyout
        iov_iter: sanity checks for copy to/from page primitives
        iov_iter/hardening: move object size checks to inlined part
        copy_{to,from}_user(): consolidate object size checks
        copy_{from,to}_user(): move kasan checks and might_fault() out-of-line
      6a37e940
    • K
      exec: Limit arg stack to at most 75% of _STK_LIM · da029c11
      Kees Cook 提交于
      To avoid pathological stack usage or the need to special-case setuid
      execs, just limit all arg stack usage to at most 75% of _STK_LIM (6MB).
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      da029c11
    • L
      Merge tag 'for-linus-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux · 088737f4
      Linus Torvalds 提交于
      Pull Writeback error handling updates from Jeff Layton:
       "This pile represents the bulk of the writeback error handling fixes
        that I have for this cycle. Some of the earlier patches in this pile
        may look trivial but they are prerequisites for later patches in the
        series.
      
        The aim of this set is to improve how we track and report writeback
        errors to userland. Most applications that care about data integrity
        will periodically call fsync/fdatasync/msync to ensure that their
        writes have made it to the backing store.
      
        For a very long time, we have tracked writeback errors using two flags
        in the address_space: AS_EIO and AS_ENOSPC. Those flags are set when a
        writeback error occurs (via mapping_set_error) and are cleared as a
        side-effect of filemap_check_errors (as you noted yesterday). This
        model really sucks for userland.
      
        Only the first task to call fsync (or msync or fdatasync) will see the
        error. Any subsequent task calling fsync on a file will get back 0
        (unless another writeback error occurs in the interim). If I have
        several tasks writing to a file and calling fsync to ensure that their
        writes got stored, then I need to have them coordinate with one
        another. That's difficult enough, but in a world of containerized
        setups that coordination may even not be possible.
      
        But wait...it gets worse!
      
        The calls to filemap_check_errors can be buried pretty far down in the
        call stack, and there are internal callers of filemap_write_and_wait
        and the like that also end up clearing those errors. Many of those
        callers ignore the error return from that function or return it to
        userland at nonsensical times (e.g. truncate() or stat()). If I get
        back -EIO on a truncate, there is no reason to think that it was
        because some previous writeback failed, and a subsequent fsync() will
        (incorrectly) return 0.
      
        This pile aims to do three things:
      
         1) ensure that when a writeback error occurs that that error will be
            reported to userland on a subsequent fsync/fdatasync/msync call,
            regardless of what internal callers are doing
      
         2) report writeback errors on all file descriptions that were open at
            the time that the error occurred. This is a user-visible change,
            but I think most applications are written to assume this behavior
            anyway. Those that aren't are unlikely to be hurt by it.
      
         3) document what filesystems should do when there is a writeback
            error. Today, there is very little consistency between them, and a
            lot of cargo-cult copying. We need to make it very clear what
            filesystems should do in this situation.
      
        To achieve this, the set adds a new data type (errseq_t) and then
        builds new writeback error tracking infrastructure around that. Once
        all of that is in place, we change the filesystems to use the new
        infrastructure for reporting wb errors to userland.
      
        Note that this is just the initial foray into cleaning up this mess.
        There is a lot of work remaining here:
      
         1) convert the rest of the filesystems in a similar fashion. Once the
            initial set is in, then I think most other fs' will be fairly
            simple to convert. Hopefully most of those can in via individual
            filesystem trees.
      
         2) convert internal waiters on writeback to use errseq_t for
            detecting errors instead of relying on the AS_* flags. I have some
            draft patches for this for ext4, but they are not quite ready for
            prime time yet.
      
        This was a discussion topic this year at LSF/MM too. If you're
        interested in the gory details, LWN has some good articles about this:
      
            https://lwn.net/Articles/718734/
            https://lwn.net/Articles/724307/"
      
      * tag 'for-linus-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
        btrfs: minimal conversion to errseq_t writeback error reporting on fsync
        xfs: minimal conversion to errseq_t writeback error reporting
        ext4: use errseq_t based error handling for reporting data writeback errors
        fs: convert __generic_file_fsync to use errseq_t based reporting
        block: convert to errseq_t based writeback error tracking
        dax: set errors in mapping when writeback fails
        Documentation: flesh out the section in vfs.txt on storing and reporting writeback errors
        mm: set both AS_EIO/AS_ENOSPC and errseq_t in mapping_set_error
        fs: new infrastructure for writeback error handling and reporting
        lib: add errseq_t type and infrastructure for handling it
        mm: don't TestClearPageError in __filemap_fdatawait_range
        mm: clear AS_EIO/AS_ENOSPC when writeback initiation fails
        jbd2: don't clear and reset errors after waiting on writeback
        buffer: set errors in mapping at the time that the error occurs
        fs: check for writeback errors after syncing out buffers in generic_file_fsync
        buffer: use mapping_set_error instead of setting the flag
        mm: fix mapping_set_error call in me_pagecache_dirty
      088737f4
    • L
      Merge tag 'for-linus-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux · 33198c16
      Linus Torvalds 提交于
      Pull Writeback error handling fixes from Jeff Layton:
       "The main rationale for all of these changes is to tighten up writeback
        error reporting to userland. There are many ways now that writeback
        errors can be lost, such that fsync/fdatasync/msync return 0 when
        writeback actually failed.
      
        This pile contains a small set of cleanups and writeback error
        handling fixes that I was able to break off from the main pile (#2).
      
        Two of the patches in this pile are trivial. The exceptions are the
        patch to fix up error handling in write_one_page, and the patch to
        make JFS pay attention to write_one_page errors"
      
      * tag 'for-linus-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux:
        fs: remove call_fsync helper function
        mm: clean up error handling in write_one_page
        JFS: do not ignore return code from write_one_page()
        mm: drop "wait" parameter from write_one_page()
      33198c16
    • L
      Merge tag 'cifs-bug-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6 · 3ea4fcc5
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French:
       "First set of CIFS/SMB3 fixes for the merge window. Also improves POSIX
        character mapping for SMB3"
      
      * tag 'cifs-bug-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: fix circular locking dependency
        cifs: set oparms.create_options rather than or'ing in CREATE_OPEN_BACKUP_INTENT
        cifs: Do not modify mid entry after submitting I/O in cifs_call_async
        CIFS: add SFM mapping for 0x01-0x1F
        cifs: hide unused functions
        cifs: Use smb 2 - 3 and cifsacl mount options getacl functions
        cifs: prototype declaration and definition for smb 2 - 3 and cifsacl mount options
        CIFS: add CONFIG_CIFS_DEBUG_KEYS to dump encryption keys
        cifs: set mapping error when page writeback fails in writepage or launder_pages
        SMB3: Enable encryption for SMB3.1.1
      3ea4fcc5
    • L
      Merge tag 'gfs2-4.13.fixes.addendum' of... · 1a86fc75
      Linus Torvalds 提交于
      Merge tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
      
      Pull GFS2 fix from Bob Peterson:
       "Sorry for the additional merge request, but Andreas discovered this
        problem soon after you processed our last gfs2 merge.
      
        This fixes a regression introduced by a patch we did in mid-2015
        (commit 88ffbf3e: "GFS2: Use resizable hash table for glocks"), so
        best to get it fixed. Some code was reverted that should not have
        been.
      
        The patch from Andreas Gruenbacher just re-adds code that had been
        there originally"
      
      * tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Fix glock rhashtable rcu bug
      1a86fc75
    • A
      dentry name snapshots · 49d31c2f
      Al Viro 提交于
      take_dentry_name_snapshot() takes a safe snapshot of dentry name;
      if the name is a short one, it gets copied into caller-supplied
      structure, otherwise an extra reference to external name is grabbed
      (those are never modified).  In either case the pointer to stable
      string is stored into the same structure.
      
      dentry must be held by the caller of take_dentry_name_snapshot(),
      but may be freely dropped afterwards - the snapshot will stay
      until destroyed by release_dentry_name_snapshot().
      
      Intended use:
      	struct name_snapshot s;
      
      	take_dentry_name_snapshot(&s, dentry);
      	...
      	access s.name
      	...
      	release_dentry_name_snapshot(&s);
      
      Replaces fsnotify_oldname_...(), gets used in fsnotify to obtain the name
      to pass down with event.
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      49d31c2f
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · a7d40268
      Linus Torvalds 提交于
      Pull security layer fixes from James Morris:
       "Bugfixes for TPM and SELinux"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        IB/core: Fix static analysis warning in ib_policy_change_task
        IB/core: Fix uninitialized variable use in check_qp_port_pkey_settings
        tpm: do not suspend/resume if power stays on
        tpm: use tpm2_pcr_read() in tpm2_do_selftest()
        tpm: use tpm_buf functions in tpm2_pcr_read()
        tpm_tis: make ilb_base_addr static
        tpm: consolidate the TPM startup code
        tpm: Enable CLKRUN protocol for Braswell systems
        tpm/tpm_crb: fix priv->cmd_size initialisation
        tpm: fix a kernel memory leak in tpm-sysfs.c
        tpm: Issue a TPM2_Shutdown for TPM2 devices.
        Add "shutdown" to "struct class".
      a7d40268
    • D
      net: Update networking MAINTAINERS entry. · 6d03d67a
      David S. Miller 提交于
      James and Patrick haven't been active in years.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6d03d67a
    • L
      Merge tag 'kbuild-thinar-v4.13' of... · 98ced886
      Linus Torvalds 提交于
      Merge tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild thin archives updates from Masahiro Yamada:
       "Thin archives migration by Nicholas Piggin.
      
        THIN_ARCHIVES has been available for a while as an optional feature
        only for PowerPC architecture, but we do not need two different
        intermediate-artifact schemes.
      
        Using thin archives instead of conventional incremental linking has
        various advantages:
      
         - save disk space for builds
      
         - speed-up building a little
      
         - fix some link issues (for example, allyesconfig on ARM) due to more
           flexibility for the final linking
      
         - work better with dead code elimination we are planning
      
        As discussed before, this migration has been done unconditionally so
        that any problems caused by this will show up with "git bisect".
      
        With testing with 0-day and linux-next, some architectures actually
        showed up problems, but they were trivial and all fixed now"
      
      * tag 'kbuild-thinar-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        tile: remove unneeded extra-y in Makefile
        kbuild: thin archives make default for all archs
        x86/um: thin archives build fix
        tile: thin archives fix linking
        ia64: thin archives fix linking
        sh: thin archives fix linking
        kbuild: handle libs-y archives separately from built-in.o archives
        kbuild: thin archives use P option to ar
        kbuild: thin archives final link close --whole-archives option
        ia64: remove unneeded extra-y in Makefile.gate
        tile: fix dependency and .*.cmd inclusion for incremental build
        sparc64: Use indirect calls in hamming weight stubs
      98ced886
    • L
      Merge tag 'kbuild-misc-v4.13' of... · 16ffc4c3
      Linus Torvalds 提交于
      Merge tag 'kbuild-misc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull misc Kbuild updates from Masahiro Yamada:
      
       - Use more portable shebang for Perl scripts
      
       - Remove trailing spaces from GCC version in kernel log
      
       - Make initramfs generation deterministic
      
      * tag 'kbuild-misc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: create deterministic initramfs directory listings
        scripts/mkcompile_h: Remove trailing spaces from compiler version
        scripts: Switch to more portable Perl shebang
      16ffc4c3
    • L
      Merge tag 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 58f051fc
      Linus Torvalds 提交于
      Pull Kbuild updates from Masahiro Yamada:
      
       - Clean up Makefiles and scripts
      
       - Improve clang support
      
       - Remove unneeded genhdr-y syntax
      
       - Remove unneeded cc-option-align macro
      
       - Introduce __cc-option macro and use it to fix x86 boot code compiler
         flags
      
      * tag 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: improve comments on KBUILD_SRC
        x86/build: Specify stack alignment for clang
        x86/build: Use __cc-option for boot code compiler options
        kbuild: Add __cc-option macro
        kbuild: remove cc-option-align
        kbuild: replace genhdr-y with generated-y
        kbuild: clang: Disable 'address-of-packed-member' warning
        kbuild: remove duplicated arch/*/include/generated/uapi include path
        kbuild: speed up checksyscalls.sh
        kbuild: simplify silent build (-s) detection
      58f051fc
    • L
      Merge tag 'linux-kselftest-4.13-rc1-update' of... · ef3ad089
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-4.13-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull Kselftest updates from Shuah Khan:
       "This update consists of:
      
         - TAP13 framework and changes to some tests to convert to TAP13.
           Converting kselftest output to standard format will help identify
           run to run differences and pin point failures easily. TAP13 format
           has been in use for several years and the output is human friendly.
      
           Please find the specification:
             https://testanything.org/tap-version-13-specification.html
      
           Credit goes to Tim Bird for recommending TAP13 as a suitable
           format, and to Grag KH for kick starting the work with help from
           Paul Elder and Alice Ferrazzi
      
           The first phase of the TAp13 conversion is included in this update.
           Future updates will include updates to rest of the tests.
      
         - Masami Hiramatsu fixed ftrace to run on 4.9 stable kernels.
      
         - Kselftest documnetation has been converted to ReST format. Document
           now has a new home under Documentation/dev-tools.
      
         - kselftest_harness.h is now available for general use as a result of
           Mickaël Salaün's work.
      
         - Several fixes to skip and/or fail tests gracefully on older
           releases"
      
      * tag 'linux-kselftest-4.13-rc1-update' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (48 commits)
        selftests: membarrier: use ksft_* var arg msg api
        selftests: breakpoints: breakpoint_test_arm64: convert test to use TAP13
        selftests: breakpoints: step_after_suspend_test use ksft_* var arg msg api
        selftests: breakpoint_test: use ksft_* var arg msg api
        kselftest: add ksft_print_msg() function to output general information
        kselftest: make ksft_* output functions variadic
        selftests/capabilities: Fix the test_execve test
        selftests: intel_pstate: add .gitignore
        selftests: fix memory-hotplug test
        selftests: add missing test name in memory-hotplug test
        selftests: check percentage range for memory-hotplug test
        selftests: check hot-pluggagble memory for memory-hotplug test
        selftests: typo correction for memory-hotplug test
        selftests: ftrace: Use md5sum to take less time of checking logs
        tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict
        kselftest.rst: do some adjustments after ReST conversion
        selftest/net/Makefile: Specify output with $(OUTPUT)
        selftest/intel_pstate/aperf: Use LDLIBS instead of LDFLAGS
        selftest/memfd/Makefile: Fix build error
        selftests: lib: Skip tests on missing test modules
        ...
      ef3ad089
    • L
      Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux · 37949075
      Linus Torvalds 提交于
      Pull OpenRISC updates from Stafford Horne:
       "Openrisc fixes for this 4.13 merge window, there is not really much
        here:
      
         - include cleanups, one with should reduce build time slightly
      
         - switch to new toolchain to new (>2 year old) toolchain prefix"
      
      * tag 'openrisc-for-linus' of git://github.com/openrisc/linux:
        openrisc: defconfig: Cleanup from old Kconfig options
        openrisc: explicitly include linux/bug.h in asm/fixmap.h
        openrisc: Switch to use export.h instead of module.h
        openrisc: Change toolchain from or32- to or1k-
      37949075
    • L
      Merge tag 'powerpc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · d691b7e7
      Linus Torvalds 提交于
      Pull powerpc updates from Michael Ellerman:
       "Highlights include:
      
         - Support for STRICT_KERNEL_RWX on 64-bit server CPUs.
      
         - Platform support for FSP2 (476fpe) board
      
         - Enable ZONE_DEVICE on 64-bit server CPUs.
      
         - Generic & powerpc spin loop primitives to optimise busy waiting
      
         - Convert VDSO update function to use new update_vsyscall() interface
      
         - Optimisations to hypercall/syscall/context-switch paths
      
         - Improvements to the CPU idle code on Power8 and Power9.
      
        As well as many other fixes and improvements.
      
        Thanks to: Akshay Adiga, Andrew Donnellan, Andrew Jeffery, Anshuman
        Khandual, Anton Blanchard, Balbir Singh, Benjamin Herrenschmidt,
        Christophe Leroy, Christophe Lombard, Colin Ian King, Dan Carpenter,
        Gautham R. Shenoy, Hari Bathini, Ian Munsie, Ivan Mikhaylov, Javier
        Martinez Canillas, Madhavan Srinivasan, Masahiro Yamada, Matt Brown,
        Michael Neuling, Michal Suchanek, Murilo Opsfelder Araujo, Naveen N.
        Rao, Nicholas Piggin, Oliver O'Halloran, Paul Mackerras, Pavel Machek,
        Russell Currey, Santosh Sivaraj, Stephen Rothwell, Thiago Jung
        Bauermann, Yang Li"
      
      * tag 'powerpc-4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (158 commits)
        powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs
        powerpc/mm/radix: Implement STRICT_RWX/mark_rodata_ro() for Radix
        powerpc/mm/hash: Implement mark_rodata_ro() for hash
        powerpc/vmlinux.lds: Align __init_begin to 16M
        powerpc/lib/code-patching: Use alternate map for patch_instruction()
        powerpc/xmon: Add patch_instruction() support for xmon
        powerpc/kprobes/optprobes: Use patch_instruction()
        powerpc/kprobes: Move kprobes over to patch_instruction()
        powerpc/mm/radix: Fix execute permissions for interrupt_vectors
        powerpc/pseries: Fix passing of pp0 in updatepp() and updateboltedpp()
        powerpc/64s: Blacklist rtas entry/exit from kprobes
        powerpc/64s: Blacklist functions invoked on a trap
        powerpc/64s: Un-blacklist system_call() from kprobes
        powerpc/64s: Move system_call() symbol to just after setting MSR_EE
        powerpc/64s: Blacklist system_call() and system_call_common() from kprobes
        powerpc/64s: Convert .L__replay_interrupt_return to a local label
        powerpc64/elfv1: Only dereference function descriptor for non-text symbols
        cxl: Export library to support IBM XSL
        powerpc/dts: Use #include "..." to include local DT
        powerpc/perf/hv-24x7: Aggregate result elements on POWER9 SMT8
        ...
      d691b7e7
    • L
      vfs: fix flock compat thinko · b59eea55
      Linus Torvalds 提交于
      Michael Ellerman reported that commit 8c6657cb ("Switch flock
      copyin/copyout primitives to copy_{from,to}_user()") broke his
      networking on a bunch of PPC machines (64-bit kernel, 32-bit userspace).
      
      The reason is a brown-paper bug by that commit, which had the arguments
      to "copy_flock_fields()" in the wrong order, breaking the compat
      handling for file locking.  Apparently very few people run 32-bit user
      space on x86 any more, so the PPC people got the honor of noticing this
      "feature".
      
      Michael also sent a minimal diff that just changed the order of the
      arguments in that macro.
      
      This is not that minimal diff.
      
      This not only changes the order of the arguments in the macro, it also
      changes them to be pointers (to be consistent with all the other uses of
      those pointers), and makes the functions that do all of this also have
      the proper "const" attribution on the source pointers in order to make
      issues like that (using the source as a destination) be really obvious.
      Reported-by: NMichael Ellerman <mpe@ellerman.id.au>
      Acked-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b59eea55
    • L
      Merge tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 64813520
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are some remaining USB fixes for 4.13-rc1. They were originally
        scheduled for 4.12-final, but I didn't send them to you in time.
        Because of that, they were in a separate branch from the larger USB
        set of patches, so here they are in a separate pull request.
      
        Nothing major here a all, just three small patches:
      
         - some usb-serial new device ids
         - xhci bugfix for some crazy AMD hardware
      
        All of these have been in linux-next for a long time with no reported
        issues"
      
      * tag 'usb-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        xhci: Limit USB2 port wake support for AMD Promontory hosts
        USB: serial: qcserial: new Sierra Wireless EM7305 device ID
        USB: serial: option: add two Longcheer device ids
      64813520
    • L
      Merge tag 'backlight-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight · df7cb187
      Linus Torvalds 提交于
      Pull backlight updates from Lee Jones:
       "Core Framework:
         - Report correct error status to user
      
        Fix-ups:
         - Move Backlight headers out of I2C (adp8860, adp8870)"
      
      * tag 'backlight-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
        video: adp8870: move header file out of I2C realm
        backlight: adp8860: Move header file out of I2C realm
        backlight: Report error on failure
      df7cb187
    • L
      Merge (most of) tag 'mfd-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 6972b007
      Linus Torvalds 提交于
      Pull MFD updates from Lee Jones:
       "New Drivers:
         - Intel Cherry Trail Whiskey Cove PMIC
         - TI LP87565 PMIC
      
        New Device Support:
         - Add support for Cannonlake to intel-lpss-pci
         - Add support for Simatic IOT2000 to intel_quark_i2c_gpio
      
        New Functionality:
         - Add Regulator support (axp20x)
      
        Fix-ups:
         - Rework IRQ handling (intel_soc_pmic_bxtwc, rtsx_pcr, cros_ec)
         - Remove unused/unwelcome code (ipaq-micro, wm831x-core, da9062-core)
         - Provide deregistration on unbind (rn5t618)
         - Rework DT code/documentation (arizona)
         - Constify things (fsl-imx25-tsadc)
         - MAINTAINERS updates (DA9062/61)
         - Kconfig configuration adaptions (INTEL_SOC_PMIC, MFD_AXP20X_I2C)
         - Switch to DMI matching (intel_quark_i2c_gpio)
         - Provide an appropriate level of error checking (wm831x-{i2c,spi},
           twl4030-irq, tc6393xb)
         - Make use of devm_* (resource handling) calls (intel_soc_pmic_bxtwc,
           stm32-timers, atmel-flexcom, cros_ec, fsl-imx25-tsadc,
           exynos-lpass, palmas, qcom-spmi-pmic, smsc-ece1099,
           motorola-cpcap)"
      
      [ Skipped the last commit in that series that added eight thousand
        lines of pointless repeated register definitions.  - Linus ]
      
      * tag 'mfd-next-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (38 commits)
        mfd: Add LP87565 PMIC support
        mfd: cros_ec: Free IRQ on exit
        dt-bindings: vendor-prefixes: Add arctic to vendor prefix
        mfd: da9061: Fix to remove BBAT_CONT register from chip model
        mfd: da9061: Fix to remove BBAT_CONT register from chip model
        mfd: axp20x-i2c: Document that this must be builtin on x86
        mfd: Add Cherry Trail Whiskey Cove PMIC driver
        mfd: tc6393xb: Handle return value of clk_prepare_enable
        mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform
        mfd: intel_quark_i2c_gpio: Use dmi_system_id table for retrieving frequency
        mfd: motorola-cpcap: Use devm_of_platform_populate()
        mfd: smsc-ece: Use devm_of_platform_populate()
        mfd: qcom-spmi-pmic: Use devm_of_platform_populate()
        mfd: palmas: Use devm_of_platform_populate()
        mfd: exynos: Use devm_of_platform_populate()
        mfd: fsl-imx25: Use devm_of_platform_populate()
        mfd: cros_ec: Use devm_of_platform_populate()
        mfd: atmel: Use devm_of_platform_populate()
        mfd: stm32-timers: Use devm_of_platform_populate()
        mfd: intel_soc_pmic: Select designware i2c-bus driver
        ...
      6972b007
    • L
      Merge tag 'gpio-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · c7d28eca
      Linus Torvalds 提交于
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of GPIO changes for the v4.13 series.
      
        Some administrativa:
      
        I have a slew of 8250 serial patches and the new IOT2040 serial+GPIO
        driver coming in through this tree, along with a whole bunch of Exar
        8250 fixes. These are ACKed by Greg and also hit drivers/platform/*
        where they are ACKed by Andy Shevchenko.
      
        Speaking about drivers/platform/* there is also a bunch of ACPI stuff
        coming through that route, again ACKed by Andy.
      
        The MCP23S08 changes are coming in here as well. You already have the
        commits in your tree, so this is just a result of sharing an immutable
        branch between pin control and GPIO.
      
        Core:
         - Export add/remove for lookup tables so that modules can export GPIO
           descriptor tables.
         - Handle GPIO sleep states: it is now possible to flag that a GPIO
           line may loose its state during suspend/resume of the system to
           save power. This is used in the Wolfson Micro Arizona driver.
         - ACPI-based GPIO was tightened up a lot around the edges.
         - Use bitmap_fill() to speed up a loop.
      
        New drivers:
         - Exar XRA1403 SPI-based GPIO.
         - MVEBU driver now supports Armada 7K and 8K.
         - LP87565 PMIC GPIO.
         - Renesas R-CAR R8A7743 (RZ/G1M).
         - The new IOT2040 8250 serial/GPIO also comes in through this
           changeset.
      
        Substantial driver changes:
         - Seriously fix the Exar 8250 GPIO portions to work.
         - The MCP23S08 was moved out to a pin control driver.
         - Convert MEVEBU to use regmap for register access.
         - Drop Vulcan support from the Broadcom driver.
         - Serious cleanup and improvement of the mockup driver, giving us a
           better test coverage.
      
        Misc:
         - Lots of janitorial clean up.
         - A bunch of documentation fixes"
      
      * tag 'gpio-v4.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (70 commits)
        serial: exar: Add support for IOT2040 device
        gpio-exar/8250-exar: Make set of exported GPIOs configurable
        platform: Accept const properties
        serial: exar: Factor out platform hooks
        gpio-exar/8250-exar: Rearrange gpiochip parenthood
        gpio: exar: Fix iomap request
        gpio-exar/8250-exar: Do not even instantiate a GPIO device for Commtech cards
        serial: uapi: Add support for bus termination
        gpio: rcar: Add R8A7743 (RZ/G1M) support
        gpio: gpio-wcove: Fix GPIO control register offset calculation
        gpio: lp87565: Add support for GPIO
        gpio: dwapb: fix missing first irq for edgeboth irq type
        MAINTAINERS: Take maintainership for GPIO ACPI support
        gpio: exar: Fix reading of directions and values
        gpio: exar: Allocate resources on behalf of the platform device
        gpio-exar/8250-exar: Fix passing in of parent PCI device
        gpio: mockup: use devm_kcalloc() where applicable
        gpio: mockup: add myself as author
        gpio: mockup: improve the error message
        gpio: mockup: don't return magic numbers from probe()
        ...
      c7d28eca
    • K
      openrisc: defconfig: Cleanup from old Kconfig options · 2e08a0ef
      Krzysztof Kozlowski 提交于
      Remove old, dead Kconfig option INET_LRO. It is gone since
      commit 7bbf3cae ("ipv4: Remove inet_lro library").
      Signed-off-by: NKrzysztof Kozlowski <krzk@kernel.org>
      Signed-off-by: NStafford Horne <shorne@gmail.com>
      2e08a0ef
    • T
      openrisc: explicitly include linux/bug.h in asm/fixmap.h · e687448c
      Tobias Klauser 提交于
      openrisc's asm/fixmap.h uses the BUG() and BUG_ON() macros but relies on
      implict inclusion of linux/bug.h which means that changes in other
      headers could break the build. Thus, add an explicit include.
      Signed-off-by: NTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: NStafford Horne <shorne@gmail.com>
      e687448c