1. 18 Oct, 2020 29 commits
  2. 17 Oct, 2020 5 commits
    • Linus Torvalds's avatar
      Merge tag 'perf-tools-for-v5.10-2020-10-15' of... · 9d9af100
      Linus Torvalds authored
      Merge tag 'perf-tools-for-v5.10-2020-10-15' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull perf tools updates from Arnaldo Carvalho de Melo:
      
       - cgroup improvements for 'perf stat', allowing for compact
         specification of events and cgroups in the command line.
      
       - Support per thread topdown metrics in 'perf stat'.
      
       - Support sample-read topdown metric group in 'perf record'
      
       - Show start of latency in addition to its start in 'perf sched
         latency'.
      
       - Add min, max to 'perf script' futex-contention output, in addition to
         avg.
      
       - Allow usage of 'perf_event_attr->exclusive' attribute via the new
         ':e' event modifier.
      
       - Add 'snapshot' command to 'perf record --control', using it with
         Intel PT.
      
       - Support FIFO file names as alternative options to 'perf record
         --control'.
      
       - Introduce branch history "streams", to compare 'perf record' runs
         with 'perf diff' based on branch records and report hot streams.
      
       - Support PE executable symbol tables using libbfd, to profile, for
         instance, wine binaries.
      
       - Add filter support for option 'perf ftrace -F/--funcs'.
      
       - Allow configuring the 'disassembler_style' 'perf annotate' knob via
         'perf config'
      
       - Update CascadelakeX and SkylakeX JSON vendor events files.
      
       - Add support for parsing perchip/percore JSON vendor events.
      
       - Add power9 hv_24x7 core level metric events.
      
       - Add L2 prefetch, ITLB instruction fetch hits JSON events for AMD
         zen1.
      
       - Enable Family 19h users by matching Zen2 AMD vendor events.
      
       - Use debuginfod in 'perf probe' when required debug files not found
         locally.
      
       - Display negative tid in non-sample events in 'perf script'.
      
       - Make GTK2 support opt-in
      
       - Add build test with GTK+
      
       - Add missing -lzstd to the fast path feature detection
      
       - Add scripts to auto generate 'mmap', 'mremap' string<->id tables for
         use in 'perf trace'.
      
       - Show python test script in verbose mode.
      
       - Fix uncore metric expressions
      
       - Msan uninitialized use fixes.
      
       - Use condition variables in 'perf bench numa'
      
       - Autodetect python3 binary in systems without python2.
      
       - Support md5 build ids in addition to sha1.
      
       - Add build id 'perf test' regression test.
      
       - Fix printable strings in python3 scripts.
      
       - Fix off by ones in 'perf trace' in arches using libaudit.
      
       - Fix JSON event code for events referencing std arch events.
      
       - Introduce 'perf test' shell script for Arm CoreSight testing.
      
       - Add rdtsc() for Arm64 for used in the PERF_RECORD_TIME_CONV metadata
         event and in 'perf test tsc'.
      
       - 'perf c2c' improvements: Add "RMT Load Hit" metric, "Total Stores",
         fixes and documentation update.
      
       - Fix usage of reloc_sym in 'perf probe' when using both kallsyms and
         debuginfo files.
      
       - Do not print 'Metric Groups:' unnecessarily in 'perf list'
      
       - Refcounting fixes in the event parsing code.
      
       - Add expand cgroup event 'perf test' entry.
      
       - Fix out of bounds CPU map access when handling armv8_pmu events in
         'perf stat'.
      
       - Add build-id injection 'perf bench' benchmark.
      
       - Enter namespace when reading build-id in 'perf inject'.
      
       - Do not load map/dso when injecting build-id speeding up the 'perf
         inject' process.
      
       - Add --buildid-all option to avoid processing all samples, just the
         mmap metadata events.
      
       - Add feature test to check if libbfd has buildid support
      
       - Add 'perf test' entry for PE binary format support.
      
       - Fix typos in power8 PMU vendor events JSON files.
      
       - Hide libtraceevent non API functions.
      
      * tag 'perf-tools-for-v5.10-2020-10-15' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (113 commits)
        perf c2c: Update documentation for metrics reorganization
        perf c2c: Add metrics "RMT Load Hit"
        perf c2c: Correct LLC load hit metrics
        perf c2c: Change header for LLC local hit
        perf c2c: Use more explicit headers for HITM
        perf c2c: Change header from "LLC Load Hitm" to "Load Hitm"
        perf c2c: Organize metrics based on memory hierarchy
        perf c2c: Display "Total Stores" as a standalone metrics
        perf c2c: Display the total numbers continuously
        perf bench: Use condition variables in numa.
        perf jevents: Fix event code for events referencing std arch events
        perf diff: Support hot streams comparison
        perf streams: Report hot streams
        perf streams: Calculate the sum of total streams hits
        perf streams: Link stream pair
        perf streams: Compare two streams
        perf streams: Get the evsel_streams by evsel_idx
        perf streams: Introduce branch history "streams"
        perf intel-pt: Improve PT documentation slightly
        perf tools: Add support for exclusive groups/events
        ...
      9d9af100
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma · a1e16bc7
      Linus Torvalds authored
      Pull rdma updates from Jason Gunthorpe:
       "A usual cycle for RDMA with a typical mix of driver and core subsystem
        updates:
      
         - Driver minor changes and bug fixes for mlx5, efa, rxe, vmw_pvrdma,
           hns, usnic, qib, qedr, cxgb4, hns, bnxt_re
      
         - Various rtrs fixes and updates
      
         - Bug fix for mlx4 CM emulation for virtualization scenarios where
           MRA wasn't working right
      
         - Use tracepoints instead of pr_debug in the CM code
      
         - Scrub the locking in ucma and cma to close more syzkaller bugs
      
         - Use tasklet_setup in the subsystem
      
         - Revert the idea that 'destroy' operations are not allowed to fail
           at the driver level. This proved unworkable from a HW perspective.
      
         - Revise how the umem API works so drivers make fewer mistakes using
           it
      
         - XRC support for qedr
      
         - Convert uverbs objects RWQ and MW to new the allocation scheme
      
         - Large queue entry sizes for hns
      
         - Use hmm_range_fault() for mlx5 On Demand Paging
      
         - uverbs APIs to inspect the GID table instead of sysfs
      
         - Move some of the RDMA code for building large page SGLs into
           lib/scatterlist"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (191 commits)
        RDMA/ucma: Fix use after free in destroy id flow
        RDMA/rxe: Handle skb_clone() failure in rxe_recv.c
        RDMA/rxe: Move the definitions for rxe_av.network_type to uAPI
        RDMA: Explicitly pass in the dma_device to ib_register_device
        lib/scatterlist: Do not limit max_segment to PAGE_ALIGNED values
        IB/mlx4: Convert rej_tmout radix-tree to XArray
        RDMA/rxe: Fix bug rejecting all multicast packets
        RDMA/rxe: Fix skb lifetime in rxe_rcv_mcast_pkt()
        RDMA/rxe: Remove duplicate entries in struct rxe_mr
        IB/hfi,rdmavt,qib,opa_vnic: Update MAINTAINERS
        IB/rdmavt: Fix sizeof mismatch
        MAINTAINERS: CISCO VIC LOW LATENCY NIC DRIVER
        RDMA/bnxt_re: Fix sizeof mismatch for allocation of pbl_tbl.
        RDMA/bnxt_re: Use rdma_umem_for_each_dma_block()
        RDMA/umem: Move to allocate SG table from pages
        lib/scatterlist: Add support in dynamic allocation of SG table from pages
        tools/testing/scatterlist: Show errors in human readable form
        tools/testing/scatterlist: Rejuvenate bit-rotten test
        RDMA/ipoib: Set rtnl_link_ops for ipoib interfaces
        RDMA/uverbs: Expose the new GID query API to user space
        ...
      a1e16bc7
    • Linus Torvalds's avatar
      Merge tag 'i3c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux · 2a934b38
      Linus Torvalds authored
      Pull i3c updates from Boris Brezillon:
      
       - Fix DAA for the pre-reserved address case
      
       - Fix an error path in the cadence driver
      
      * tag 'i3c/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
        i3c: master: Fix error return in cdns_i3c_master_probe()
        i3c: master: fix for SETDASA and DAA process
        i3c: master add i3c_master_attach_boardinfo to preserve boardinfo
      2a934b38
    • Linus Torvalds's avatar
      Merge tag 'mtd/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux · 6f78b9ac
      Linus Torvalds authored
      Pull MTD updates from Richard Weinberger:
       "NAND core changes:
         - Drop useless 'depends on' in Kconfig
         - Add an extra level in the Kconfig hierarchy
         - Trivial spellings
         - Dynamic allocation of the interface configurations
         - Dropping the default ONFI timing mode
         - Various cleanup (types, structures, naming, comments)
         - Hide the chip->data_interface indirection
         - Add the generic rb-gpios property
         - Add the ->choose_interface_config() hook
         - Introduce nand_choose_best_sdr_timings()
         - Use default values for tPROG_max and tBERS_max
         - Avoid redefining tR_max and tCCS_min
         - Add a helper to find the closest ONFI mode
         - bcm63xx MTD parsers: simplify CFE detection
      
        Raw NAND controller drivers changes:
         - fsl-upm: Deprecation of specific DT properties
         - fsl_upm: Driver rework and cleanup in favor of ->exec_op()
         - Ingenic: Cleanup ARRAY_SIZE() vs sizeof() use
         - brcmnand: ECC error handling on EDU transfers
         - brcmnand: Don't default to EDU transfers
         - qcom: Set BAM mode only if not set already
         - qcom: Avoid write to unavailable register
         - gpio: Driver rework in favor of ->exec_op()
         - tango: ->exec_op() conversion
         - mtk: ->exec_op() conversion
      
        Raw NAND chip drivers changes:
         - toshiba: Implement ->choose_interface_config() for TH58NVG2S3HBAI4
         - toshiba: Implement ->choose_interface_config() for TC58NVG0S3E
         - toshiba: Implement ->choose_interface_config() for TC58TEG5DCLTA00
         - hynix: Implement ->choose_interface_config() for H27UCG8T2ATR-BC
      
        HyperBus changes:
         - DMA support for TI's AM654 HyperBus controller driver.
         - HyperBus frontend driver for Renesas RPC-IF driver.
      
        SPI NOR core changes:
         - Support for Winbond w25q64jwm flash
         - Enable 4K sector support for mx25l12805d
      
        SPI NOR controller drivers changes:
         - intel-spi Add Alder Lake-S PCI ID
      
        MTD Core changes:
         - mtdoops: Don't run panic write twice
         - mtdconcat: Correctly handle panic write
         - Use DEFINE_SHOW_ATTRIBUTE"
      
      * tag 'mtd/for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (76 commits)
        mtd: hyperbus: Fix build failure when only RPCIF_HYPERBUS is enabled
        mtd: hyperbus: add Renesas RPC-IF driver
        Revert "mtd: spi-nor: Prefer asynchronous probe"
        mtd: parsers: bcm63xx: Do not make it modular
        mtd: spear_smi: Enable compile testing
        mtd: maps: vmu-flash: fix typos for struct memcard
        mtd: physmap: Add Baikal-T1 physically mapped ROM support
        mtd: maps: vmu-flash: simplify the return expression of probe_maple_vmu
        mtd: onenand: simplify the return expression of onenand_transfer_auto_oob
        mtd: rawnand: cadence: remove a redundant dev_err call
        mtd: rawnand: ams-delta: Fix non-OF build warning
        mtd: rawnand: Don't overwrite the error code from nand_set_ecc_soft_ops()
        mtd: rawnand: Introduce nand_set_ecc_on_host_ops()
        mtd: rawnand: atmel: Check return values for nand_read_data_op
        mtd: rawnand: vf610: Remove unused function vf610_nfc_transfer_size()
        mtd: rawnand: qcom: Simplify with dev_err_probe()
        mtd: rawnand: marvell: Fix and update kerneldoc
        mtd: rawnand: marvell: Simplify with dev_err_probe()
        mtd: rawnand: gpmi: Simplify with dev_err_probe()
        mtd: rawnand: atmel: Simplify with dev_err_probe()
        ...
      6f78b9ac
    • Linus Torvalds's avatar
      Merge tag 'thermal-v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · 5a77b6a0
      Linus Torvalds authored
      Pull thermal updates from Daniel Lezcano:
      
       - Fix Kconfig typo "acces" -> "access" (Colin Ian King)
      
       - Use dev_error_probe() to simplify the error handling on imx and imx8
         platforms (Anson Huang)
      
       - Use dedicated kobj_to_dev() instead of container_of() in the sysfs
         core code (Tian Tao)
      
       - Fix coding style by adding braces to a one line conditional statement
         on rcar (Geert Uytterhoeven)
      
       - Add DT binding documentation for the r8a774e1 platform and update the
         Kconfig description supporting RZ/G2 SoCs (Lad Prabhakar)
      
       - Simplify the return expression of stm_thermal_prepare on the stm32
         platform (Qinglang Miao)
      
       - Fix the unit in the function documentation for the idle injection
         cooling device (Zhuguang Qing)
      
       - Remove an unecessary mutex_init() in the core code (Qinglang Miao)
      
       - Add support for keep alive events in the core code and the specific
         int340x (Srinivas Pandruvada)
      
       - Remove unused thermal zone variable in devfreq and cpufreq cooling
         devices (Zhuguang Qing)
      
       - Add the A100's THS controller support (Yangtao Li)
      
       - Add power management on the omap3's bandgap sensor (Adam Ford)
      
       - Fix a missing nlmsg_free in the netlink core error path (Jing
         Xiangfeng)
      
      * tag 'thermal-v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
        thermal: core: Adding missing nlmsg_free() in thermal_genl_sampling_temp()
        thermal: ti-soc-thermal: Enable addition power management
        thermal: sun8i: Add A100's THS controller support
        thermal: sun8i: add TEMP_CALIB_MASK for calibration data in sun50i_h6_ths_calibrate
        dt-bindings: thermal: sun8i: Add binding for A100's THS controller
        thermal: cooling: Remove unused variable *tz
        thermal: int340x: Add keep alive response method
        thermal: core: Add new event for sending keep alive notifications
        thermal: int340x: Provide notification for OEM variable change
        thermal: core: remove unnecessary mutex_init()
        thermal/idle_inject: Fix comment of idle_duration_us and name of latency_ns
        thermal: Kconfig: Update description for RCAR_GEN3_THERMAL config
        thermal: stm32: simplify the return expression of stm_thermal_prepare()
        dt-bindings: thermal: rcar-gen3-thermal: Add r8a774e1 support
        thermal: rcar_thermal: Add missing braces to conditional statement
        thermal: Use kobj_to_dev() instead of container_of()
        thermal: imx8mm: Use dev_err_probe() to simplify error handling
        thermal: imx: Use dev_err_probe() to simplify error handling
        drivers: thermal: Kconfig: fix spelling mistake "acces" -> "access"
      5a77b6a0
  3. 16 Oct, 2020 6 commits
    • Linus Torvalds's avatar
      Merge tag 'ovl-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 071a0578
      Linus Torvalds authored
      Pull overlayfs updates from Miklos Szeredi:
      
       - Improve performance for certain container setups by introducing a
         "volatile" mode
      
       - ioctl improvements
      
       - continue preparation for unprivileged overlay mounts
      
      * tag 'ovl-update-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: use generic vfs_ioc_setflags_prepare() helper
        ovl: support [S|G]ETFLAGS and FS[S|G]ETXATTR ioctls for directories
        ovl: rearrange ovl_can_list()
        ovl: enumerate private xattrs
        ovl: pass ovl_fs down to functions accessing private xattrs
        ovl: drop flags argument from ovl_do_setxattr()
        ovl: adhere to the vfs_ vs. ovl_do_ conventions for xattrs
        ovl: use ovl_do_getxattr() for private xattr
        ovl: fold ovl_getxattr() into ovl_get_redirect_xattr()
        ovl: clean up ovl_getxattr() in copy_up.c
        duplicate ovl_getxattr()
        ovl: provide a mount option "volatile"
        ovl: check for incompatible features in work dir
      071a0578
    • Linus Torvalds's avatar
      Merge tag 'afs-fixes-20201016' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · fad70111
      Linus Torvalds authored
      Pull afs updates from David Howells:
       "A collection of fixes to fix afs_cell struct refcounting, thereby
        fixing a slew of related syzbot bugs:
      
         - Fix the cell tree in the netns to use an rwsem rather than RCU.
      
           There seem to be some problems deriving from the use of RCU and a
           seqlock to walk the rbtree, but it's not entirely clear what since
           there are several different failures being seen.
      
           Changing things to use an rwsem instead makes it more robust. The
           extra performance derived from using RCU isn't necessary in this
           case since the only time we're looking up a cell is during mount or
           when cells are being manually added.
      
         - Fix the refcounting by splitting the usage counter into a memory
           refcount and an active users counter. The usage counter was doing
           double duty, keeping track of whether a cell is still in use and
           keeping track of when it needs to be destroyed - but this makes the
           clean up tricky. Separating these out simplifies the logic.
      
         - Fix purging a cell that has an alias. A cell alias pins the cell
           it's an alias of, but the alias is always later in the list. Trying
           to purge in a single pass causes rmmod to hang in such a case.
      
         - Fix cell removal. If a cell's manager is requeued whilst it's
           removing itself, the manager will run again and re-remove itself,
           causing problems in various places. Follow Hillf Danton's
           suggestion to insert a more terminal state that causes the manager
           to do nothing post-removal.
      
        In additional to the above, two other changes:
      
         - Add a tracepoint for the cell refcount and active users count. This
           helped with debugging the above and may be useful again in future.
      
         - Downgrade an assertion to a print when a still-active server is
           seen during purging. This was happening as a consequence of
           incomplete cell removal before the servers were cleaned up"
      
      * tag 'afs-fixes-20201016' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        afs: Don't assert on unpurgeable server records
        afs: Add tracing for cell refcount and active user count
        afs: Fix cell removal
        afs: Fix cell purging with aliases
        afs: Fix cell refcounting by splitting the usage counter
        afs: Fix rapid cell addition/removal by not using RCU on cells tree
      fad70111
    • Linus Torvalds's avatar
      Merge tag 'f2fs-for-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 7a3daded
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, we've added new features such as zone capacity for ZNS
        and a new GC policy, ATGC, along with in-memory segment management. In
        addition, we could improve the decompression speed significantly by
        changing virtual mapping method. Even though we've fixed lots of small
        bugs in compression support, I feel that it becomes more stable so
        that I could give it a try in production.
      
        Enhancements:
         - suport zone capacity in NVMe Zoned Namespace devices
         - introduce in-memory current segment management
         - add standart casefolding support
         - support age threshold based garbage collection
         - improve decompression speed by changing virtual mapping method
      
        Bug fixes:
         - fix condition checks in some ioctl() such as compression, move_range, etc
         - fix 32/64bits support in data structures
         - fix memory allocation in zstd decompress
         - add some boundary checks to avoid kernel panic on corrupted image
         - fix disallowing compression for non-empty file
         - fix slab leakage of compressed block writes
      
        In addition, it includes code refactoring for better readability and
        minor bug fixes for compression and zoned device support"
      
      * tag 'f2fs-for-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (51 commits)
        f2fs: code cleanup by removing unnecessary check
        f2fs: wait for sysfs kobject removal before freeing f2fs_sb_info
        f2fs: fix writecount false positive in releasing compress blocks
        f2fs: introduce check_swap_activate_fast()
        f2fs: don't issue flush in f2fs_flush_device_cache() for nobarrier case
        f2fs: handle errors of f2fs_get_meta_page_nofail
        f2fs: fix to set SBI_NEED_FSCK flag for inconsistent inode
        f2fs: reject CASEFOLD inode flag without casefold feature
        f2fs: fix memory alignment to support 32bit
        f2fs: fix slab leak of rpages pointer
        f2fs: compress: fix to disallow enabling compress on non-empty file
        f2fs: compress: introduce cic/dic slab cache
        f2fs: compress: introduce page array slab cache
        f2fs: fix to do sanity check on segment/section count
        f2fs: fix to check segment boundary during SIT page readahead
        f2fs: fix uninit-value in f2fs_lookup
        f2fs: remove unneeded parameter in find_in_block()
        f2fs: fix wrong total_sections check and fsmeta check
        f2fs: remove duplicated code in sanity_check_area_boundary
        f2fs: remove unused check on version_bitmap
        ...
      7a3daded
    • Linus Torvalds's avatar
      Merge tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 54a4c789
      Linus Torvalds authored
      Pull documentation updates from Mauro Carvalho Chehab:
       "A series of patches addressing warnings produced by make htmldocs.
        This includes:
      
         - kernel-doc markup fixes
      
         - ReST fixes
      
         - Updates at the build system in order to support newer versions of
           the docs build toolchain (Sphinx)
      
        After this series, the number of html build warnings should reduce
        significantly, and building with Sphinx 3.1 or later should now be
        supported (although it is still recommended to use Sphinx 2.4.4).
      
        As agreed with Jon, I should be sending you a late pull request by the
        end of the merge window addressing remaining issues with docs build,
        as there are a number of warning fixes that depends on pull requests
        that should be happening along the merge window.
      
        The end goal is to have a clean htmldocs build on Kernel 5.10.
      
        PS. It should be noticed that Sphinx 3.0 is not currently supported,
        as it lacks support for C domain namespaces. Such feature, needed in
        order to document uAPI system calls with Sphinx 3.x, was added only on
        Sphinx 3.1"
      
      * tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (75 commits)
        PM / devfreq: remove a duplicated kernel-doc markup
        mm/doc: fix a literal block markup
        workqueue: fix a kernel-doc warning
        docs: virt: user_mode_linux_howto_v2.rst: fix a literal block markup
        Input: sparse-keymap: add a description for @sw
        rcu/tree: docs: document bkvcache new members at struct kfree_rcu_cpu
        nl80211: docs: add a description for s1g_cap parameter
        usb: docs: document altmode register/unregister functions
        kunit: test.h: fix a bad kernel-doc markup
        drivers: core: fix kernel-doc markup for dev_err_probe()
        docs: bio: fix a kerneldoc markup
        kunit: test.h: solve kernel-doc warnings
        block: bio: fix a warning at the kernel-doc markups
        docs: powerpc: syscall64-abi.rst: fix a malformed table
        drivers: net: hamradio: fix document location
        net: appletalk: Kconfig: Fix docs location
        dt-bindings: fix references to files converted to yaml
        memblock: get rid of a :c:type leftover
        math64.h: kernel-docs: Convert some markups into normal comments
        media: uAPI: buffer.rst: remove a left-over documentation
        ...
      54a4c789
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 93f3d8f5
      Linus Torvalds authored
      Pull tracing fix from Steven Rostedt:
       "Fix mismatch section of adding early trace events.
      
        Fixes the issue of a mismatch section that was missed due to gcc
        inlining the offending function, while clang did not (and reported the
        issue)"
      
      * tag 'trace-v5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Remove __init from __trace_early_add_new_event()
      93f3d8f5
    • Linus Torvalds's avatar
      Merge tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux · 8119c433
      Linus Torvalds authored
      Pull printk fix from Petr Mladek:
       "Prevent overflow in the new lockless ringbuffer"
      
      * tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
        printk: ringbuffer: Wrong data pointer when appending small string
      8119c433