1. 13 9月, 2021 17 次提交
  2. 12 9月, 2021 23 次提交
    • L
      Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost · 78e70952
      Linus Torvalds 提交于
      Pull virtio updates from Michael Tsirkin:
      
       - vduse driver ("vDPA Device in Userspace") supporting emulated virtio
         block devices
      
       - virtio-vsock support for end of record with SEQPACKET
      
       - vdpa: mac and mq support for ifcvf and mlx5
      
       - vdpa: management netlink for ifcvf
      
       - virtio-i2c, gpio dt bindings
      
       - misc fixes and cleanups
      
      * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (39 commits)
        Documentation: Add documentation for VDUSE
        vduse: Introduce VDUSE - vDPA Device in Userspace
        vduse: Implement an MMU-based software IOTLB
        vdpa: Support transferring virtual addressing during DMA mapping
        vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap()
        vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()
        vhost-iotlb: Add an opaque pointer for vhost IOTLB
        vhost-vdpa: Handle the failure of vdpa_reset()
        vdpa: Add reset callback in vdpa_config_ops
        vdpa: Fix some coding style issues
        file: Export receive_fd() to modules
        eventfd: Export eventfd_wake_count to modules
        iova: Export alloc_iova_fast() and free_iova_fast()
        virtio-blk: remove unneeded "likely" statements
        virtio-balloon: Use virtio_find_vqs() helper
        vdpa: Make use of PFN_PHYS/PFN_UP/PFN_DOWN helper macro
        vsock_test: update message bounds test for MSG_EOR
        af_vsock: rename variables in receive loop
        virtio/vsock: support MSG_EOR bit processing
        vhost/vsock: support MSG_EOR bit processing
        ...
      78e70952
    • L
      Merge tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux · b79bd0d5
      Linus Torvalds 提交于
      Pull more RISC-V updates from Palmer Dabbelt:
      
       - A pair of defconfig additions, for NVMe and the EFI filesystem
         localization options.
      
       - A larger address space for stack randomization.
      
       - A cleanup to our install rules.
      
       - A DTS update for the Microchip Icicle board, to fix the serial
         console.
      
       - Support for build-time table sorting, which allows us to have
         __ex_table read-only.
      
      * tag 'riscv-for-linus-5.15-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux:
        riscv: Move EXCEPTION_TABLE to RO_DATA segment
        riscv: Enable BUILDTIME_TABLE_SORT
        riscv: dts: microchip: mpfs-icicle: Fix serial console
        riscv: move the (z)install rules to arch/riscv/Makefile
        riscv: Improve stack randomisation on RV64
        riscv: defconfig: enable NLS_CODEPAGE_437, NLS_ISO8859_1
        riscv: defconfig: enable BLK_DEV_NVME
      b79bd0d5
    • L
      Merge branch 'for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux · 4e1c7544
      Linus Torvalds 提交于
      Pull coccinelle updates from Julia Lawall:
       "These changes update some existing semantic patches with
        respect to some recent changes in the kernel.
      
        Specifically, the change to kvmalloc.cocci searches for
        kfree_sensitive rather than kzfree, and the change to
        use_after_iter.cocci adds list_entry_is_head as a valid
        use of a list iterator index variable after the end of
        the loop"
      
      * 'for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
        scripts: coccinelle: allow list_entry_is_head() to use pos
        coccinelle: api: rename kzfree to kfree_sensitive
      4e1c7544
    • A
      tools headers UAPI: Update tools's copy of drm.h headers · 17a99e52
      Arnaldo Carvalho de Melo 提交于
      Picking the changes from:
      
        17ce9c61 ("drm: document DRM_IOCTL_MODE_RMFB")
      
      Doesn't result in any tooling changes:
      
        $ tools/perf/trace/beauty/drm_ioctl.sh  > before
        $ cp include/uapi/drm/drm.h tools/include/uapi/drm/drm.h
        $ tools/perf/trace/beauty/drm_ioctl.sh  > after
        $ diff -u before after
      
      Silencing these perf build warnings:
      
        Warning: Kernel ABI header at 'tools/include/uapi/drm/drm.h' differs from latest version at 'include/uapi/drm/drm.h'
        diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h
      
      Cc: Simon Ser <contact@emersion.fr>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      17a99e52
    • A
      tools headers UAPI: Sync drm/i915_drm.h with the kernel sources · 4dc24d7c
      Arnaldo Carvalho de Melo 提交于
      To pick the changes in:
      
        b65a9489 ("drm/i915/userptr: Probe existence of backing struct pages upon creation")
        ee242ca7 ("drm/i915/guc: Implement GuC priority management")
        81340cf3 ("drm/i915/uapi: reject set_domain for discrete")
        7961c5b6 ("drm/i915: Add TTM offset argument to mmap.")
        aef7b67a ("drm/i915/uapi: convert drm_i915_gem_userptr to kernel doc")
        e7737b67 ("drm/i915/uapi: reject caching ioctls for discrete")
        3aa8c57f ("drm/i915/uapi: convert drm_i915_gem_set_domain to kernel doc")
        289f5a72 ("drm/i915/uapi: convert drm_i915_gem_caching to kernel doc")
        4a766ae4 ("drm/i915: Drop the CONTEXT_CLONE API (v2)")
        6ff6d61d ("drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP")
        fe4751c3 ("drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE")
        57772953 ("drm/i915: Document the Virtual Engine uAPI")
        c649432e ("drm/i915: Fix busy ioctl commentary")
      
      That doesn't result in any changes to tooling as no new ioctl were
      added (at least not perceived by tools/perf/trace/beauty/drm_ioctl.sh).
      
      Addressing this perf build warning:
      
        Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h' differs from latest version at 'include/uapi/drm/i915_drm.h'
        diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h
      
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Cc: Jason Ekstrand <jason@jlekstrand.net>
      Cc: John Harrison <John.C.Harrison@Intel.com>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Matthew Auld <matthew.auld@intel.com>
      Cc: Matthew Brost <matthew.brost@intel.com>
      Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      4dc24d7c
    • A
      tools headers UAPI: Sync linux/fs.h with the kernel sources · 2bae3e64
      Arnaldo Carvalho de Melo 提交于
      To pick the change in:
      
        7957d93b ("block: add ioctl to read the disk sequence number")
      
      It adds a new ioctl, but we are still not using that to generate tables
      for 'perf trace', so no changes in tooling.
      
      This silences this perf build warning:
      
        Warning: Kernel ABI header at 'tools/include/uapi/linux/fs.h' differs from latest version at 'include/uapi/linux/fs.h'
        diff -u tools/include/uapi/linux/fs.h include/uapi/linux/fs.h
      
      Cc: Jens Axboe <axboe@kernel.dk>
      Cc: Matteo Croce <mcroce@microsoft.com>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      2bae3e64
    • A
      tools headers UAPI: Sync linux/in.h copy with the kernel sources · ee286c60
      Arnaldo Carvalho de Melo 提交于
      To pick the changes in:
      
        db243b79 ("net/ipv4/ipv6: Replace one-element arraya with flexible-array members")
        2d3e5caf ("net/ipv4: Replace one-element array with flexible-array member")
      
      That don't result in any change in tooling, the structs changed remains
      with the same layout.
      
      This addresses this build warning:
      
        Warning: Kernel ABI header at 'tools/include/uapi/linux/in.h' differs from latest version at 'include/uapi/linux/in.h'
        diff -u tools/include/uapi/linux/in.h include/uapi/linux/in.h
      
      Cc: David S. Miller <davem@davemloft.net>
      Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      ee286c60
    • I
      perf tools: Add an option to build without libbfd · 0d1c50ac
      Ian Rogers 提交于
      Some distributions, like debian, don't link perf with libbfd. Add a
      build flag to make this configuration buildable and testable.
      
      This was inspired by:
      
        https://lore.kernel.org/linux-perf-users/20210910102307.2055484-1-tonyg@leastfixedpoint.com/T/#uSigned-off-by: NIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: tony garnock-jones <tonyg@leastfixedpoint.com>
      Link: http://lore.kernel.org/lkml/20210910225756.729087-1-irogers@google.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      0d1c50ac
    • N
      perf tools: Allow build-id with trailing zeros · 4a86d414
      Namhyung Kim 提交于
      Currently perf saves a build-id with size but old versions assumes the
      size of 20.  In case the build-id is less than 20 (like for MD5), it'd
      fill the rest with 0s.
      
      I saw a problem when old version of perf record saved a binary in the
      build-id cache and new version of perf reads the data.  The symbols
      should be read from the build-id cache (as the path no longer has the
      same binary) but it failed due to mismatch in the build-id.
      
        symsrc__init: build id mismatch for /home/namhyung/.debug/.build-id/53/e4c2f42a4c61a2d632d92a72afa08f00000000/elf.
      
      The build-id event in the data has 20 byte build-ids, but it saw a
      different size (16) when it reads the build-id of the elf file in the
      build-id cache.
      
        $ readelf -n ~/.debug/.build-id/53/e4c2f42a4c61a2d632d92a72afa08f00000000/elf
      
        Displaying notes found in: .note.gnu.build-id
          Owner                Data size 	Description
          GNU                  0x00000010	NT_GNU_BUILD_ID (unique build ID bitstring)
            Build ID: 53e4c2f42a4c61a2d632d92a72afa08f
      
      Let's fix this by allowing trailing zeros if the size is different.
      
      Fixes: 39be8d01 ("perf tools: Pass build_id object to dso__build_id_equal()")
      Signed-off-by: NNamhyung Kim <namhyung@kernel.org>
      Acked-by: NJiri Olsa <jolsa@redhat.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lore.kernel.org/lkml/20210910224630.1084877-1-namhyung@kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      4a86d414
    • A
      perf tools: Fix hybrid config terms list corruption · 99fc5941
      Adrian Hunter 提交于
      A config terms list was spliced twice, resulting in a never-ending loop
      when the list was traversed. Fix by using list_splice_init() and copying
      and freeing the lists as necessary.
      
      This patch also depends on patch "perf tools: Factor out
      copy_config_terms() and free_config_terms()"
      
      Example on ADL:
      
       Before:
      
        # perf record -e '{intel_pt//,cycles/aux-sample-size=4096/pp}' uname &
        # jobs
        [1]+  Running                    perf record -e "{intel_pt//,cycles/aux-sample-size=4096/pp}" uname
        # perf top -E 10
          PerfTop:    4071 irqs/sec  kernel: 6.9%  exact: 100.0% lost: 0/0 drop: 0/0 [4000Hz cycles],  (all, 24 CPUs)
        ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
      
          97.60%  perf           [.] __evsel__get_config_term
           0.25%  [kernel]       [k] kallsyms_expand_symbol.constprop.13
           0.24%  perf           [.] kallsyms__parse
           0.15%  [kernel]       [k] _raw_spin_lock
           0.14%  [kernel]       [k] number
           0.13%  [kernel]       [k] advance_transaction
           0.08%  [kernel]       [k] format_decode
           0.08%  perf           [.] map__process_kallsym_symbol
           0.08%  perf           [.] rb_insert_color
           0.08%  [kernel]       [k] vsnprintf
        exiting.
        # kill %1
      
      After:
      
        # perf record -e '{intel_pt//,cycles/aux-sample-size=4096/pp}' uname &
        Linux
        [ perf record: Woken up 1 times to write data ]
        [ perf record: Captured and wrote 0.060 MB perf.data ]
        # perf script | head
             perf-exec   604 [001]  1827.312293:                            psb:  psb offs: 0                       ffffffffb8415e87 pt_config_start+0x37 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a3bd event_sched_in.isra.133+0xfd ([kernel.kallsyms]) => ffffffffb856a9a0 perf_pmu_nop_void+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb856b10e merge_sched_in+0x26e ([kernel.kallsyms]) => ffffffffb856a2c0 event_sched_in.isra.133+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a45d event_sched_in.isra.133+0x19d ([kernel.kallsyms]) => ffffffffb8568b80 perf_event_set_state.part.61+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb8568b86 perf_event_set_state.part.61+0x6 ([kernel.kallsyms]) => ffffffffb85662a0 perf_event_update_time+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a35c event_sched_in.isra.133+0x9c ([kernel.kallsyms]) => ffffffffb8567610 perf_log_itrace_start+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb856a377 event_sched_in.isra.133+0xb7 ([kernel.kallsyms]) => ffffffffb8403b40 x86_pmu_add+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb8403b86 x86_pmu_add+0x46 ([kernel.kallsyms]) => ffffffffb8403940 collect_events+0x0 ([kernel.kallsyms])
             perf-exec   604  1827.312293:          1                       branches:  ffffffffb8403a7b collect_events+0x13b ([kernel.kallsyms]) => ffffffffb8402cd0 collect_event+0x0 ([kernel.kallsyms])
      
      Fixes: 30def61f ("perf parse-events Create two hybrid cache events")
      Fixes: 94da591b ("perf parse-events Create two hybrid raw events")
      Fixes: 9cbfa2f6 ("perf parse-events Create two hybrid hardware events")
      Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
      Acked-by: NJiri Olsa <jolsa@redhat.com>
      Cc: Jin Yao <yao.jin@linux.intel.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Link: https //lore.kernel.org/r/20210909125508.28693-3-adrian.hunter@intel.com
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      99fc5941
    • A
      perf tools: Factor out copy_config_terms() and free_config_terms() · a7d212fc
      Adrian Hunter 提交于
      Factor out copy_config_terms() and free_config_terms() so that they can
      be reused.
      Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
      Acked-by: NJiri Olsa <jolsa@redhat.com>
      Cc: Jin Yao <yao.jin@linux.intel.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Link: https //lore.kernel.org/r/20210909125508.28693-2-adrian.hunter@intel.com
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      a7d212fc
    • A
      perf tools: Fix perf_event_attr__fprintf() missing/dupl. fields · eb34363a
      Adrian Hunter 提交于
      Some fields are missing and text_poke is duplicated. Fix that up.
      Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Link: http://lore.kernel.org/lkml/20210911120550.12203-1-adrian.hunter@intel.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      eb34363a
    • I
      perf tools: Ignore Documentation dependency file · da4572d6
      Ian Rogers 提交于
      When building directly on the checked out repository the build process
      produces a file that should be ignored, so add it to .gitignore.
      
      Fixes: a81df63a ("perf doc: Fix doc.dep")
      Reported-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lore.kernel.org/lkml/20210910232249.739661-1-irogers@google.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      da4572d6
    • L
      Merge tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block · c605c396
      Linus Torvalds 提交于
      Pull io_uring fixes from Jens Axboe:
      
       - Fix an off-by-one in a BUILD_BUG_ON() check. Not a real issue right
         now as we have plenty of flags left, but could become one. (Hao)
      
       - Fix lockdep issue introduced in this merge window (me)
      
       - Fix a few issues with the worker creation (me, Pavel, Qiang)
      
       - Fix regression with wq_has_sleeper() for IOPOLL (Pavel)
      
       - Timeout link error propagation fix (Pavel)
      
      * tag 'io_uring-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
        io_uring: fix off-by-one in BUILD_BUG_ON check of __REQ_F_LAST_BIT
        io_uring: fail links of cancelled timeouts
        io-wq: fix memory leak in create_io_worker()
        io-wq: fix silly logic error in io_task_work_match()
        io_uring: drop ctx->uring_lock before acquiring sqd->lock
        io_uring: fix missing mb() before waitqueue_active
        io-wq: fix cancellation on create-worker failure
      c605c396
    • L
      Merge tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block · c0f7e49f
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
      
       - NVMe pull request from Christoph:
           - fix nvmet command set reporting for passthrough controllers (Adam Manzanares)
           - update a MAINTAINERS email address (Chaitanya Kulkarni)
           - set QUEUE_FLAG_NOWAIT for nvme-multipth (me)
           - handle errors from add_disk() (Luis Chamberlain)
           - update the keep alive interval when kato is modified (Tatsuya Sasaki)
           - fix a buffer overrun in nvmet_subsys_attr_serial (Hannes Reinecke)
           - do not reset transport on data digest errors in nvme-tcp (Daniel Wagner)
           - only call synchronize_srcu when clearing current path (Daniel Wagner)
           - revalidate paths during rescan (Hannes Reinecke)
      
       - Split out the fs/block_dev into block/fops.c and block/bdev.c, which
         has been long overdue. Do this now before -rc1, to avoid annoying
         conflicts due to this (Christoph)
      
       - blk-throtl use-after-free fix (Li)
      
       - Improve plug depth for multi-device plugs, greatly increasing md
         resync performance (Song)
      
       - blkdev_show() locking fix (Tetsuo)
      
       - n64cart error check fix (Yang)
      
      * tag 'block-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
        n64cart: fix return value check in n64cart_probe()
        blk-mq: allow 4x BLK_MAX_REQUEST_COUNT at blk_plug for multiple_queues
        block: move fs/block_dev.c to block/bdev.c
        block: split out operations on block special files
        blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
        block: genhd: don't call blkdev_show() with major_names_lock held
        nvme: update MAINTAINERS email address
        nvme: add error handling support for add_disk()
        nvme: only call synchronize_srcu when clearing current path
        nvme: update keep alive interval when kato is modified
        nvme-tcp: Do not reset transport on data digest errors
        nvmet: fixup buffer overrun in nvmet_subsys_attr_serial()
        nvmet: return bool from nvmet_passthru_ctrl and nvmet_is_passthru_req
        nvmet: looks at the passthrough controller when initializing CAP
        nvme: move nvme_multi_css into nvme.h
        nvme-multipath: revalidate paths during rescan
        nvme-multipath: set QUEUE_FLAG_NOWAIT
      c0f7e49f
    • L
      Merge tag 'libata-5.15-2021-09-11' of git://git.kernel.dk/linux-block · 8177a5c9
      Linus Torvalds 提交于
      Pull libata maintainer update from Jens Axboe:
       "Damien agreed to take over maintainership of libata, and he would be a
        great candidate for it. Update the MAINTAINERS entry to reflect the
        change in maintainer and git tree"
      
      * tag 'libata-5.15-2021-09-11' of git://git.kernel.dk/linux-block:
        libata: pass over maintainership to Damien Le Moal
      8177a5c9
    • L
      Merge tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · ce4c8f88
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
       "Minor fixes to the processing of the bootconfig tree"
      
      * tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()
        tracing/boot: Fix to check the histogram control param is a leaf node
        tracing/boot: Fix trace_boot_hist_add_array() to check array is value
      ce4c8f88
    • L
      Merge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · a1406e42
      Linus Torvalds 提交于
      Pull devicetree fixes from Rob Herring:
      
       - Disable fw_devlinks on x86 DT platforms to fix OLPC
      
       - More replacing oneOf+const with enum on a few new schemas
      
       - Drop unnecessary type references on Xilinx SPI binding schema
      
      * tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        spi: dt-bindings: xilinx: Drop type reference on *-bits properties
        dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries
        of: property: Disable fw_devlink DT support for X86
      a1406e42
    • L
      Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 2aae0a93
      Linus Torvalds 提交于
      Pull clk fix from Stephen Boyd:
       "One patch to fix an unused variable warning in a Qualcomm clk driver"
      
      * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: qcom: gcc-sm6350: Remove unused variable
      2aae0a93
    • L
      Merge tag 'rtc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 107ccc45
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "The broken down time conversion is similar to what is done in the time
        subsystem since v5.14. The rest is fairly straightforward.
      
        Subsystem:
         - Switch to Neri and Schneider time conversion algorithm
      
        Drivers:
         - rx8025: add rx8035 support
         - s5m: modernize driver and set range"
      
      * tag 'rtc-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
        rtc: rx8010: select REGMAP_I2C
        dt-bindings: rtc: add Epson RX-8025 and RX-8035
        rtc: rx8025: implement RX-8035 support
        rtc: cmos: remove stale REVISIT comments
        rtc: tps65910: Correct driver module alias
        rtc: move RTC_LIB_KUNIT_TEST to proper location
        rtc: lib_test: add MODULE_LICENSE
        rtc: Improve performance of rtc_time64_to_tm(). Add tests.
        rtc: s5m: set range
        rtc: s5m: enable wakeup only when available
        rtc: s5m: signal the core when alarm are not available
        rtc: s5m: switch to devm_rtc_allocate_device
      107ccc45
    • L
      Merge tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394 · 52926229
      Linus Torvalds 提交于
      Pull firewire updates from Stefan Richter:
      
       - Migrate the bus snooper driver 'nosy' from PCI to DMA API
      
       - Small janitorial cleanup in the IPv4/v6-over-1394 driver
      
      [ The 'nosy' change already come in as a different commit through Greg
        KH in the misc tree back in the previous merge window, so only the
        cleanup ends up being new to 5.15   - Linus ]
      
      * tag 'firewire-update' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
        firewire: nosy: switch from 'pci_' to 'dma_' API
        firewire: net: remove unused variable 'guid'
      52926229
    • L
      Merge tag 'pwm/for-5.15-rc1' of... · 6701e7e7
      Linus Torvalds 提交于
      Merge tag 'pwm/for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
      
      Pull pwm updates from Thierry Reding:
       "The changes this time around are mostly janitorial in nature. A lot of
        this is simplifications of drivers using device-managed functions and
        improving compilation coverage.
      
        The Mediatek display PWM driver now supports the atomic API.
      
        Cleanups and minor fixes make up the remainder of this set"
      
      * tag 'pwm/for-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: (54 commits)
        pwm: mtk-disp: Implement atomic API .get_state()
        pwm: mtk-disp: Fix overflow in period and duty calculation
        pwm: mtk-disp: Implement atomic API .apply()
        pwm: mtk-disp: Adjust the clocks to avoid them mismatch
        dt-bindings: pwm: rockchip: Add description for rk3568
        pwm: Make pwmchip_remove() return void
        pwm: sun4i: Don't check the return code of pwmchip_remove()
        pwm: sifive: Don't check the return code of pwmchip_remove()
        pwm: samsung: Don't check the return code of pwmchip_remove()
        pwm: renesas-tpu: Don't check the return code of pwmchip_remove()
        pwm: rcar: Don't check the return code of pwmchip_remove()
        pwm: pca9685: Don't check the return code of pwmchip_remove()
        pwm: omap-dmtimer: Don't check the return code of pwmchip_remove()
        pwm: mtk-disp: Don't check the return code of pwmchip_remove()
        pwm: imx-tpm: Don't check the return code of pwmchip_remove()
        pwm: img: Don't check the return code of pwmchip_remove()
        pwm: cros-ec: Don't check the return code of pwmchip_remove()
        pwm: brcmstb: Don't check the return code of pwmchip_remove()
        pwm: atmel-tcb: Don't check the return code of pwmchip_remove()
        pwm: atmel-hlcdc: Don't check the return code of pwmchip_remove()
        ...
      6701e7e7
    • L
      Merge tag 'thermal-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux · dd470387
      Linus Torvalds 提交于
      Pull thermal updates from Daniel Lezcano:
      
       - Add the tegra3 thermal sensor and fix the compilation testing on
         tegra by adding a dependency on ARCH_TEGRA along with COMPILE_TEST
         (Dmitry Osipenko)
      
       - Fix the error code for the exynos when devm_get_clk() fails (Dan
         Carpenter)
      
       - Add the TCC cooling support for AlderLake platform (Sumeet Pawnikar)
      
       - Add support for hardware trip points for the rcar gen3 thermal driver
         and store TSC id as unsigned int (Niklas Söderlund)
      
       - Replace the deprecated CPU-hotplug functions get_online_cpus() and
         put_online_cpus (Sebastian Andrzej Siewior)
      
       - Add the thermal tools directory in the MAINTAINERS file (Daniel
         Lezcano)
      
       - Fix the Makefile and the cross compilation flags for the userspace
         'tmon' tool (Rolf Eike Beer)
      
       - Allow to use the IMOK independently from the GDDV on Int340x (Sumeet
         Pawnikar)
      
       - Fix the stub thermal_cooling_device_register() function prototype
         which does not match the real function (Arnd Bergmann)
      
       - Make the thermal trip point optional in the DT bindings (Maxime
         Ripard)
      
       - Fix a typo in a comment in the core code (Geert Uytterhoeven)
      
       - Reduce the verbosity of the trace in the SoC thermal tegra driver
         (Dmitry Osipenko)
      
       - Add the support for the LMh (Limit Management hardware) driver on the
         QCom platforms (Thara Gopinath)
      
       - Allow processing of HWP interrupt by adding a weak function in the
         Intel driver (Srinivas Pandruvada)
      
       - Prevent an abort of the sensor probe is a channel is not used
         (Matthias Kaehlcke)
      
      * tag 'thermal-v5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
        thermal/drivers/qcom/spmi-adc-tm5: Don't abort probing if a sensor is not used
        thermal/drivers/intel: Allow processing of HWP interrupt
        dt-bindings: thermal: Add dt binding for QCOM LMh
        thermal/drivers/qcom: Add support for LMh driver
        firmware: qcom_scm: Introduce SCM calls to access LMh
        thermal/drivers/tegra-soctherm: Silence message about clamped temperature
        thermal: Spelling s/scallbacks/callbacks/
        dt-bindings: thermal: Make trips node optional
        thermal/core: Fix thermal_cooling_device_register() prototype
        thermal/drivers/int340x: Use IMOK independently
        tools/thermal/tmon: Add cross compiling support
        thermal/tools/tmon: Improve the Makefile
        MAINTAINERS: Add missing userspace thermal tools to the thermal section
        thermal/drivers/intel_powerclamp: Replace deprecated CPU-hotplug functions.
        thermal/drivers/rcar_gen3_thermal: Store TSC id as unsigned int
        thermal/drivers/rcar_gen3_thermal: Add support for hardware trip points
        drivers/thermal/intel: Add TCC cooling support for AlderLake platform
        thermal/drivers/exynos: Fix an error code in exynos_tmu_probe()
        thermal/drivers/tegra: Correct compile-testing of drivers
        thermal/drivers/tegra: Add driver for Tegra30 thermal sensor
      dd470387