On Fri, Apr 6, 2018 at 6:34 AM, Linus Torvalds
wrote:
> On Thu, Apr 5, 2018 at 2:23 PM, Arnd Bergmann wrote:
>>
>> - the ARM CCN driver is moved out of drivers/bus into drivers/perf,
>> which makes more sense. Similarly, the performance monitoring
>> portion of the CCI driver are moved the same way and cleaned up
>> a little more.
>
> This caused a trivial merge with the perf tree.
>
> But since I don't *build* the trivial merge resolution due to it being
> an arm-only file, I wanted to point it out.
>
> Because "not tested" very possibly means "I screwed something silly up
> and didn't notice".
>
> So as trivial as it seemed, it should still be checked.
Looks good to me and it survived the randconfig build tests,
so I assume it's fine.
Arnd
