[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200617235822.76b94496733a3d7c5bb647b6@kernel.org>
Date: Wed, 17 Jun 2020 23:58:22 +0900
From: Masami Hiramatsu <mhiramat@...nel.org>
To: Shuah Khan <skhan@...uxfoundation.org>
Cc: Steven Rostedt <rostedt@...dmis.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org,
Shuah Khan <shuah@...nel.org>,
Tom Zanussi <tom.zanussi@...ux.intel.com>
Subject: Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface
checks into requires list
Hi Shuah,
On Tue, 16 Jun 2020 10:48:12 -0600
Shuah Khan <skhan@...uxfoundation.org> wrote:
> On 6/11/20 6:03 AM, Shuah Khan wrote:
> > On 6/10/20 7:32 AM, Steven Rostedt wrote:
> >> On Wed, 10 Jun 2020 06:04:33 -0600
> >> Shuah Khan <skhan@...uxfoundation.org> wrote:
> >>
> >>>> Steve, what would you think?
> >>>
> >>> No worries. As far as kselftest tree is concrned, I can apply these
> >>> after rc1 comes out with Tom's patch.
> >>>
> >>> Or I can give Ack and Steve can take these through tracing tree.
> >>
> >> All my patches have already made it to Linus's tree. Perhaps
> >> cherry-pick the commit needed from Linus's tree (it shouldn't break
> >> anything when Linus pulls it). Just let Linus know what you did, and
> >> everything should be fine.
> >>
> >
> > Good to know. I will get these in.
> >
>
> I applied all 7 patches to linux-kselftest next for my second update.
> I saw a couple of merge problems with 4/7 patch even when I applied
> it on top of with Tom's patch.
Oh, I might miss something.
>
> I resolved them and amended the commit message to indicate the merge.
> It is straight forward. Please check for sanity.
Yes, I confirmed that the merge looks good, and also test ran out
without any error. :)
Thank you!
>
> thanks,
> -- Shuah
--
Masami Hiramatsu <mhiramat@...nel.org>
Powered by blists - more mailing lists