Commit 31c7ac38 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 28336be5 c79f46a2
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -251,11 +251,11 @@ selectively from different subsystems.
.. code-block:: c

    struct kcov_remote_arg {
	unsigned	trace_mode;
	unsigned	area_size;
	unsigned	num_handles;
	uint64_t	common_handle;
	uint64_t	handles[0];
	__u32		trace_mode;
	__u32		area_size;
	__u32		num_handles;
	__aligned_u64	common_handle;
	__aligned_u64	handles[0];
    };

    #define KCOV_INIT_TRACE			_IOR('c', 1, unsigned long)
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
    |    openrisc: | TODO |
    |      parisc: | TODO |
    |     powerpc: |  ok  |
    |       riscv: | TODO |
    |       riscv: |  ok  |
    |        s390: |  ok  |
    |          sh: |  ok  |
    |       sparc: | TODO |
+0 −6
Original line number Diff line number Diff line
@@ -230,12 +230,6 @@ simultaneously on two ports. The driver checks the consistency of the schedules
against this restriction and errors out when appropriate. Schedule analysis is
needed to avoid this, which is outside the scope of the document.

At the moment, the time-aware scheduler can only be triggered based on a
standalone clock and not based on PTP time. This means the base-time argument
from tc-taprio is ignored and the schedule starts right away. It also means it
is more difficult to phase-align the scheduler with the other devices in the
network.

Device Tree bindings and board design
=====================================

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ lack of a better place.
   volatile-considered-harmful
   botching-up-ioctls
   clang-format
   ../riscv/patch-acceptance

.. only::  subproject and html

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ RISC-V architecture

    boot-image-header
    pmu
    patch-acceptance

.. only::  subproject and html

Loading