| Message ID | 20210311094022.5978-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ftrace: Fix spelling mistake "disabed" -> "disabled" | expand |
On Thu, 11 Mar 2021 01:40:22 PST (-0800), colin.king@canonical.com wrote: > From: Colin Ian King <colin.king@canonical.com> > > There is a spelling mistake in a comment, fix it. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > arch/csky/kernel/probes/ftrace.c | 2 +- > arch/riscv/kernel/probes/ftrace.c | 2 +- > arch/x86/kernel/kprobes/ftrace.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/csky/kernel/probes/ftrace.c b/arch/csky/kernel/probes/ftrace.c > index ae2b1c7b3b5c..ef2bb9bd9605 100644 > --- a/arch/csky/kernel/probes/ftrace.c > +++ b/arch/csky/kernel/probes/ftrace.c > @@ -9,7 +9,7 @@ int arch_check_ftrace_location(struct kprobe *p) > return 0; > } > > -/* Ftrace callback handler for kprobes -- called under preepmt disabed */ > +/* Ftrace callback handler for kprobes -- called under preepmt disabled */ > void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, > struct ftrace_ops *ops, struct ftrace_regs *fregs) > { > diff --git a/arch/riscv/kernel/probes/ftrace.c b/arch/riscv/kernel/probes/ftrace.c > index 2dfb33fdac74..17ca5e923bb0 100644 > --- a/arch/riscv/kernel/probes/ftrace.c > +++ b/arch/riscv/kernel/probes/ftrace.c > @@ -2,7 +2,7 @@ > > #include <linux/kprobes.h> > > -/* Ftrace callback handler for kprobes -- called under preepmt disabed */ > +/* Ftrace callback handler for kprobes -- called under preepmt disabled */ > void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, > struct ftrace_ops *ops, struct ftrace_regs *fregs) > { > diff --git a/arch/x86/kernel/kprobes/ftrace.c b/arch/x86/kernel/kprobes/ftrace.c > index 373e5fa3ce1f..51c7f5271aee 100644 > --- a/arch/x86/kernel/kprobes/ftrace.c > +++ b/arch/x86/kernel/kprobes/ftrace.c > @@ -12,7 +12,7 @@ > > #include "common.h" > > -/* Ftrace callback handler for kprobes -- called under preepmt disabed */ > +/* Ftrace callback handler for kprobes -- called under preepmt disabled */ > void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, > struct ftrace_ops *ops, struct ftrace_regs *fregs) > { Thanks, this is on fixes.
On Tue, 16 Mar 2021 21:21:08 -0700 (PDT)
Palmer Dabbelt <palmer@dabbelt.com> wrote:
> Thanks, this is on fixes.
What does this mean? Is there a tree that spelling fixes go through now?
I had already pulled this patch into my queue for the next merge window
(and it's still in the testing phase with other patches before going to
linux-next).
Should I drop it?
-- Steve
On Wed, 17 Mar 2021 06:42:23 PDT (-0700), rostedt@goodmis.org wrote: > On Tue, 16 Mar 2021 21:21:08 -0700 (PDT) > Palmer Dabbelt <palmer@dabbelt.com> wrote: > >> Thanks, this is on fixes. > > What does this mean? Is there a tree that spelling fixes go through now? > > I had already pulled this patch into my queue for the next merge window > (and it's still in the testing phase with other patches before going to > linux-next). > > Should I drop it? Oh, sorry. It's on the fixes branch of the riscv tree <https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git> . It's what I sent up to Linus every week, this one already went up. I must have not been looking closely enough, for some reason I thought this only touched the riscv tree. I wouldn't have taken it without an Ack if I'd noticed, I guess just because it was only a comment spelling change I hadn't checked the paths. I'll try not to do that again.
diff --git a/arch/csky/kernel/probes/ftrace.c b/arch/csky/kernel/probes/ftrace.c index ae2b1c7b3b5c..ef2bb9bd9605 100644 --- a/arch/csky/kernel/probes/ftrace.c +++ b/arch/csky/kernel/probes/ftrace.c @@ -9,7 +9,7 @@ int arch_check_ftrace_location(struct kprobe *p) return 0; } -/* Ftrace callback handler for kprobes -- called under preepmt disabed */ +/* Ftrace callback handler for kprobes -- called under preepmt disabled */ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs) { diff --git a/arch/riscv/kernel/probes/ftrace.c b/arch/riscv/kernel/probes/ftrace.c index 2dfb33fdac74..17ca5e923bb0 100644 --- a/arch/riscv/kernel/probes/ftrace.c +++ b/arch/riscv/kernel/probes/ftrace.c @@ -2,7 +2,7 @@ #include <linux/kprobes.h> -/* Ftrace callback handler for kprobes -- called under preepmt disabed */ +/* Ftrace callback handler for kprobes -- called under preepmt disabled */ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs) { diff --git a/arch/x86/kernel/kprobes/ftrace.c b/arch/x86/kernel/kprobes/ftrace.c index 373e5fa3ce1f..51c7f5271aee 100644 --- a/arch/x86/kernel/kprobes/ftrace.c +++ b/arch/x86/kernel/kprobes/ftrace.c @@ -12,7 +12,7 @@ #include "common.h" -/* Ftrace callback handler for kprobes -- called under preepmt disabed */ +/* Ftrace callback handler for kprobes -- called under preepmt disabled */ void kprobe_ftrace_handler(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs) {