From patchwork Wed Apr 19 19:22:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 85535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp622257vqo; Wed, 19 Apr 2023 12:37:01 -0700 (PDT) X-Google-Smtp-Source: AKy350a217N//Tnmvy+p6hoFwhzmhDrFo82E9V90xuoIitCt+XTDKBBsLWIfC6QYb9/bLQ244LdN X-Received: by 2002:a05:6a20:1595:b0:f0:9cbd:78e3 with SMTP id h21-20020a056a20159500b000f09cbd78e3mr5157773pzj.0.1681933021390; Wed, 19 Apr 2023 12:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681933021; cv=none; d=google.com; s=arc-20160816; b=OU1LVP234RfJOZ4RX4vrx8jnIGZwbJJsVkIqw6l7Tlu1KRj7ETqoWPgrYDkcu2Fzqk CvrAV5nrdnnDBPeGLk2qMLIM+RguXdCmaDTMJ/Bbm3qQ0RNKh8fJ5B7AXxrIQIqzcLOr unjejSWdPdlxoJg9+JROZ2VujF52nG+GWvz/ysKnXJHm/01u+aHYhcQCnj2iwifKYMun EKix1TuTvzImECNdSwsCc1bxD4mk0Pdaclxm4O5tZEsfSTpFedstKKMX14V8y0d5q9QV t2GkfB3HTEBi538ezMv3TAuqJw452sYf4mzmRJ+tma5cHfZqr0Vuj7vuzxgIZs77YunK +60Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=X6Tg2WipKb6DmHA0b9SqWxwJwhRPbgdFmwgNZpY7an8=; b=sauGnrymB3MaV0kjxazb3ojn6YpnaNUfPblG6X7uoO03MIL6JsaTD6wgm7y3xax/9I qq6CoCNCVkQqK5S3v5lvFzzdE04bGbksbjWeAh7vMJ6UWGdiN7AMxyUah2wASWAENYse 9hlrbf//XFM2fSaAPmxg46GQrYbkkwCz2elphdrf+YjAMcaJe4fzC/gjhPAXtYRsTmXt mrLPGhPBEpxrW9gjfSKRftQH6qxPpz3jEqTyqIHnEdAr88eDyMP/+i4ZGNR+8E9H0g0w dnTkfIdV13E5LE6/4Rq+21SerF02XL+7KR0Lt5zlpubwfBXKT174uG2jHSdj1ES0lPkC rnaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Id9KKEqa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h191-20020a6383c8000000b0051baee86c05si8593052pge.736.2023.04.19.12.36.48; Wed, 19 Apr 2023 12:37:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Id9KKEqa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229572AbjDSTXQ (ORCPT + 99 others); Wed, 19 Apr 2023 15:23:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229499AbjDSTXP (ORCPT ); Wed, 19 Apr 2023 15:23:15 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1465259E3; Wed, 19 Apr 2023 12:23:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id AC0AD6400C; Wed, 19 Apr 2023 19:23:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 572B7C433D2; Wed, 19 Apr 2023 19:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681932193; bh=or2HJONe3O8ddoiHASXnOq90Hlfo90B4VuLfBfgdYqE=; h=From:To:Cc:Subject:Date:From; b=Id9KKEqa3u7Hw33Z0acnzBZadz+dMCNFxIQLyVhS3u13XRkCWlLnoSQFI0xU+b9zl Xxs5ltpxuOWIEUHPofCUCGkQFNNZIYozsaPSfaNpyqwTgLgt/OAdIG57CtfFReualA Yn22aVc34YNL8YvJSYSwfnTmsk6njjmFzNYDBSvmDnuTQANfhQlTcTtGTKswKamb9d aBZy19fy3Tlh4THITpI4Y30Iz0tFIbKMznNYy2e8XrVCH15a8LJhYk3xUOh75FQpSS T+vqjYdsQnLm1jHnfTXgpqF8uStz/JU67u4Wef1trYmvDz/dk+AGnfIopxLSBeaAlW ip/07oS8GyYNA== From: broonie@kernel.org To: Dan Williams Cc: Andy Shevchenko , Bjorn Helgaas , Linux Kernel Mailing List , Linux Next Mailing List , Lukas Wunner , Mika Westerberg Subject: linux-next: manual merge of the cxl tree with the pci tree Date: Wed, 19 Apr 2023 20:22:16 +0100 Message-Id: <20230419192216.149588-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763634599804325145?= X-GMAIL-MSGID: =?utf-8?q?1763634599804325145?= Hi all, Today's linux-next merge of the cxl tree got a conflict in: .clang-format between commit: 09cc900632400 ("PCI: Introduce pci_dev_for_each_resource()") from the pci tree and commit: 74e491e5d1bcc ("PCI/DOE: Make mailbox creation API private") 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. +++ b/.clang-format @@@ -520,8 -520,6 +520,7 @@@ ForEachMacros - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_dev_for_each_resource' - - 'pci_doe_for_each_off' - 'pcl_for_each_chunk' - 'pcl_for_each_segment' - 'pcm_for_each_format' diff --cc .clang-format index 2048b0296d76f,1c85f6ddc71ab..0000000000000 --- a/.clang-format