The dpll(8) merge of main into next (commit 62d1e70fa85a37 ("Merge remote-tracking branch 'main/main' into next")) resolved the conflict in the "dpll device show" output bullet list by keeping main's three new entries (Supported modes, Phase offset monitor status, Phase offset averaging factor) but inadvertently dropped the "Frequency monitor status (enable/disable)" entry that was introduced on next by commit 12954bc7d2c3 ("dpll: add frequency monitoring support"). The frequency-monitor feature itself is still present (parser, device-set documentation and pin "Measured frequency in Hz" line are intact), only the corresponding bullet in the device-get output list was lost. Add it back so the listed attributes match what "dpll device show" actually prints. Signed-off-by: Petr Oros --- man/man8/dpll.8 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/man/man8/dpll.8 b/man/man8/dpll.8 index 74f4fdaa94eb46..92d4ead0010bc6 100644 --- a/man/man8/dpll.8 +++ b/man/man8/dpll.8 @@ -140,6 +140,8 @@ Supported modes Phase offset monitor status (enable/disable) .IP \[bu] Phase offset averaging factor +.IP \[bu] +Frequency monitor status (enable/disable) .RE .SS dpll device set id ID [ PARAMETER VALUE ] ... -- 2.53.0