mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Miguel Ojeda" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Miguel Ojeda <ojeda@kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] time: Partially revert cleanup on msecs_to_jiffies() documentation
Date: Fri, 25 Oct 2024 14:53:44 -0000	[thread overview]
Message-ID: <172986802400.1442.1163693120565825233.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20241025110141.157205-1-ojeda@kernel.org>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     0592cdd59cb09f7ab8bda55f77952f3ce2edaa04
Gitweb:        https://git.kernel.org/tip/0592cdd59cb09f7ab8bda55f77952f3ce2edaa04
Author:        Miguel Ojeda <ojeda@kernel.org>
AuthorDate:    Fri, 25 Oct 2024 13:01:40 +02:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 25 Oct 2024 16:48:10 +02:00

time: Partially revert cleanup on msecs_to_jiffies() documentation

The documentation's intention is to compare msecs_to_jiffies() (first
sentence) with __msecs_to_jiffies() (second sentence), which is what the
original documentation did. One of the cleanups in commit f3cb80804b82
("time: Fix various kernel-doc problems") may have thought the paragraph
was talking about the latter since that is what it is being documented.

Thus revert that part of the change.

Fixes: f3cb80804b82 ("time: Fix various kernel-doc problems")
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241025110141.157205-1-ojeda@kernel.org

---
 kernel/time/time.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/time/time.c b/kernel/time/time.c
index 5984d4a..b1809a1 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -558,7 +558,7 @@ EXPORT_SYMBOL(ns_to_timespec64);
  *   handling any 32-bit overflows.
  *   for the details see __msecs_to_jiffies()
  *
- * __msecs_to_jiffies() checks for the passed in value being a constant
+ * msecs_to_jiffies() checks for the passed in value being a constant
  * via __builtin_constant_p() allowing gcc to eliminate most of the
  * code, __msecs_to_jiffies() is called if the value passed does not
  * allow constant folding and the actual conversion must be done at

  parent reply	other threads:[~2024-10-25 14:53 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-25 11:01 [PATCH 1/2] time: " Miguel Ojeda
2024-10-25 11:01 ` [PATCH 2/2] time: fix references to _msecs_to_jiffies handling of values Miguel Ojeda
2024-10-25 14:53   ` [tip: timers/core] time: Fix references to _msecs_to_jiffies() " tip-bot2 for Miguel Ojeda
2024-10-25 18:01   ` tip-bot2 for Miguel Ojeda
2024-10-25 14:53 ` tip-bot2 for Miguel Ojeda [this message]
2024-10-25 18:01 ` [tip: timers/core] time: Partially revert cleanup on msecs_to_jiffies() documentation tip-bot2 for Miguel Ojeda
2024-10-26 19:32 ` [PATCH 1/2] time: " Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=172986802400.1442.1163693120565825233.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=ojeda@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®