Received-SPF: pass (google.com: domain of linux-kernel+bounces-70616-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Sun, 18 Feb 2024 15:00:46 -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: Ard Biesheuvel <ardb@kernel.org>, Ira Weiny <ira.weiny@intel.com>, "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: <65d28c1efccb_5c7629431@dwillia2-mobl3.amr.corp.intel.com.notmuch>
References: <20240219090743.1019a5f8@canb.auug.org.au>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240219090743.1019a5f8@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?RG4n4mi9sTk6DzmR4LXRLbQVdT+Iy4Lsr58W188HYYyUZJWJ3OC0i6/Qn4b0?=
 =?us-ascii?Q?dqvhSg+SbBw8c3NTLWqvYpsCEoCqr3yOjDtQ/Go/vyKxrfKiU/7tQK5ZIMSq?=
 =?us-ascii?Q?/BY9SLe630OZkjsBj7U1FZzGX1OMvvJZ1M6LFhpjIcRmEv3NTMT2R2uHgYWa?=
 =?us-ascii?Q?jcvxsUjssGpwvjg482MruBMCrG/DDiit5xn4f7AT2X10M+yCMKjW8Qv1XK/7?=
 =?us-ascii?Q?L7CD0LqejNoNuamEael6HGg32j0V07MiPsKF622PAETMlBxsWwHW5BKASqlp?=
 =?us-ascii?Q?b+pjtBfTXn2hY7uYwW0ljnxpruWyzgh26B0F/gQ9tufTivw+CHsyMyb7Rqfg?=
 =?us-ascii?Q?pQFeGtsoiWuUMAjmF1GStP1gEF3PMO1+hbiNgKa7FrBMF8oYX0fFWamDpGoi?=
 =?us-ascii?Q?JYKYVPf2cjLoS+/BypfsiOFn/odn1KJMt1lA+5+Wz+LpEXMLQlAH0W7Jqx9K?=
 =?us-ascii?Q?ntPJQnvQoMDJVIT1qo5BHT6ZshealD8R0yDA1LKKWZVkNQUBhNT6EhaQjXlq?=
 =?us-ascii?Q?2TA4W8J2tz/ldy1ayvuc2/1LODgHVoevmlVFklx/88qhVPhvj6Bq+pdmVnpz?=
 =?us-ascii?Q?d78EG81jzvfFfiMtiRvfqrLDBRcrgvfh9OsNlw7eCN/Jvzumo3GZksXAFXdm?=
 =?us-ascii?Q?uAoRis7py7V+DTex23akO3JtOkfjFJBrRGKytAiiH4FGBjyYvMdC5VRGV1+m?=
 =?us-ascii?Q?uI2KuAL2JrduM9vBblUP2+lES3iQC3MDygPU4t+sI75M6ZhTlK1zsOGLW4nN?=
 =?us-ascii?Q?xyyAT/rjzD+kYdgSfaGrOtHHy+6qxiL1M+B/mVUlAqQEZkKSYwA8Xx4TgBXM?=
 =?us-ascii?Q?THJyoAKPf7btd90g1PIHnnG4FlJWwPbAdx9zfH5iUdwbSvCStXJ8lx8fT2/a?=
 =?us-ascii?Q?CfHuLKX7sm4Rfvs3R+pCBbHjVsq+Nxyhi3yhncXGMC30AGWwtfIJxY9U5IkQ?=
 =?us-ascii?Q?VgkPW2gZXc4fd+RDgVYsjrYlWeQSu1S3vd8Row0fVBW/WWBJny2i7qP/HtD4?=
 =?us-ascii?Q?ql+TyZKntSuoVQvgoCcrMmlfxrRY+6kTl0E47Bg1kdyuYfiam3OGwncJBo6g?=
 =?us-ascii?Q?L4AKdjUJe89LWryVewk3LS9fvjNNNUCZGbClJSZ/25oJnrgzOLrskMERpd3o?=
 =?us-ascii?Q?6JcoWxRT88Bb/NQPOFWO5wVd5mNrAk79AAxaxCJSHyoIe6VUp+VK5eXbIgap?=
 =?us-ascii?Q?U3nydiHowh8UTW8H/2v8REg+ep8OizNDZNIBGpzUYqQwOBYywezrXYvcJ1d2?=
 =?us-ascii?Q?BJIA8F0dJwJAGjKCCXV/eJkv5g+iOa44UEBJbD5yTiW631dpM/MSP1boprbt?=
 =?us-ascii?Q?S6BC8XggIDVJUDxM5kXYqPNHyAIJF/WbNsX1rX7i31+YXypbRrZown15n0PW?=
 =?us-ascii?Q?Vc7YrhcqTGWMKgxrtjITSIzOTwxwNG6rKP9QimgxC8+5z/q669GinQYpQ4/H?=
 =?us-ascii?Q?xSqo6etN5zB68dEgpHGYQ2DUXrNTRVgjGqhnzt8nKBYisiUvSIjEe7WxMrpz?=
 =?us-ascii?Q?Ygol39Ag57O1J0o1iRSrQZ8uwRyPLY+R49PC7k88Rv9zEo1l8+t1+3ABQmNj?=
 =?us-ascii?Q?VDM05tm3FT1hXvLHV3rFVbhHDbAMbdasAiYNfvX88UoopoqTpy+vbRQ0pjgS?=
 =?us-ascii?Q?Ew=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c485eee5-3871-4068-8935-08dc30d5722f
X-MS-Exchange-CrossTenant-AuthSource: PH8PR11MB8107.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 23:00:48.3569
 (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: 0Pza6CrifJBLnXN6jTBs/w0HGZ/+95Y2WiBlbj8zf+idfoAzZQnkx0VpO/Fn7143UiTQlyzLxFsEXkHgHEtQIOhC+riQwkLuTP78CcbfPP0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7384
X-OriginatorOrg: intel.com

Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the cxl-fixes tree got a conflict in:
> 
>   drivers/acpi/apei/ghes.c
> 
> between commit:
> 
>   54ce1927eb78 ("cxl/cper: Fix errant CPER prints for CXL events")
> 
> from Linus' tree and commit:
> 
>   6cb604ed24a1 ("acpi/ghes: Remove CXL CPER notifications")
> 
> from the cxl-fixes tree.
> 
> I fixed it up (I reverted the former commit before merging this 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.

Sorry about that Stephen, I had not realized that fix already went up
through Ard. I have rebased the removal patch on v6.8-rc4.