From patchwork Tue Jan 2 03:55:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 184211 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4257874dyb; Mon, 1 Jan 2024 19:55:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUTjwuloqRgSoXpM0ZKs4mGQLujBArKNRkm/iFWzHv9lC6+elPOoRRFBagzO7ATdB8LAX0 X-Received: by 2002:a17:90a:aa98:b0:28c:4ee:743e with SMTP id l24-20020a17090aaa9800b0028c04ee743emr21130437pjq.28.1704167759468; Mon, 01 Jan 2024 19:55:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704167759; cv=none; d=google.com; s=arc-20160816; b=OmdAIpi6aLm2nvHRM4W8LVvedgQDWh+XxZ76xA3U/3rmNzLxdpQ4mpeIxLz6F1lWVA 74fUehtWRSl8+dA8r6YLU40i9uygXpGXBCftOQaVj4DhqGKCNhwde1zzqiO6Bl1Ajg0J Ca905DDDMkosOiMbM/xWVWUNwUUemU+/Osb4GOO95WdV2ummQ3Vmf/D5RCXnS59QIxPi BLPr8a4L+XSe4MQ1pdNjEwkoJhmZQrm3nKtEU12+mKfLWAifEOMkMzwTsg/3FRGlMdzj QuVqx+NR3tCWHGsCQVlQYIL1zQEHuzE3VdyaHHqtYcnky+hX+w5khFKzaxcQL+hRxcqd Ae/g== 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=9EJzV/K6BJHDIpYls8ca3lyX+yAhIKGtHlsors8qaBw=; fh=201Fal9ONiqibXpdIR/yWa6Tq7kV3q7XZeiOaxiqvYg=; b=R+wzU0RMoL6VjaprX+sq1PVCM3pxq4X8izIO7xnKqYULMJxj5CF/M22BEko/EWphvG jM7zlbc1pyk+xXFAGYBv0A5vd19XGTvJ97Srwe2fIjgMYIbxiZ5tXSCcmlNFCI4JIxgw Bk4xTeKAnrzHWax+2DPIMe0aOMy+NP8hHfp9fXyOQalmVIGeBn7GAWeltvzzu0OQAn5Q r1DZ61UCT2D/T5rJ4ls60vMJRwP+40YqiIacYanAsUT9mpxdYhJC0lB/fKdmhzAP0ezT 1ytwxymVrQQUCw9ezLtcsHdEa0e6rk7KNECTDO8asrmUO7+JwVG1jsQcToyqsncFgKYk FfrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iImMsRKf; spf=pass (google.com: domain of linux-kernel+bounces-14006-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14006-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id n14-20020a17090ac68e00b0028bbed9e5a5si22019044pjt.96.2024.01.01.19.55.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 19:55:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14006-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=iImMsRKf; spf=pass (google.com: domain of linux-kernel+bounces-14006-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14006-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id A91512817A0 for ; Tue, 2 Jan 2024 03:55:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 647312592; Tue, 2 Jan 2024 03:55:44 +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="iImMsRKf" X-Original-To: linux-kernel@vger.kernel.org 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 A461A1856; Tue, 2 Jan 2024 03:55:38 +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=1704167736; bh=9EJzV/K6BJHDIpYls8ca3lyX+yAhIKGtHlsors8qaBw=; h=Date:From:To:Cc:Subject:From; b=iImMsRKf9IcHsewduk7yOdcFUvwJ0vk7FY2bCgvNCLevQqnxDE9th4olCvzoBxeeH 1ZUfScF63xjpEKkhVHmUSAjnGc5vIp1kkiuxaF6f2h0uvAL5F+Jz5Ff/cYWMDzKaO8 aAHpWut+HRwyXOh6n5NDJKlg3rxlYpr56JgCngxkRL50Z6MvQh77NUCllLCg1RWnei HU6+dJG+jnkgIs7CB/KwvWX0Zn89OugN9czqQ+8/Lx+n4EX4xJwRUM4FK/I6MBubXM GXlHDySAbtjOWYNA/k19Y8oWyciYBaLazzqJz7YTcikOyf9DcEnY4d02CazctuOupS 3fTmfNKeTqrPA== 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 4T3zXS431hz4wx8; Tue, 2 Jan 2024 14:55:36 +1100 (AEDT) Date: Tue, 2 Jan 2024 14:55:34 +1100 From: Stephen Rothwell To: Dan Williams , "Rafael J. Wysocki" Cc: Dave Jiang , Linux Kernel Mailing List , Linux Next Mailing List , "Rafael J. Wysocki" , Yuntao Wang Subject: linux-next: manual merge of the cxl tree with the pm tree Message-ID: <20240102145534.5c977c95@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: 1786949034936129230 X-GMAIL-MSGID: 1786949412924171380 Hi all, Today's linux-next merge of the cxl tree got a conflict in: lib/fw_table.c between commit: 4b3805daaacb ("ACPI: tables: Correct and clean up the logic of acpi_parse_entries_array()") from the pm tree and commit: 60e43fe5285e ("lib/firmware_table: tables: Add CDAT table parsing support") from the cxl tree. Dan, thanks again for the heads up. 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 lib/fw_table.c index c49a09ee3853,1e5e0b2f7012..000000000000 --- a/lib/fw_table.c