Received-SPF: pass (google.com: domain of linux-kernel+bounces-111666-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Fri, 22 Mar 2024 15:57:34 +0100
From: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
To: "Luck, Tony" <tony.luck@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
Message-ID: <upoalex6pznr3aqsp7yvayt3ecdcqaoghlggctuov5domv24lo@k3d364ny3j5i>
References: <20240312214247.91772-1-tony.luck@intel.com>
 <bn4wtfyec4mfoztcr35rctgcbibypjh5gmxdr3fro72glh2y3n@vmqsuxgjlonw>
 <SJ1PR11MB6083C9DD405BF4CB986822F5FC322@SJ1PR11MB6083.namprd11.prod.outlook.com>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <SJ1PR11MB6083C9DD405BF4CB986822F5FC322@SJ1PR11MB6083.namprd11.prod.outlook.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?kPIR9KL+vUZqDIDuvPqoz6eLchiieCqkAazI78c+ExtE2aKZJoKFUJOeA3?=
 =?iso-8859-1?Q?HH8uyGNQbrgyaL1DxUsPJpZZow50Y3HsED9AOsh1ADxjJNjvMAQB7X+d6u?=
 =?iso-8859-1?Q?0UovN/TWd6G0PcBpL6/66qWQyqTek7Gk28e133vZEqwMp7ItD8r4GH29Nb?=
 =?iso-8859-1?Q?PaHMp1I9TAH0oL07yZU9Auv4ApFd5agj2C6vCCC1vgk5aJRK+2uXN83CuZ?=
 =?iso-8859-1?Q?LziN1RyUScccT4i3mVMnsz9ETJse3i5WV9T2GUjLvjQ0qr125SQOvfYkm6?=
 =?iso-8859-1?Q?kGVkQDEyx+SS+B/cgOjyX6yvcVPDkGiz0jAIQEitlD1pISVnVfXeYGsp2c?=
 =?iso-8859-1?Q?grJ/mvR40jhjuiYa8vMJMkO7CobkRCbbclinpzZM4SIpobPfOtvF4tvAa5?=
 =?iso-8859-1?Q?uH9hFGP1smHRUm6xIvJjA81k6sw0Sxbcs2YYHYebI7gdDPkSW2tYnZlKGW?=
 =?iso-8859-1?Q?u3eQgO0fNHDSnMHOj2IuSrZU3zig6v/6kg7YCa+hGmrfDEfIJ+wxo6gPEV?=
 =?iso-8859-1?Q?CFKH/bZmgQJzfkw9g3FGBze3EzIjdU3UdPZ4jvkuRLZKVRs9oYUd19nHoG?=
 =?iso-8859-1?Q?Hyym0I4rdMatwYcsVXHLdh7j+IsV9eTXoEkxWAQQ/IaPElFpk9+P2ttpkU?=
 =?iso-8859-1?Q?XWVJ09M1Axx4n6fu0Y1Rk/UF7vpIudfMBmvQHYTSUymYgusOj2GXtxRP/Y?=
 =?iso-8859-1?Q?OSIXZ+HS2D41ZiKJTgpJ+b7YfCIixFmDq3xdKXEDAGwijVQAsQevX/zTTl?=
 =?iso-8859-1?Q?N1tDAs4xxYbcEcGxkr969ss2MkbuUdPSx5/a/EfJdBv7Q6e1k0+IO6rpks?=
 =?iso-8859-1?Q?SFGv8wKLBzjAyi1bj2XvH1cPh80KjVrS8FmBLwYzcMPF6HRIbnXsy5ZkUp?=
 =?iso-8859-1?Q?G4csUYvfqC5pn/VXgq3meT0RqvoxWTt5Jiga/V7qDLXSspOBEixFQEHWBe?=
 =?iso-8859-1?Q?L6IB7UP1PZKqdKvsduSZF2Yngi3oTgmua9Xamc8PPsGT++4ZXCfTddGh7P?=
 =?iso-8859-1?Q?IST0Ky/8dZPyqjvqAYANDpIp6E3SguK75spPOReYfBS/CUjH74d0WBNp+w?=
 =?iso-8859-1?Q?N89POUJaxVOaLAgeh4v3asUbOaxxZJDOsKMwMwuDD9uuSC/PE4uBPZE9BL?=
 =?iso-8859-1?Q?shBLVzeyRkzzOGOMI2QIguKc7Ev7iuT8+ms7+L8ND7OD7Z+d7XV1vVEfPQ?=
 =?iso-8859-1?Q?DBg1RNPhDj1gG3jmROrNX/ey8pKDum8go/kRPJsR3WyRIMA5o/AihJLbSZ?=
 =?iso-8859-1?Q?wOpiCkzUH/EeZOT/02NPXEBa5KgMeYf1OdYMFynvFbM5Hq2xbvO7gAJXkd?=
 =?iso-8859-1?Q?L3aTNrrbV/MMn3stwyQ+TQPcHjtGpDw/jhZzp1Sbopw2jx5GNHNTq1+yXA?=
 =?iso-8859-1?Q?mdDcurP1rLbHwgKTVwoBHCQSFmUGRqlTtwTaJoSB5/kR4T3sQBKyB6iK6w?=
 =?iso-8859-1?Q?zPkIQOviRdgmorio6z/lb31hTduCe9ZGuCDS0ni2oMNEkWmrnbaGqKhZFS?=
 =?iso-8859-1?Q?n6vFx5vhTDQMNPQnWaE+FgKWLLqSICkrIO64yMPgrYlHQaeEUCc5wRe+LU?=
 =?iso-8859-1?Q?OcJit0DsQahQmzady75wB9l9sqQWdxVEsJkfD5aJQUyiLjb283CYSCU3M9?=
 =?iso-8859-1?Q?lZV+xciXhCIjliHjkQKJsf6wRSTVjb0I6nzUsDat6JGBrsjjdvgVGSLbGw?=
 =?iso-8859-1?Q?izjLTJMUc9/GXfYtyl8=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9d735011-17dc-4493-cba9-08dc4a807d21
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6231.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2024 14:58:09.7657
 (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: SbBKyTJi2I8Ne9c5y9CwzRgjYsO1T8IiYnaxE5zvStJP1PlUb2BJwZ26/wevYHPmv2CJdHziPExBcoBboQ+rjAYS7FAle/3qBuwaWKfIPsQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR11MB8383
X-OriginatorOrg: intel.com

On 2024-03-21 at 16:51:51 +0000, Luck, Tony wrote:
>> 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

Thanks, I'll try using this one.

>
>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

-- 
Kind regards
Maciej Wiecz?r-Retman