1. 15 Apr, 2021 9 commits
    • Wan Jiabing's avatar
      ubi: Remove unnecessary struct declaration · 9a29f7f0
      Wan Jiabing authored
      struct ubi_wl_entry is defined at 178th line.
      The declaration here is unnecessary. Remove it.
      Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
      Signed-off-by: default avatarWan Jiabing <wanjiabing@vivo.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      9a29f7f0
    • Joel Stanley's avatar
      jffs2: Hook up splice_write callback · 42984af0
      Joel Stanley authored
      overlayfs using jffs2 as the upper filesystem would fail in some cases
      since moving to v5.10. The test case used was to run 'touch' on a file
      that exists in the lower fs, causing the modification time to be
      updated. It returns EINVAL when the bug is triggered.
      
      A bisection showed this was introduced in v5.9-rc1, with commit
      36e2c742 ("fs: don't allow splice read/write without explicit ops").
      Reverting that commit restores the expected behaviour.
      
      Some digging showed that this was due to jffs2 lacking an implementation
      of splice_write. (For unknown reasons the warn_unsupported that should
      trigger was not displaying any output).
      
      Adding this patch resolved the issue and the test now passes.
      
      Cc: stable@vger.kernel.org
      Fixes: 36e2c742 ("fs: don't allow splice read/write without explicit ops")
      Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
      Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
      Tested-by: default avatarLei YU <yulei.sh@bytedance.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      42984af0
    • Arnd Bergmann's avatar
      jffs2: avoid Wempty-body warnings · 81af4b7b
      Arnd Bergmann authored
      Building with W=1 shows a few warnings for empty macros:
      
      fs/jffs2/scan.c: In function 'jffs2_scan_xattr_node':
      fs/jffs2/scan.c:378:66: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
        378 |                 jffs2_sum_add_xattr_mem(s, rx, ofs - jeb->offset);
            |                                                                  ^
      fs/jffs2/scan.c: In function 'jffs2_scan_xref_node':
      fs/jffs2/scan.c:434:65: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
        434 |                 jffs2_sum_add_xref_mem(s, rr, ofs - jeb->offset);
            |                                                                 ^
      fs/jffs2/scan.c: In function 'jffs2_scan_eraseblock':
      fs/jffs2/scan.c:893:88: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
        893 |                                 jffs2_sum_add_padding_mem(s, je32_to_cpu(node->totlen));
            |                                                                                        ^
      
      Change all these macros to 'do { } while (0)' statements to avoid the
      warnings and make the code a little more robust.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      81af4b7b
    • lizhe's avatar
      jffs2: Fix kasan slab-out-of-bounds problem · 960b9a8a
      lizhe authored
      KASAN report a slab-out-of-bounds problem. The logs are listed below.
      It is because in function jffs2_scan_dirent_node, we alloc "checkedlen+1"
      bytes for fd->name and we check crc with length rd->nsize. If checkedlen
      is less than rd->nsize, it will cause the slab-out-of-bounds problem.
      
      jffs2: Dirent at *** has zeroes in name. Truncating to %d char
      ==================================================================
      BUG: KASAN: slab-out-of-bounds in crc32_le+0x1ce/0x260 at addr ffff8800842cf2d1
      Read of size 1 by task test_JFFS2/915
      =============================================================================
      BUG kmalloc-64 (Tainted: G    B      O   ): kasan: bad access detected
      -----------------------------------------------------------------------------
      INFO: Allocated in jffs2_alloc_full_dirent+0x2a/0x40 age=0 cpu=1 pid=915
      	___slab_alloc+0x580/0x5f0
      	__slab_alloc.isra.24+0x4e/0x64
      	__kmalloc+0x170/0x300
      	jffs2_alloc_full_dirent+0x2a/0x40
      	jffs2_scan_eraseblock+0x1ca4/0x3b64
      	jffs2_scan_medium+0x285/0xfe0
      	jffs2_do_mount_fs+0x5fb/0x1bbc
      	jffs2_do_fill_super+0x245/0x6f0
      	jffs2_fill_super+0x287/0x2e0
      	mount_mtd_aux.isra.0+0x9a/0x144
      	mount_mtd+0x222/0x2f0
      	jffs2_mount+0x41/0x60
      	mount_fs+0x63/0x230
      	vfs_kern_mount.part.6+0x6c/0x1f4
      	do_mount+0xae8/0x1940
      	SyS_mount+0x105/0x1d0
      INFO: Freed in jffs2_free_full_dirent+0x22/0x40 age=27 cpu=1 pid=915
      	__slab_free+0x372/0x4e4
      	kfree+0x1d4/0x20c
      	jffs2_free_full_dirent+0x22/0x40
      	jffs2_build_remove_unlinked_inode+0x17a/0x1e4
      	jffs2_do_mount_fs+0x1646/0x1bbc
      	jffs2_do_fill_super+0x245/0x6f0
      	jffs2_fill_super+0x287/0x2e0
      	mount_mtd_aux.isra.0+0x9a/0x144
      	mount_mtd+0x222/0x2f0
      	jffs2_mount+0x41/0x60
      	mount_fs+0x63/0x230
      	vfs_kern_mount.part.6+0x6c/0x1f4
      	do_mount+0xae8/0x1940
      	SyS_mount+0x105/0x1d0
      	entry_SYSCALL_64_fastpath+0x1e/0x97
      Call Trace:
       [<ffffffff815befef>] dump_stack+0x59/0x7e
       [<ffffffff812d1d65>] print_trailer+0x125/0x1b0
       [<ffffffff812d82c8>] object_err+0x34/0x40
       [<ffffffff812dadef>] kasan_report.part.1+0x21f/0x534
       [<ffffffff81132401>] ? vprintk+0x2d/0x40
       [<ffffffff815f1ee2>] ? crc32_le+0x1ce/0x260
       [<ffffffff812db41a>] kasan_report+0x26/0x30
       [<ffffffff812d9fc1>] __asan_load1+0x3d/0x50
       [<ffffffff815f1ee2>] crc32_le+0x1ce/0x260
       [<ffffffff814764ae>] ? jffs2_alloc_full_dirent+0x2a/0x40
       [<ffffffff81485cec>] jffs2_scan_eraseblock+0x1d0c/0x3b64
       [<ffffffff81488813>] ? jffs2_scan_medium+0xccf/0xfe0
       [<ffffffff81483fe0>] ? jffs2_scan_make_ino_cache+0x14c/0x14c
       [<ffffffff812da3e9>] ? kasan_unpoison_shadow+0x35/0x50
       [<ffffffff812da3e9>] ? kasan_unpoison_shadow+0x35/0x50
       [<ffffffff812da462>] ? kasan_kmalloc+0x5e/0x70
       [<ffffffff812d5d90>] ? kmem_cache_alloc_trace+0x10c/0x2cc
       [<ffffffff818169fb>] ? mtd_point+0xf7/0x130
       [<ffffffff81487dc9>] jffs2_scan_medium+0x285/0xfe0
       [<ffffffff81487b44>] ? jffs2_scan_eraseblock+0x3b64/0x3b64
       [<ffffffff812da3e9>] ? kasan_unpoison_shadow+0x35/0x50
       [<ffffffff812da3e9>] ? kasan_unpoison_shadow+0x35/0x50
       [<ffffffff812da462>] ? kasan_kmalloc+0x5e/0x70
       [<ffffffff812d57df>] ? __kmalloc+0x12b/0x300
       [<ffffffff812da462>] ? kasan_kmalloc+0x5e/0x70
       [<ffffffff814a2753>] ? jffs2_sum_init+0x9f/0x240
       [<ffffffff8148b2ff>] jffs2_do_mount_fs+0x5fb/0x1bbc
       [<ffffffff8148ad04>] ? jffs2_del_noinode_dirent+0x640/0x640
       [<ffffffff812da462>] ? kasan_kmalloc+0x5e/0x70
       [<ffffffff81127c5b>] ? __init_rwsem+0x97/0xac
       [<ffffffff81492349>] jffs2_do_fill_super+0x245/0x6f0
       [<ffffffff81493c5b>] jffs2_fill_super+0x287/0x2e0
       [<ffffffff814939d4>] ? jffs2_parse_options+0x594/0x594
       [<ffffffff81819bea>] mount_mtd_aux.isra.0+0x9a/0x144
       [<ffffffff81819eb6>] mount_mtd+0x222/0x2f0
       [<ffffffff814939d4>] ? jffs2_parse_options+0x594/0x594
       [<ffffffff81819c94>] ? mount_mtd_aux.isra.0+0x144/0x144
       [<ffffffff81258757>] ? free_pages+0x13/0x1c
       [<ffffffff814fa0ac>] ? selinux_sb_copy_data+0x278/0x2e0
       [<ffffffff81492b35>] jffs2_mount+0x41/0x60
       [<ffffffff81302fb7>] mount_fs+0x63/0x230
       [<ffffffff8133755f>] ? alloc_vfsmnt+0x32f/0x3b0
       [<ffffffff81337f2c>] vfs_kern_mount.part.6+0x6c/0x1f4
       [<ffffffff8133ceec>] do_mount+0xae8/0x1940
       [<ffffffff811b94e0>] ? audit_filter_rules.constprop.6+0x1d10/0x1d10
       [<ffffffff8133c404>] ? copy_mount_string+0x40/0x40
       [<ffffffff812cbf78>] ? alloc_pages_current+0xa4/0x1bc
       [<ffffffff81253a89>] ? __get_free_pages+0x25/0x50
       [<ffffffff81338993>] ? copy_mount_options.part.17+0x183/0x264
       [<ffffffff8133e3a9>] SyS_mount+0x105/0x1d0
       [<ffffffff8133e2a4>] ? copy_mnt_ns+0x560/0x560
       [<ffffffff810e8391>] ? msa_space_switch_handler+0x13d/0x190
       [<ffffffff81be184a>] entry_SYSCALL_64_fastpath+0x1e/0x97
       [<ffffffff810e9274>] ? msa_space_switch+0xb0/0xe0
      Memory state around the buggy address:
       ffff8800842cf180: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
       ffff8800842cf200: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
      >ffff8800842cf280: fc fc fc fc fc fc 00 00 00 00 01 fc fc fc fc fc
                                                       ^
       ffff8800842cf300: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
       ffff8800842cf380: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
      ==================================================================
      
      Cc: stable@vger.kernel.org
      Reported-by: default avatarKunkun Xu <xukunkun1@huawei.com>
      Signed-off-by: default avatarlizhe <lizhe67@huawei.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      960b9a8a
    • Gustavo A. R. Silva's avatar
      ubi: Fix fall-through warnings for Clang · 8aa058d7
      Gustavo A. R. Silva authored
      In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
      by explicitly adding a break statement instead of letting the code fall
      through to the next case.
      
      Link: https://github.com/KSPP/linux/issues/115Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      8aa058d7
    • Martin Devera's avatar
      ubifs: Report max LEB count at mount time · 829ad58a
      Martin Devera authored
      There is no other way to directly report/query this
      quantity. It is useful when planing how given filesystem
      can be resized.
      Signed-off-by: default avatarMartin Devera <devik@eaxlabs.cz>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      829ad58a
    • Steffen Trumtrar's avatar
      ubifs: Set s_uuid in super block to support ima/evm uuid options · af61e7bf
      Steffen Trumtrar authored
      This is required to provide uuid based integrity functionality for:
      ima_policy (fsuuid option) and the 'evmctl' command ('--uuid' option).
      Co-developed-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
      Co-developed-by: default avatarJuergen Borleis <jbe@pengutronix.de>
      Signed-off-by: default avatarSteffen Trumtrar <s.trumtrar@pengutronix.de>
      Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      af61e7bf
    • Rui Salvaterra's avatar
      ubifs: Default to zstd compression · ba4884a6
      Rui Salvaterra authored
      Compared to lzo and zlib, zstd is the best all-around performer, both in terms
      of speed and compression ratio. Set it as the default, if available.
      Signed-off-by: default avatarRui Salvaterra <rsalvaterra@gmail.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      ba4884a6
    • Guochun Mao's avatar
      ubifs: Only check replay with inode type to judge if inode linked · 3e903315
      Guochun Mao authored
      Conside the following case, it just write a big file into flash,
      when complete writing, delete the file, and then power off promptly.
      Next time power on, we'll get a replay list like:
      ...
      LEB 1105:211344 len 4144 deletion 0 sqnum 428783 key type 1 inode 80
      LEB 15:233544 len 160 deletion 1 sqnum 428785 key type 0 inode 80
      LEB 1105:215488 len 4144 deletion 0 sqnum 428787 key type 1 inode 80
      ...
      In the replay list, data nodes' deletion are 0, and the inode node's
      deletion is 1. In current logic, the file's dentry will be removed,
      but inode and the flash space it occupied will be reserved.
      User will see that much free space been disappeared.
      
      We only need to check the deletion value of the following inode type
      node of the replay entry.
      
      Fixes: e58725d5 ("ubifs: Handle re-linking of inodes correctly while recovery")
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarGuochun Mao <guochun.mao@mediatek.com>
      Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
      3e903315
  2. 11 Apr, 2021 4 commits
  3. 10 Apr, 2021 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-5.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu · 52e44129
      Linus Torvalds authored
      Pull percpu fix from Dennis Zhou:
       "This contains a fix for sporadically failing atomic percpu
        allocations.
      
        I only caught it recently while I was reviewing a new series [1] and
        simultaneously saw reports by btrfs in xfstests [2] and [3].
      
        In v5.9, memcg accounting was extended to percpu done by adding a
        second type of chunk. I missed an interaction with the free page float
        count used to ensure we can support atomic allocations. If one type of
        chunk has no free pages, but the other has enough to satisfy the free
        page float requirement, we will not repopulate the free pages for the
        former type of chunk. This led to the sporadically failing atomic
        allocations"
      
      Link: https://lore.kernel.org/linux-mm/20210324190626.564297-1-guro@fb.com/ [1]
      Link: https://lore.kernel.org/linux-mm/20210401185158.3275.409509F4@e16-tech.com/ [2]
      Link: https://lore.kernel.org/linux-mm/CAL3q7H5RNBjCi708GH7jnczAOe0BLnacT9C+OBgA-Dx9jhB6SQ@mail.gmail.com/ [3]
      
      * 'for-5.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
        percpu: make pcpu_nr_empty_pop_pages per chunk type
      52e44129
    • Linus Torvalds's avatar
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · efc2da92
      Linus Torvalds authored
      Pull SCSI fixes from James Bottomley:
       "Seven fixes, all in drivers.
      
        The hpsa three are the most extensive and the most problematic: it's a
        packed structure misalignment that oopses on ia64 but looks like it
        would also oops on quite a few non-x86 architectures.
      
        The pm80xx is a regression and the rest are bug fixes for patches in
        the misc tree"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state
        scsi: target: iscsi: Fix zero tag inside a trace event
        scsi: pm80xx: Fix chip initialization failure
        scsi: ufs: core: Fix wrong Task Tag used in task management request UPIUs
        scsi: ufs: core: Fix task management request completion timeout
        scsi: hpsa: Add an assert to prevent __packed reintroduction
        scsi: hpsa: Fix boot on ia64 (atomic_t alignment)
        scsi: hpsa: Use __packed on individual structs, not header-wide
      efc2da92
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 95c7b075
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Some some more powerpc fixes for 5.12:
      
         - Fix an oops triggered by ptrace when CONFIG_PPC_FPU_REGS=n
      
         - Fix an oops on sigreturn when the VDSO is unmapped on 32-bit
      
         - Fix vdso_wrapper.o not being rebuilt everytime vdso.so is rebuilt
      
        Thanks to Christophe Leroy"
      
      * tag 'powerpc-5.12-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/vdso: Make sure vdso_wrapper.o is rebuilt everytime vdso.so is rebuilt
        powerpc/signal32: Fix Oops on sigreturn with unmapped VDSO
        powerpc/ptrace: Don't return error when getting/setting FP regs without CONFIG_PPC_FPU_REGS
      95c7b075
    • Linus Torvalds's avatar
      Merge tag 'driver-core-5.12-rc7' of... · d5fa1dad
      Linus Torvalds authored
      Merge tag 'driver-core-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fix from Greg KH:
       "Here is a single driver core fix for 5.12-rc7 to resolve a reported
        problem that caused some devices to lockup when booting. It has been
        in linux-next with no reported issues"
      
      * tag 'driver-core-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        driver core: Fix locking bug in deferred_probe_timeout_work_func()
      d5fa1dad
    • Linus Torvalds's avatar
      Merge tag 'usb-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 445e09e7
      Linus Torvalds authored
      Pull USB/Thunderbolt fixes from Greg KH:
       "Here are a few small USB and Thunderbolt driver fixes for 5.12-rc7 for
        reported issues:
      
         - thunderbolt leaks and off-by-one fix
      
         - cdnsp deque fix
      
         - usbip fixes for syzbot-reported issues
      
        All have been in linux-next with no reported problems"
      
      * tag 'usb-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usbip: synchronize event handler with sysfs code paths
        usbip: vudc synchronize sysfs code paths
        usbip: stub-dev synchronize sysfs code paths
        usbip: add sysfs_lock to synchronize sysfs code paths
        thunderbolt: Fix off by one in tb_port_find_retimer()
        thunderbolt: Fix a leak in tb_retimer_add()
        usb: cdnsp: Fixes issue with dequeuing requests after disabling endpoint
      445e09e7
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 12a0cf72
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "A mixture of driver and documentation bugfixes for I2C"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: imx: mention Oleksij as maintainer of the binding docs
        i2c: exynos5: correct top kerneldoc
        i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
        i2c: hix5hd2: use the correct HiSilicon copyright
        i2c: gpio: update email address in binding docs
        i2c: imx: drop me as maintainer of binding docs
        i2c: stm32f4: Mundane typo fix
        I2C: JZ4780: Fix bug for Ingenic X1000.
        i2c: turn recovery error on init to debug
      12a0cf72
    • Naohiro Aota's avatar
      btrfs: zoned: move superblock logging zone location · 53b74fa9
      Naohiro Aota authored
      Moves the location of the superblock logging zones. The new locations of
      the logging zones are now determined based on fixed block addresses
      instead of on fixed zone numbers.
      
      The old placement method based on fixed zone numbers causes problems when
      one needs to inspect a file system image without access to the drive zone
      information. In such case, the super block locations cannot be reliably
      determined as the zone size is unknown. By locating the superblock logging
      zones using fixed addresses, we can scan a dumped file system image without
      the zone information since a super block copy will always be present at or
      after the fixed known locations.
      
      Introduce the following three pairs of zones containing fixed offset
      locations, regardless of the device zone size.
      
        - primary superblock: offset   0B (and the following zone)
        - first copy:         offset 512G (and the following zone)
        - Second copy:        offset   4T (4096G, and the following zone)
      
      If a logging zone is outside of the disk capacity, we do not record the
      superblock copy.
      
      The first copy position is much larger than for a non-zoned filesystem,
      which is at 64M.  This is to avoid overlapping with the log zones for
      the primary superblock. This higher location is arbitrary but allows
      supporting devices with very large zone sizes, plus some space around in
      between.
      
      Such large zone size is unrealistic and very unlikely to ever be seen in
      real devices. Currently, SMR disks have a zone size of 256MB, and we are
      expecting ZNS drives to be in the 1-4GB range, so this limit gives us
      room to breathe. For now, we only allow zone sizes up to 8GB. The
      maximum zone size that would still fit in the space is 256G.
      
      The fixed location addresses are somewhat arbitrary, with the intent of
      maintaining superblock reliability for smaller and larger devices, with
      the preference for the latter. For this reason, there are two superblocks
      under the first 1T. This should cover use cases for physical devices and
      for emulated/device-mapper devices.
      
      The superblock logging zones are reserved for superblock logging and
      never used for data or metadata blocks. Note that we only reserve the
      two zones per primary/copy actually used for superblock logging. We do
      not reserve the ranges of zones possibly containing superblocks with the
      largest supported zone size (0-16GB, 512G-528GB, 4096G-4112G).
      
      The zones containing the fixed location offsets used to store
      superblocks on a non-zoned volume are also reserved to avoid confusion.
      Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
      Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
      53b74fa9
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · d4961772
      Linus Torvalds authored
      Pull clk fixes from Stephen Boyd:
       "Here's the latest pile of clk driver and clk framework fixes for this
        release:
      
         - Two clk framework fixes for a long standing issue in
           clk_notifier_{register,unregister}() where we used a pointer that
           was for a struct containing a list head when there was no container
           struct
      
         - A compile warning fix for socfpga that's good to have
      
         - A double free problem with devm registered fixed factor clks
      
         - One last fix to the Qualcomm camera clk driver to use the right clk
           ops so clks don't get stuck and stop working because the firmware
           takes them for a ride"
      
      * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: fixed: fix double free in resource managed fixed-factor clock
        clk: fix invalid usage of list cursor in unregister
        clk: fix invalid usage of list cursor in register
        clk: qcom: camcc: Update the clock ops for the SC7180
        clk: socfpga: fix iomem pointer cast on 64-bit
      d4961772
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-fixes-for-v5.12-2020-04-09' of... · 9288e1f7
      Linus Torvalds authored
      Merge tag 'perf-tools-fixes-for-v5.12-2020-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull perf tool fixes from Arnaldo Carvalho de Melo:
      
       - Fix wrong LBR block sorting in 'perf report'
      
       - Fix 'perf inject' repipe usage when consuming perf.data files
      
       - Avoid potential buffer overrun when decoding ARM SPE hardware tracing
         packets, bug found using a fuzzer
      
      * tag 'perf-tools-fixes-for-v5.12-2020-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
        perf arm-spe: Avoid potential buffer overrun
        perf report: Fix wrong LBR block sorting
        perf inject: Fix repipe usage
      9288e1f7
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · adb2c417
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton:
       "14 patches.
      
        Subsystems affected by this patch series: mm (kasan, gup, pagecache,
        and kfence), MAINTAINERS, mailmap, nds32, gcov, ocfs2, ia64, and lib"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS
        kfence, x86: fix preemptible warning on KPTI-enabled systems
        lib/test_kasan_module.c: suppress unused var warning
        kasan: fix conflict with page poisoning
        fs: direct-io: fix missing sdio->boundary
        ia64: fix user_stack_pointer() for ptrace()
        ocfs2: fix deadlock between setattr and dio_end_io_write
        gcov: re-fix clang-11+ support
        nds32: flush_dcache_page: use page_mapping_file to avoid races with swapoff
        mm/gup: check page posion status for coredump.
        .mailmap: fix old email addresses
        mailmap: update email address for Jordan Crouse
        treewide: change my e-mail address, fix my name
        MAINTAINERS: update CZ.NIC's Turris information
      adb2c417
  4. 09 Apr, 2021 17 commits