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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <SJ1PR11MB6083C9DD405BF4CB986822F5FC322@SJ1PR11MB6083.namprd11.prod.outlook.com>
Date: Thu, 21 Mar 2024 16:51:51 +0000
From: "Luck, Tony" <tony.luck@...el.com>
To: "Wieczor-Retman, Maciej" <maciej.wieczor-retman@...el.com>
CC: "Yu, Fenghua" <fenghua.yu@...el.com>, "Chatre, Reinette"
	<reinette.chatre@...el.com>, Peter Newman <peternewman@...gle.com>, "Jonathan
 Corbet" <corbet@....net>, Shuah Khan <skhan@...uxfoundation.org>,
	"x86@...nel.org" <x86@...nel.org>, Shaopeng Tan <tan.shaopeng@...itsu.com>,
	James Morse <james.morse@....com>, Jamie Iles <quic_jiles@...cinc.com>, "Babu
 Moger" <babu.moger@....com>, Randy Dunlap <rdunlap@...radead.org>, "Drew
 Fustini" <dfustini@...libre.com>, "linux-kernel@...r.kernel.org"
	<linux-kernel@...r.kernel.org>, "linux-doc@...r.kernel.org"
	<linux-doc@...r.kernel.org>, "patches@...ts.linux.dev"
	<patches@...ts.linux.dev>
Subject: RE: [PATCH v16 0/9] Add support for Sub-NUMA cluster (SNC) systems

> 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