From: Michael Ellerman <mpe@ellerman.id.au>
To: Mathieu Malaterre <malat@debian.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Nicholas Piggin <npiggin@gmail.com>,
linuxppc-dev <linuxppc-dev@lists.ozlabs.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v3] powerpc/32: Remove left over function prototypes
Date: Wed, 27 Jun 2018 13:28:22 +1000 [thread overview]
Message-ID: <871scs7vs9.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <CA+7wUswdBvm+XCi6r6ewGFuSTAaV9FWmhUyV9vNKatCnurvL-A@mail.gmail.com>
Mathieu Malaterre <malat@debian.org> writes:
> On Thu, Jun 21, 2018 at 1:27 PM Michael Ellerman <mpe@ellerman.id.au> wrote:
>> Mathieu Malaterre <malat@debian.org> writes:
>>
>> > In commit 4aea909eeba3 ("powerpc: Add missing prototypes in setup_32.c")
>>
>> I don't have that commit ^ ?
>>
>> That might be because I squashed some of your fixes together or something?
>
> I am doing an awful lots of mistakes these days. Indeed you've changed
> one of my patch:
>
> https://patchwork.kernel.org/patch/10240997/
>
> This one appeared after a git rebase on my side.
>
>> > diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h
>> > index 35ca309848d7..829ed66f0a40 100644
>> > --- a/arch/powerpc/kernel/setup.h
>> > +++ b/arch/powerpc/kernel/setup.h
>> > @@ -19,9 +19,6 @@ void irqstack_early_init(void);
>> > void setup_power_save(void);
>> > unsigned long __init early_init(unsigned long dt_ptr);
>> > void __init machine_init(u64 dt_ptr);
>> > -int __init ppc_setup_l2cr(char *str);
>> > -int __init ppc_setup_l3cr(char *str);
>> > -int __init ppc_init(void);
>> > #else
>> > static inline void setup_power_save(void) { };
>> > #endif
>>
>> I have:
>>
>> #ifdef CONFIG_PPC32
>> void setup_power_save(void);
>> #else
>> static inline void setup_power_save(void) { };
>> #endif
>
> Correct.
>
> Sorry for the noise.
OK, no worries. Thanks for persisting.
cheers
prev parent reply other threads:[~2018-06-27 3:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-08 19:43 [PATCH] powerpc/32: Make some functions static Mathieu Malaterre
2018-04-08 19:48 ` [PATCH v2] " Mathieu Malaterre
2018-06-20 19:00 ` [PATCH v3] powerpc/32: Remove left over function prototypes Mathieu Malaterre
2018-06-21 11:27 ` Michael Ellerman
2018-06-22 7:15 ` Mathieu Malaterre
2018-06-27 3:28 ` Michael Ellerman [this message]
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=871scs7vs9.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=malat@debian.org \
--cc=npiggin@gmail.com \
--cc=paulus@samba.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