RE: [PATCH v16 0/9] Add support for Sub-NUMA cluster (SNC) systems

[Luck, Tony]

> I wanted to find what causes the conflict so I can give more details but three
> way merging doesn't seem to work and git am doesn't leave any conflict markers,
> just fails.

Maybe there's something else touching resctrl in either TIP or now in upstream?

In my local tree I built on upstream after Linus pulled TIP x86/cache (and a bunch
or other stuff). So my base commit is:

b29f377119f6 Merge tag 'x86-boot-2024-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/ti

Then the two patch cleanup:

b0eebe2ee45d x86/resctrl: Simplify call convention for MSR update functions
edf14f3a6093 x86/resctrl: Pass domain to target CPU

Then this v16 SNC series.

Reinette pointed out a couple of things to fix in v16, I'll handle those and post
v17 next week (based on Linus v6.9-rc1). I'll fix up any additional merge issues
while rebasing.

-Tony