From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751497AbdJSBFk (ORCPT <rfc822;w@1wt.eu>);
        Wed, 18 Oct 2017 21:05:40 -0400
Received: from ozlabs.org ([103.22.144.67]:41509 "EHLO ozlabs.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750926AbdJSBFj (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 18 Oct 2017 21:05:39 -0400
From: Michael Ellerman <mpe@ellerman.id.au>
To: Kees Cook <keescook@chromium.org>
Cc: Paul Mackerras <paulus@samba.org>,
        "linuxppc-dev\@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
        Nicholas Piggin <npiggin@gmail.com>,
        LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] powerpc/watchdog: Convert timers to use timer_setup()
In-Reply-To: <87zi8ohcgu.fsf@concordia.ellerman.id.au>
References: <20171016234710.GA102273@beast> <20171017125204.728b3a95@roar.ozlabs.ibm.com> <87r2u2hs9t.fsf@concordia.ellerman.id.au> <CAGXu5jKt6pypVhxMEv9LYsYvF_P=u3SOK=Yc268wS+oYOHiH=g@mail.gmail.com> <87zi8ohcgu.fsf@concordia.ellerman.id.au>
Date: Thu, 19 Oct 2017 12:05:37 +1100
Message-ID: <87shegj6am.fsf@concordia.ellerman.id.au>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Michael Ellerman <mpe@ellerman.id.au> writes:
> Kees Cook <keescook@chromium.org> writes:
>> On Tue, Oct 17, 2017 at 5:29 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>>> Nicholas Piggin <npiggin@gmail.com> writes:
>>>> On Mon, 16 Oct 2017 16:47:10 -0700
>>>> Kees Cook <keescook@chromium.org> wrote:
>>>>> In preparation for unconditionally passing the struct timer_list pointer to
>>>>> all timer callbacks, switch to using the new timer_setup() and from_timer()
>>>>> to pass the timer pointer explicitly.
>>>>>
>>>>> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>>>>> Cc: Paul Mackerras <paulus@samba.org>
>>>>> Cc: Michael Ellerman <mpe@ellerman.id.au>
>>>>> Cc: Nicholas Piggin <npiggin@gmail.com>
>>>>> Cc: linuxppc-dev@lists.ozlabs.org
>>>>> Signed-off-by: Kees Cook <keescook@chromium.org>
>>>>
>>>> Looks fine to me. Is this intended to be merged via the powerpc tree
>>>> in the next merge window?
>>>
>>> It relies on the new timer_setup(), which is in one of tglx's trees (I
>>> think). So I expect it to go via that tree.
>>
>> It's in -rc3, but the timer tree can carry it if you want. Which do
>> you prefer?
>
> Oh sorry, I assumed it was in only in linux-next.
>
> I'll take this. Thanks.

Ugh, I'm an <expletive deleted>.

My next is based on rc2, so I can't take this.

Can you please pick it up.

cheers