Re: [PATCH v4 00/24] x86/resctrl: Merge the CDP resources

[Borislav Petkov]

On Tue, Jun 15, 2021 at 05:48:25PM +0100, James Morse wrote:
> Please point me at something to rebase onto!
> (as far as I can see, tip/x86/cache hasn't moved)

Just use tip/master when that branch hasn't moved. We usually
fast-forward those branches to the latest Linus -rc before applying new
stuff.

And I'm sure we should be able to handle kernel-doc conflicts when
applying.

:-)

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette