Received-SPF: pass (google.com: domain of linux-kernel+bounces-82429-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: Mon, 26 Feb 2024 15:01:49 -0800
From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Dan Williams
	<dan.j.williams@intel.com>
CC: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, "Linux Next
 Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the cxl-fixes tree with Linus' tree
Message-ID: <65dd185d2eba8_2bca029498@dwillia2-mobl3.amr.corp.intel.com.notmuch>
References: <20240226090417.65ba3c4b@canb.auug.org.au>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240226090417.65ba3c4b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?C8z81SbMWGUXy0nVmlQwIrzpN1MCSS7fei5MmGyAMn/aXO3Z8PFW/7w16hEr?=
 =?us-ascii?Q?sxKBOd7N4FefW9LDF94f+QzPPULLce39FAW36fKN35WkRml7Wrfq/ISs3hLE?=
 =?us-ascii?Q?qPmPRulbaNlfsDURaVuEF/aoNCziuInI9/1Rc8lTwi7A77qRz1ZVgZRvR1qG?=
 =?us-ascii?Q?3rtAGEx/aSsPo2E+b5+LgI008DwxMPgRtZoq0gpT0VfxS+TYAlLGj7knMPvF?=
 =?us-ascii?Q?7IrLNYuzArNGb9YesagHqFiJAF9meBx7KZVOoPazSFmD0X2QR376W1qiKWYz?=
 =?us-ascii?Q?9jhIk2K3EZRMsnXCnzMqfPowSXyR//4tmXbWvnxJCWpOvJ9H6T+HfeMPojEP?=
 =?us-ascii?Q?2zgviuIxWyvRz3HIgrx6tV3mhLHIwKModtk87uTz4VFOT9WXxJrAoPJ+jcF0?=
 =?us-ascii?Q?03F7KBpEI2w4aSzu4pj4gcfm+cddMfvsQmimSlg62Nuvkr17QYhB6rokb/IG?=
 =?us-ascii?Q?ftnF5kh8audaPFdZGUoCiq6XDgv8P6ZJ7gEjna8lgXxBhul4gAGPLrGFnasL?=
 =?us-ascii?Q?yo9Aq2hdAbSrRkbPESBRkYyqZD/qVqwdFWF3dHDgQDGAb3IKwkIk7jTEsdG+?=
 =?us-ascii?Q?GhAl9KKdqvsqNfibgvfd2Vq1s0voGPeH3IsVdVDfmxDJrPcDGCeSvGmVTP2k?=
 =?us-ascii?Q?hSJNb0deNw0+D6f4+LJMKqemFelF2zQT3ElOetdVzgWO0MUpMJqPlOGTzdPF?=
 =?us-ascii?Q?lx/6JKejOC/cjdrZnVy2CqI3944JtfHL/zCBBsxPwyfj4vBZ9ltRCCy7Sh0y?=
 =?us-ascii?Q?kjwTM58aBhmxg1RTETbBBFGu+JC1FeSOeuIXaU2c+ZWdDp++8frKWZHxSybv?=
 =?us-ascii?Q?68A2n2PBTjZl74D5cEHChmmZe9KM46dJRGIET2LuMIrsy3VAfl4EBiYKeSaF?=
 =?us-ascii?Q?JGngouLBNxXE0RpYptijhKOQ5Fj+k/Ta/rBpZACUkRxesisl85KJXmNhgUhf?=
 =?us-ascii?Q?L6A6fKlhEMLZES3HuUBuzrfx1khlzoQZPsSFb0ne3xa3A1a2tzXVFS2+IGNX?=
 =?us-ascii?Q?AvIEvdWiLOn022ieEy8h6bb79x0yPC8F24UFj2fsUhMj0ztE4s1FnvDSDny5?=
 =?us-ascii?Q?jj18o63IoUsaGxkfgT3/76G6H+Kys2F2icQnINDE9pk0kEfZmcnGAQRYFIUI?=
 =?us-ascii?Q?KcYq8fYCHLyHyyGmPH+aGRhjRzo3QjfOz0l0xWr+ZupQhN1BAHdq21q2VsMx?=
 =?us-ascii?Q?3HKqUYVYgi9OeW54fX3BpfLzSizYGJyKaHVKIqlZBjxNxsjpsnYG/Yd34Ug+?=
 =?us-ascii?Q?leN74Cq0ghi10iBz54hfh4tfsEVa1Y+8PALR0n0IYtIJgKhH4fhImIm6Tf8Y?=
 =?us-ascii?Q?7b4GgidIQeZ1FyFChpgxjdjt3RGRVkOxs8vtaEf9nwVG9N/cy8W9L6V90hRD?=
 =?us-ascii?Q?6396npY2JR6oVTpeBQ/Mgy/0K4/lmh62dGeS5QJBGjOvYU7oNuvmmx4j1GWO?=
 =?us-ascii?Q?mQWtHjPiR72YTtrnMC0NuyoVmJkeqilHpcqCivazOQW3nkIiVimWRNPk0O6v?=
 =?us-ascii?Q?3SFKDeQ1UIWq6Ex+RNTbsXMQIQb9ZGT57wYX69amDMyq/4IaBqVderpYUUZy?=
 =?us-ascii?Q?MTj30KqLo78D58qUhQUDrZc+sATS56ByNBminEV/LgdCWje521Ptr3372nZi?=
 =?us-ascii?Q?4Q=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 1477df71-845a-4744-62e1-08dc371eeaee
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 23:01:51.1030
 (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: d0W3oSlVmM0jLS+An1qFgUkwQxaqSanGXkmEjlwSP3kbFi+y0aElMILRmD9D+GlfanXjtmNkaa/pfShEPJX3Z6XDvWBVXvmfPpJFkZLEfLA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB8399
X-OriginatorOrg: intel.com

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the cxl-fixes tree got a conflict in:
> 
>   drivers/cxl/acpi.c
> 
> between commit:
> 
>   5c6224bfabbf ("cxl/acpi: Fix load failures due to single window creation failure")
> 
> from Linus' tree and commit:
> 
>   5141fa1ec23f ("cxl/acpi: Fix load failures due to single window creation failure")
> 
> from the cxl-fixes tree.
> 
> I fixed it up (I just used the version from Linus' tree) and can carry the
> fix as necessary. This is now fixed as far as linux-next is concerned,
> but any non trivial conflicts should be mentioned to your upstream
> maintainer when your tree is submitted for merging.  You may also want
> to consider cooperating with the maintainer of the conflicting tree to
> minimise any particularly complex conflicts.

Thanks, Steven. Will drop that out of the fixes branch. I ended up with
a late refresh of what was included in the tagged pull vs what was
soaking in linux-next.