From patchwork Mon Oct 30 04:05:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159472 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1974317vqb; Sun, 29 Oct 2023 21:06:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFlrCmLWFO/S1UX7xcrcDhVBMg4KRegNELdJ6qil5wCNva3qit50RA++vbA3AqCHu4oGBQ5 X-Received: by 2002:a05:6a20:8f1f:b0:174:af85:9626 with SMTP id b31-20020a056a208f1f00b00174af859626mr7680597pzk.11.1698638780632; Sun, 29 Oct 2023 21:06:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698638780; cv=none; d=google.com; s=arc-20160816; b=eyGjuoOFTcTHhymHDYLCFVz4+5pZzZEl32bdnGC/tt5AzcLUenHKSTm3B6HYI/USOB /5bGdYAXUMuY5kv8K8+LJfK5GynudQO6UAUM6wHJ6xncMQGuLZAtSJVhof8gYdzJNf0P EHqO6OjldulPt38zU70W/0oQNDgX6WTX+1qAtkCm5MRn38lv6fiJo+OJtPH5fzYN8FHd aBMN1kQ2lwXBBWdj3EnrcmXnnR1OwN/CXfNQFLqpRXs5kgxm7WWwBtbw/OVw7xBvnY+W nl/ifOFOtZaPqe9fIL1+KZcnd35k5/dzfN+GqB9R8PmtJSrenFzNYr8q2B+/bT2DeeAg SvSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=xDY1FF72MCKSgLkCNHi8hlY0YdxTF/uJi8s+M0DfQUg=; fh=v8CMH/0+pPVav4vYBXgx56cVDeQx7Ofad/GGg3Fo9X8=; b=eFgLlkHkeItfBDV2yXRWMUuuemg17UkJhVoDUZq7C92OAL0mMAXpw9lbzFhyG7zIc2 E3lJ1Pj4/zjN/Y/zL0BPKyHNs08Rz67ek+gXYpY8nvFCFVcUTpxBIr/Dwkn0g0LbkhwY 6CrNqs5nR1DnAUiY78eeRSDgj9yKwgAws8P+5hB+au1m0bcEctHnv/2tYbTGvpd//M6y mZyB2oRbwngYblSaqfIPH9QQg7twlRFrdKa1t9Ptp22rrkXZl3RQ+vTv1HTUJ0dmzG47 2+vHLfuSVmk//fK7Ge7XM7+edzV+x/j04jAS/6o5LNcXjHfCKPn/ulN5oK0MdJ0dNLrF 51Lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hQ3VYhr6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id md22-20020a17090b23d600b0027763ca82e9si4318164pjb.91.2023.10.29.21.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 21:06:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hQ3VYhr6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 07400809583E; Sun, 29 Oct 2023 21:06:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231599AbjJ3EGF (ORCPT + 31 others); Mon, 30 Oct 2023 00:06:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231545AbjJ3EGB (ORCPT ); Mon, 30 Oct 2023 00:06:01 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5467AB; Sun, 29 Oct 2023 21:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698638754; bh=xDY1FF72MCKSgLkCNHi8hlY0YdxTF/uJi8s+M0DfQUg=; h=Date:From:To:Cc:Subject:From; b=hQ3VYhr63lyMzM3K+Ty3E/yv16wKiGEaQ0mlPQmhAsAtH7TlkvIg+k0TFxouSm6ff MCsBPf6ke8onupY+cZQwJSnjIYHQA1LSbejzE2oaDzJgJCFZwpYz+5izRSa6YHGBkL Xvw9U/VPewnkziuEsQVN5irGmmvQDjewi9SX3QWKcSsSVyg3MOzK661+8p7UelK8C3 ztPOB3mZxIK0uMxxCnBBNXun1B4fqcX7bEVnecO5JzQxHN27U6J3jvOEMR3ULew4Pd WVO4CCDoNSX2sqiQM//QgcCM05R4UXjUjV4/8/zlH+kRuTo3S6Dk1g4nqDUVJse5J9 uI0wRP+Ka5tzQ== 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 4SJfnr6V6Rz4xRs; Mon, 30 Oct 2023 15:05:52 +1100 (AEDT) Date: Mon, 30 Oct 2023 15:05:51 +1100 From: Stephen Rothwell To: Dan Williams , "Rafael J. Wysocki" Cc: Linux Kernel Mailing List , Linux Next Mailing List , "Rafael J. Wysocki" , Robert Richter , Shiju Jose , Terry Bowman Subject: linux-next: manual merge of the cxl tree with the pm tree Message-ID: <20231030150551.505a5d7b@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 29 Oct 2023 21:06:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781151858347336788 X-GMAIL-MSGID: 1781151858347336788 Hi all, Today's linux-next merge of the cxl tree got a conflict in: drivers/pci/pcie/aer.c between commit: e2abc47a5a1a ("ACPI: APEI: Fix AER info corruption when error status data has multiple sections") from the pm tree and commit: 6777877eb7a3 ("PCI/AER: Refactor cper_print_aer() for use by CXL driver module") from the cxl tree. 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/pci/pcie/aer.c index dcd35993004e,36541bfab688..000000000000 --- a/drivers/pci/pcie/aer.c