1. 24 5月, 2019 6 次提交
  2. 22 5月, 2019 2 次提交
    • L
      Merge tag 'spdx-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 2c1212de
      Linus Torvalds 提交于
      Pull SPDX update from Greg KH:
       "Here is a series of patches that add SPDX tags to different kernel
        files, based on two different things:
      
         - SPDX entries are added to a bunch of files that we missed a year
           ago that do not have any license information at all.
      
           These were either missed because the tool saw the MODULE_LICENSE()
           tag, or some EXPORT_SYMBOL tags, and got confused and thought the
           file had a real license, or the files have been added since the
           last big sweep, or they were Makefile/Kconfig files, which we
           didn't touch last time.
      
         - Add GPL-2.0-only or GPL-2.0-or-later tags to files where our scan
           tools can determine the license text in the file itself. Where this
           happens, the license text is removed, in order to cut down on the
           700+ different ways we have in the kernel today, in a quest to get
           rid of all of these.
      
        These patches have been out for review on the linux-spdx@vger mailing
        list, and while they were created by automatic tools, they were
        hand-verified by a bunch of different people, all whom names are on
        the patches are reviewers.
      
        The reason for these "large" patches is if we were to continue to
        progress at the current rate of change in the kernel, adding license
        tags to individual files in different subsystems, we would be finished
        in about 10 years at the earliest.
      
        There will be more series of these types of patches coming over the
        next few weeks as the tools and reviewers crunch through the more
        "odd" variants of how to say "GPLv2" that developers have come up with
        over the years, combined with other fun oddities (GPL + a BSD
        disclaimer?) that are being unearthed, with the goal for the whole
        kernel to be cleaned up.
      
        These diffstats are not small, 3840 files are touched, over 10k lines
        removed in just 24 patches"
      
      * tag 'spdx-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (24 commits)
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 25
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 24
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 23
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 22
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 21
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 20
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 19
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 18
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 17
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 15
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 14
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 13
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 12
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 11
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 10
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 9
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 7
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 5
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 4
        treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 3
        ...
      2c1212de
    • L
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d53e860f
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
      
       - Two long-standing bugs in the powerpc assembly of vmx
      
       - Stack overrun caused by HASH_MAX_DESCSIZE being too small
      
       - Regression in caam
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: vmx - ghash: do nosimd fallback manually
        crypto: vmx - CTR: always increment IV as quadword
        crypto: hash - fix incorrect HASH_MAX_DESCSIZE
        crypto: caam - fix typo in i.MX6 devices list for errata
      d53e860f
  3. 21 5月, 2019 27 次提交
  4. 20 5月, 2019 5 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 78e03651
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:1) Use after free in __dev_map_entry_free(), from Eric Dumazet.
      
       1) Use after free in __dev_map_entry_free(), from Eric Dumazet.
      
       2) Fix TCP retransmission timestamps on passive Fast Open, from Yuchung
          Cheng.
      
       3) Orphan NFC, we'll take the patches directly into my tree. From
          Johannes Berg.
      
       4) We can't recycle cloned TCP skbs, from Eric Dumazet.
      
       5) Some flow dissector bpf test fixes, from Stanislav Fomichev.
      
       6) Fix RCU marking and warnings in rhashtable, from Herbert Xu.
      
       7) Fix some potential fib6 leaks, from Eric Dumazet.
      
       8) Fix a _decode_session4 uninitialized memory read bug fix that got
          lost in a merge. From Florian Westphal.
      
       9) Fix ipv6 source address routing wrt. exception route entries, from
          Wei Wang.
      
      10) The netdev_xmit_more() conversion was not done %100 properly in mlx5
          driver, fix from Tariq Toukan.
      
      11) Clean up botched merge on netfilter kselftest, from Florian
          Westphal.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (74 commits)
        of_net: fix of_get_mac_address retval if compiled without CONFIG_OF
        net: fix kernel-doc warnings for socket.c
        net: Treat sock->sk_drops as an unsigned int when printing
        kselftests: netfilter: fix leftover net/net-next merge conflict
        mlxsw: core: Prevent reading unsupported slave address from SFP EEPROM
        mlxsw: core: Prevent QSFP module initialization for old hardware
        vsock/virtio: Initialize core virtio vsock before registering the driver
        net/mlx5e: Fix possible modify header actions memory leak
        net/mlx5e: Fix no rewrite fields with the same match
        net/mlx5e: Additional check for flow destination comparison
        net/mlx5e: Add missing ethtool driver info for representors
        net/mlx5e: Fix number of vports for ingress ACL configuration
        net/mlx5e: Fix ethtool rxfh commands when CONFIG_MLX5_EN_RXNFC is disabled
        net/mlx5e: Fix wrong xmit_more application
        net/mlx5: Fix peer pf disable hca command
        net/mlx5: E-Switch, Correct type to u16 for vport_num and int for vport_index
        net/mlx5: Add meaningful return codes to status_to_err function
        net/mlx5: Imply MLXFW in mlx5_core
        Revert "tipc: fix modprobe tipc failed after switch order of device registration"
        vsock/virtio: free packets during the socket release
        ...
      78e03651
    • N
      kbuild: drop support for cc-ldoption · 055efab3
      Nick Desaulniers 提交于
      If you want to see if your linker supports a certain flag, then ask the
      linker directly with ld-option (not the compiler with cc-ldoption).
      Checking for linker flag support is an antipattern that complicates the
      usage of various linkers other than bfd via -fuse-ld={bfd|gold|lld}.
      
      Cc: clang-built-linux@googlegroups.com
      Suggested-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      Signed-off-by: NNick Desaulniers <ndesaulniers@google.com>
      Signed-off-by: NMasahiro Yamada <yamada.masahiro@socionext.com>
      055efab3
    • L
      Linux 5.2-rc1 · a188339c
      Linus Torvalds 提交于
      a188339c
    • L
      Merge tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · 2e2c1220
      Linus Torvalds 提交于
      Pull UBIFS fixes from Richard Weinberger:
      
       - build errors wrt xattrs
      
       - mismerge which lead to a wrong Kconfig ifdef
      
       - missing endianness conversion
      
      * tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
        ubifs: Convert xattr inum to host order
        ubifs: Use correct config name for encryption
        ubifs: Fix build error without CONFIG_UBIFS_FS_XATTR
      2e2c1220
    • L
      Merge branch 'akpm' (patches from Andrew) · cb6f8739
      Linus Torvalds 提交于
      Merge yet more updates from Andrew Morton:
       "A few final bits:
      
         - large changes to vmalloc, yielding large performance benefits
      
         - tweak the console-flush-on-panic code
      
         - a few fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        panic: add an option to replay all the printk message in buffer
        initramfs: don't free a non-existent initrd
        fs/writeback.c: use rcu_barrier() to wait for inflight wb switches going into workqueue when umount
        mm/compaction.c: correct zone boundary handling when isolating pages from a pageblock
        mm/vmap: add DEBUG_AUGMENT_LOWEST_MATCH_CHECK macro
        mm/vmap: add DEBUG_AUGMENT_PROPAGATE_CHECK macro
        mm/vmalloc.c: keep track of free blocks for vmap allocation
      cb6f8739