From patchwork Thu Jan 11 02:23:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 187144 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2411:b0:101:2151:f287 with SMTP id m17csp1185866dyi; Wed, 10 Jan 2024 18:25:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFqAn+v8gDMmm6ic8syL4Bg5e2PHsvQGNDfzb4CmMRTW3pA4Dyc2uOpCE95H7nhN3+7uA3 X-Received: by 2002:a05:620a:135c:b0:77f:44e2:dfba with SMTP id c28-20020a05620a135c00b0077f44e2dfbamr677600qkl.133.1704939908198; Wed, 10 Jan 2024 18:25:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704939908; cv=none; d=google.com; s=arc-20160816; b=xogYAEolDz2I70LqXpe9ufaDUd7f4NzRayRz+UmXeEg135d10IZSB5NV3Ax9nsc2qd OQ/3AiMhs9fTtgBlqtbIvsw67kavJkyExVxG2lzpPbs3kiu0YSVC7t8Kmezjyx5OUt9d OYfJvjF9I0yqVUi8d1aqkZX3NTrmTsMd63QQSPt6C40KzrOVmwazx8qODv5gtJjiKEvc kkty/+93cf9vU+TwiLG4VMTCa7vu0FzsUZFjmF3wXqG5GSmOt9sa+7Ld3IqE8h4Lj0ne MgCmYVOVqPhnYA25+Z9PdyWC9kw7Vd3irXteT+5vF16Rx2RmWqzLS4X5b6qzsFe9eWy6 7TzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=y3zg8DRHWACr6iG7oCCXR9nMZmLa9pK1+1GoYga4RIM=; fh=WeqJJIRUswcPuW10oyFoKqXR4Z9nXLmYLJiWTgiLY9M=; b=DsZSO57LXC3mCwuXvdRa6VzpG2DVT3OKlShSDJNqQQIeqxWGiGOEV/1AusLAiQTXqn q6kssNKJhxPePEfQvyoUpDEVAmn05SnB7JWttnihVi8cnEDpE0FW7BND9Y+ftceF6QmB nDoCMXiH0JottPW+mQKQRbL6P0jZoiEyVZyKKnnjgx3p1GdfIYMTLas8WDIAii+D8VF5 7JWcy+eLZxS9I5DE0DmcEMXM1sYj2aWyQRaK6Sdcy5PJVJt80J9xvILeyfL/LSrE+DkK TFayWVz2RoVaxTSZJTuoEuk1gX9NHQYk0SAQIc3P819TG7wh6L9B6ebVaL4nl2H4m/31 /jFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=G7CYmmba; spf=pass (google.com: domain of linux-kernel+bounces-22970-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22970-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id bn6-20020a05620a2ac600b007832e7649c8si75493qkb.301.2024.01.10.18.25.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 18:25:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-22970-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=G7CYmmba; spf=pass (google.com: domain of linux-kernel+bounces-22970-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-22970-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B80DB1C23FEA for ; Thu, 11 Jan 2024 02:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 25C21D271; Thu, 11 Jan 2024 02:24:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="G7CYmmba" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 01F445663; Thu, 11 Jan 2024 02:23:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704939837; bh=y3zg8DRHWACr6iG7oCCXR9nMZmLa9pK1+1GoYga4RIM=; h=Date:From:To:Cc:Subject:From; b=G7CYmmbaq5bdjj5RP9oz98qvLalfc7h5aaHTYSmI96D9TozeaGQDBYjumHpbRibSi 8zljHraDO93xTg7bwaO1A3xerx832PPnF+rX4ZHD57c1Gjn8JHxCM0O4LTSXJvVByj juyvr9XY7zSoRowIWeZoQDKUWwdNuY0ZL7jDDBQJ0FLNHd+DIPMj8dBHLlWSR0t743 H2iE04z/VCosMF0+MMqGBGDpKWafvmUwxB9D2J5GWUHI9uQ/93Yyx3JFarTZdZIdsx G4myWsmzeo2ZVhA2CPnamga+rQ4HQZQizs81prF4zCnOpE6p4ILWa0R21UOYOftR3P Bw5FuwoUG0jYg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T9T4X4JbNz4wcJ; Thu, 11 Jan 2024 13:23:56 +1100 (AEDT) Date: Thu, 11 Jan 2024 13:23:55 +1100 From: Stephen Rothwell To: Dan Williams Cc: Ira Weiny , Linux Kernel Mailing List , Linux Next Mailing List , "Rafael J. Wysocki" , Shuai Xue Subject: linux-next: manual merge of the cxl tree with Linus' tree Message-ID: <20240111132355.66a1240c@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787759069316653842 X-GMAIL-MSGID: 1787759069316653842 Hi all, Today's linux-next merge of the cxl tree got a conflict in: drivers/acpi/apei/ghes.c between commit: a70297d22132 ("ACPI: APEI: set memory failure flags as MF_ACTION_REQUIRED on synchronous events") from Linus' tree and commit: 671a794c33c6 ("acpi/ghes: Process CXL Component Events") from the cxl tree. Thanks for the heads up, Dan. I fixed it up (see below) 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. diff --cc drivers/acpi/apei/ghes.c index ab2a82cb1b0b,56a5d2ef9e0a..000000000000 --- a/drivers/acpi/apei/ghes.c