Received-SPF: pass (google.com: domain of linux-kernel+bounces-110424-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: "Luck, Tony" <tony.luck@intel.com>
To: "Wieczor-Retman, Maciej" <maciej.wieczor-retman@intel.com>
CC: "Yu, Fenghua" <fenghua.yu@intel.com>, "Chatre, Reinette"
	<reinette.chatre@intel.com>, Peter Newman <peternewman@google.com>, "Jonathan
 Corbet" <corbet@lwn.net>, Shuah Khan <skhan@linuxfoundation.org>,
	"x86@kernel.org" <x86@kernel.org>, Shaopeng Tan <tan.shaopeng@fujitsu.com>,
	James Morse <james.morse@arm.com>, Jamie Iles <quic_jiles@quicinc.com>, "Babu
 Moger" <babu.moger@amd.com>, Randy Dunlap <rdunlap@infradead.org>, "Drew
 Fustini" <dfustini@baylibre.com>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>, "linux-doc@vger.kernel.org"
	<linux-doc@vger.kernel.org>, "patches@lists.linux.dev"
	<patches@lists.linux.dev>
Subject: RE: [PATCH v16 0/9] Add support for Sub-NUMA cluster (SNC) systems
Thread-Topic: [PATCH v16 0/9] Add support for Sub-NUMA cluster (SNC) systems
Thread-Index: AQHadMZAfvOnE4EV7EqwgV4w9PIDb7FB36oAgACVVRA=
Date: Thu, 21 Mar 2024 16:51:51 +0000
Message-ID: <SJ1PR11MB6083C9DD405BF4CB986822F5FC322@SJ1PR11MB6083.namprd11.prod.outlook.com>
References: <20240312214247.91772-1-tony.luck@intel.com>
 <bn4wtfyec4mfoztcr35rctgcbibypjh5gmxdr3fro72glh2y3n@vmqsuxgjlonw>
In-Reply-To: <bn4wtfyec4mfoztcr35rctgcbibypjh5gmxdr3fro72glh2y3n@vmqsuxgjlonw>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ImQHT0AGYmlFtNDvwqZlLxYZdC+Fgu1A7z07d4nfXGjTwFpBDym/0R75qzHI?=
 =?us-ascii?Q?fpbJaf4VWqtmucHmt9b6o6mZHCqb5tWUhF/Tvo133UPIxp7KhSuZYviqPP9G?=
 =?us-ascii?Q?yHv42YpMybVwP/5BzQMtOIJ1bHN2NaKE3EYmIFqNHZpa+yip5oB74gLYsDcL?=
 =?us-ascii?Q?dm4ZNCVwLAeIZcxM+exL3xg7MVYf7FWP0Tkivo9cu9vYr9EyEIeoyy65r18M?=
 =?us-ascii?Q?kcC0zvmrIdNoWnfLMbdmQYIbjCO6/tJeNZrET1t81pAqlGif7yyuRTqKMMfo?=
 =?us-ascii?Q?T3AY5TOQbPvTsR0Wk3Zp/WD1CUHNxoIiehIfLpwSdz3hgiBVxCapG4F06zn9?=
 =?us-ascii?Q?0QoDY6QvNru2hA00020sonmwtn04QEdLp6AFHfeOx/OblcwqbVMMilqBTNxO?=
 =?us-ascii?Q?IyPzXlJf37evgzByd3JVhI5yJ6P4ZOiYwHQMU6CViUbNM84zLuyiCAn2a2Ks?=
 =?us-ascii?Q?hEFuM9VQLjhvEs6sJCu2FuRrb5JOCArWsvoFRLFmGCdTAQxSrCwDx+lT8tF7?=
 =?us-ascii?Q?DV4+H4W9VlhOJdzJsuIXIqd6kHzP7cpKB8mDGb5/8XUipZNyVT0tBbS6CP3Z?=
 =?us-ascii?Q?9X0M5eLphgC9y0/1mpU12du5DqDDbG/frWVjHO45+Bi5x9okaG16UHsOSPJK?=
 =?us-ascii?Q?wq2Y1KDKha1YsdnMP4Wg9SlT0+KHKdU+hujINyXEuNcvFMLLfszFfIRBuS69?=
 =?us-ascii?Q?QHdpE+qkaVbcmN3ASQINJRMTaTHthHIe+2iMVYzUug07114TvqP7Pw7RHp3B?=
 =?us-ascii?Q?ygIhqXtLGNwTKyTAZG5l1noHsPIC3M+wbSx1KCxaD16XS6h6k1PXiD9AKBaP?=
 =?us-ascii?Q?54meGI4QmfCK6tHpeKDqlZKEBHjS0xYs39Xh6mVSt6n0NLBzUY4ezIRyUSzL?=
 =?us-ascii?Q?1ygZ+uqnUO8WBGPFi+yTyHSFIMpWw1crMODcBi2/G0MJfgGw+Bt02F4JcgSK?=
 =?us-ascii?Q?WH8oJb/DGgA/8yAzg/RYJyxCCr+pxWilXRAnplMYQAHIhm/SQPJYpPFhPumx?=
 =?us-ascii?Q?lgguxcaiIb5LPDn8Q3Hrb8XMCEGuDJA8kpP1jprV8ajrfEOBfAsgw/UjBNNe?=
 =?us-ascii?Q?snscMy8fWeFXSTdwcFhPv8XAuY0NzxtPsx148rnh7UHtOelcbu7LqAxu7STj?=
 =?us-ascii?Q?/NMHSJYKWq0LKaQHO4OChinLEd5vcJOM2rPQtPx3m7e7Q8f8UU7kfrrJ/g9k?=
 =?us-ascii?Q?r1xub2z6HMo25JI+WIHsKZlPp+SN9dVEOv6syiuCQEJE56I2uu5zNKonagos?=
 =?us-ascii?Q?gqGiNteJCBTo6yh9OVX2S1I36gFt2gFP2YTHSjQBHI6YcAZk66Mov75wtJs3?=
 =?us-ascii?Q?I/nMQudYc33Hg4SOFuXsWlnLWWuXqw2sldc4n2fdeDJPM09QLLfWSCw4xCMG?=
 =?us-ascii?Q?JVDwtQUj9tKO/dWAtljzWrp2tMNRngewQ4BfB3Lnu/WWZJbj+bkXq6WEoxRH?=
 =?us-ascii?Q?KsZQj3+iSe8agS3G8lblhRCYXxLMvYu1tX/YXTDKG7X1lRNJj8rHaWUxwg22?=
 =?us-ascii?Q?5N4Zt/ayh4eBSoQCToVYwCSKTAictgeLsz490uFf5c4VQ1CWSncNP6DQ3EIl?=
 =?us-ascii?Q?lveEu7nr5uKbydzWtD57G6qnxoW8Drev2RMpZqn4?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6083.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ff5878e6-d45b-4757-acfd-08dc49c734d2
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Mar 2024 16:51:51.3023
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: erxjw712SdqkjMnYVNuJHypd+MEaulmPqYLAUQs0ZC9n3SvabjJE11QYN0TUhzMp+WwuMq2CNHO0/jkuiLBdaw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4844
X-OriginatorOrg: intel.com

> 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 ma=
rkers,
> just fails.

Maybe there's something else touching resctrl in either TIP or now in upstr=
eam?

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/sc=
m/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 an=
d post
v17 next week (based on Linus v6.9-rc1). I'll fix up any additional merge i=
ssues
while rebasing.

-Tony