1. 14 8月, 2020 7 次提交
    • L
      Merge tag 'docs-5.9-2' of git://git.lwn.net/linux · dddcbc13
      Linus Torvalds 提交于
      Pull documentation fixes from Jonathan Corbet:
       "A handful of obvious fixes that wandered in during the merge window"
      
      * tag 'docs-5.9-2' of git://git.lwn.net/linux:
        Documentation/locking/locktypes: fix the typo
        doc/zh_CN: resolve undefined label warning in admin-guide index
        doc/zh_CN: fix title heading markup in admin-guide cpu-load
        docs: remove the 2.6 "Upgrading I2C Drivers" guide
        docs: Correct the release date of 5.2 stable
        mailmap: Update comments for with format and more detalis
        docs: cdrom: Fix a typo and rst markup
        Doc: admin-guide: use correct legends in kernel-parameters.txt
        Documentation/features: refresh RISC-V arch support files
        documentation: coccinelle: Improve command example for make C={1,2}
        Core-api: Documentation: Replace deprecated :c:func: Usage
        Dev-tools: Documentation: Replace deprecated :c:func: Usage
        Filesystems: Documentation: Replace deprecated :c:func: Usage
        docs: trace: fix a typo
      dddcbc13
    • H
      1edcd467
    • L
      Merge tag 's390-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 990f2273
      Linus Torvalds 提交于
      Pull more s390 updates from Heiko Carstens:
      
       - Allow s390 debug feature to handle finally more than 256 CPU numbers,
         instead of truncating the most significant bits.
      
       - Improve THP splitting required by qemu processes by making use of
         walk_page_vma() instead of calling follow_page() for every single
         page within each vma.
      
       - Add missing ZCRYPT dependency to VFIO_AP to fix potential compile
         problems.
      
       - Remove not required select CLOCKSOURCE_VALIDATE_LAST_CYCLE again.
      
       - Set node distance to LOCAL_DISTANCE instead of 0, since e.g. libnuma
         translates a node distance of 0 to "no NUMA support available".
      
       - Couple of other minor fixes and improvements.
      
      * tag 's390-5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/numa: move code to arch/s390/kernel
        s390/time: remove select CLOCKSOURCE_VALIDATE_LAST_CYCLE again
        s390/debug: debug feature version 3
        s390/Kconfig: add missing ZCRYPT dependency to VFIO_AP
        s390/numa: set node distance to LOCAL_DISTANCE
        s390/pkey: remove redundant variable initialization
        s390/test_unwind: fix possible memleak in test_unwind()
        s390/gmap: improve THP splitting
        s390/atomic: circumvent gcc 10 build regression
      990f2273
    • L
      Merge tag 'for-5.9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 23c2c8c6
      Linus Torvalds 提交于
      Pull more btrfs updates from David Sterba:
       "One minor update, the rest are fixes that have arrived a bit late for
        the first batch. There are also some recent fixes for bugs that were
        discovered during the merge window and pop up during testing.
      
        User visible change:
      
         - show correct subvolume path in /proc/mounts for bind mounts
      
        Fixes:
      
         - fix compression messages when remounting with different level or
           compression algorithm
      
         - tree-log: fix some memory leaks on error handling paths
      
         - restore I_VERSION on remount
      
         - fix return values and error code mixups
      
         - fix umount crash with quotas enabled when removing sysfs files
      
         - fix trim range on a shrunk device"
      
      * tag 'for-5.9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: trim: fix underflow in trim length to prevent access beyond device boundary
        btrfs: fix return value mixup in btrfs_get_extent
        btrfs: sysfs: fix NULL pointer dereference at btrfs_sysfs_del_qgroups()
        btrfs: check correct variable after allocation in btrfs_backref_iter_alloc
        btrfs: make sure SB_I_VERSION doesn't get unset by remount
        btrfs: fix memory leaks after failure to lookup checksums during inode logging
        btrfs: don't show full path of bind mounts in subvol=
        btrfs: fix messages after changing compression level by remount
        btrfs: only search for left_info if there is no right_info in try_merge_free_space
        btrfs: inode: fix NULL pointer dereference if inode doesn't need compression
      23c2c8c6
    • L
      Merge tag 'xfs-5.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 69307ade
      Linus Torvalds 提交于
      Pull xfs fixes from Darrick Wong:
       "Two small fixes that have come in during the past week:
      
         - Fix duplicated words in comments
      
         - Fix an ubsan complaint about null pointer arithmetic"
      
      * tag 'xfs-5.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init
        xfs: delete duplicated words + other fixes
      69307ade
    • L
      Merge tag 'exfat-for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat · ff419b61
      Linus Torvalds 提交于
      Pull exfat updates from Namjae Jeon:
      
       - don't clear MediaFailure and VolumeDirty bit in volume flags if these
         were already set before mounting
      
       - write multiple dirty buffers at once in sync mode
      
       - remove unneeded EXFAT_SB_DIRTY bit set
      
      * tag 'exfat-for-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat:
        exfat: retain 'VolumeFlags' properly
        exfat: optimize exfat_zeroed_cluster()
        exfat: add error check when updating dir-entries
        exfat: write multiple sectors at once
        exfat: remove EXFAT_SB_DIRTY flag
      ff419b61
    • J
      mm: memcontrol: fix warning when allocating the root cgroup · 9f457179
      Johannes Weiner 提交于
      Commit 3e38e0aa ("mm: memcg: charge memcg percpu memory to the
      parent cgroup") adds memory tracking to the memcg kernel structures
      themselves to make cgroups liable for the memory they are consuming
      through the allocation of child groups (which can be significant).
      
      This code is a bit awkward as it's spread out through several functions:
      The outermost function does memalloc_use_memcg(parent) to set up
      current->active_memcg, which designates which cgroup to charge, and the
      inner functions pass GFP_ACCOUNT to request charging for specific
      allocations.  To make sure this dependency is satisfied at all times -
      to make sure we don't randomly charge whoever is calling the functions -
      the inner functions warn on !current->active_memcg.
      
      However, this triggers a false warning when the root memcg itself is
      allocated.  No parent exists in this case, and so current->active_memcg
      is rightfully NULL.  It's a false positive, not indicative of a bug.
      
      Delete the warnings for now, we can revisit this later.
      
      Fixes: 3e38e0aa ("mm: memcg: charge memcg percpu memory to the parent cgroup")
      Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
      Reported-by: NStephen Rothwell <sfr@canb.auug.org.au>
      Acked-by: NRoman Gushchin <guro@fb.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9f457179
  2. 13 8月, 2020 33 次提交