Messages in this thread | | | Subject | Re: [PATCH v3 4/7] selftests/ftrace: Convert required interface checks into requires list | From | Shuah Khan <> | Date | Tue, 16 Jun 2020 10:48:12 -0600 |
| |
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@linuxfoundation.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.
I resolved them and amended the commit message to indicate the merge. It is straight forward. Please check for sanity.
thanks, -- Shuah
| |