From patchwork Thu Oct 19 05:48:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 155294 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp178209vqb; Wed, 18 Oct 2023 22:49:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgU4bSJw/myOnbrCpZ+xICm0ATvIPIBDwpBqLit6ilsSJc9vxVtjsVpfPqzpZ7iOWFB9NQ X-Received: by 2002:a05:6902:38a:b0:d9a:d20d:7d5b with SMTP id f10-20020a056902038a00b00d9ad20d7d5bmr1396469ybs.19.1697694555876; Wed, 18 Oct 2023 22:49:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697694555; cv=none; d=google.com; s=arc-20160816; b=ltCbjLTMSnSevUQv0UukwjoJeBTukdjH56DnCqPXyB6Jaer168ELQ27GpU/xGw4dA0 R9WrwRq7Xo70FtKzjPhqueg544q+vmB1/F/MLZO6SnnmM0vtIhtwdrvkBye3XXzxEOTR le/KbIFq4kp/FEMvyrNk+Fo/NeA43VgpNbgx8FT0PlBD2Ra7yUvrCFy657yP3c4A9gB0 umMc3zs61QsCdx6JwNrfORuv4EugMUX56GAN+RnCVK8o7insRqyaW+SA+cfwr0fwkLWq eFxwBlj+0gsJtdC1093LSLAoSHoMNOOzrKnR0pezoR8n6U+/LpfeS//d7+3GKe19J5ga Ukgw== 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=CR7dWSEwjH6imZHnVlXAbeQgnXp1ZZMTjjN1Ld5riCc=; fh=R8E14LiZxW3TeAhRnq2nAryS/HTcLh5UEN+rchhZE2M=; b=ZxyVIhsmKxWHRSBs6Y6sfavXrWpvObAeGwqXd3RDPmjcTgDqFd2abb3sgqNet7NBhK AORoPfXwJ3QCx20Y3Jb7Iw8SPUtlJ9s2Ogyq0IbhS4Gug1US3SWBRW1owujioUv0U1z9 8KtvEBy9/zzQIjUHCRtoG5gTuRx6a74QUoDXXVcNGx3lxi96y9IRIinQ2vzpJiB3YLsu X6j0rSIY4iv/VDpccl4VK+dVD+c3K7D+WEo6JbBaXchdoQwMQhyE05w3FruXej2Yngsl mQ2HoiwWNhjgB9hzEcSKyR0+ImKXNEQpDKhvJMb6qXLWkjahwo0GWIMIqnOfhx3NUAvY 1Efg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=W1EOf7KB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id h6-20020a056a00170600b00690cc6f7598si2411391pfc.247.2023.10.18.22.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:49:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=W1EOf7KB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 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 pete.vger.email (Postfix) with ESMTP id 9872981823B3; Wed, 18 Oct 2023 22:49:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231284AbjJSFs7 (ORCPT + 24 others); Thu, 19 Oct 2023 01:48:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232658AbjJSFs4 (ORCPT ); Thu, 19 Oct 2023 01:48:56 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF3E8B6; Wed, 18 Oct 2023 22:48:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697694527; bh=CR7dWSEwjH6imZHnVlXAbeQgnXp1ZZMTjjN1Ld5riCc=; h=Date:From:To:Cc:Subject:From; b=W1EOf7KB8sRaSXlw9dVE0T0wXyu1Oyqnzkx0PJNcwP5Q2nbMp0apO4UJHlIciNHRk 3kMzxiWUH5Z2mV0xY95EP9WXEl3If65YbcBpSNzCvrE3J4Xn94sj67kQhNEjObHOTi 1Dbx4XTWm49rA+UA9tv98qjsngmFQ8VxvJptN6cTEKReQsdLK68fUf4Hs0QKUe8tC7 ArKUDEs2nKzd8JVTR8hHeBNyx2I8oS/3Z1LlzQc5yMg9ZpKUwwzwh2uWIxjUgtbNMS zWmsBN6FGZf+sjrYpM0NaXgVljCVXIfYJWI/kH/KpFK3okTvGn8Qg67ECIg5vvRxVo YhDorjcy8HzEw== 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 4S9xbf4FkWz4xQQ; Thu, 19 Oct 2023 16:48:46 +1100 (AEDT) Date: Thu, 19 Oct 2023 16:48:44 +1100 From: Stephen Rothwell To: Yury Norov , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Alexander Lobakin , Linux Kernel Mailing List , Linux Next Mailing List , Paul Greenwalt , Pawel Chmielewski Subject: linux-next: manual merge of the bitmap tree with the net-next tree Message-ID: <20231019164844.4cc37f93@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 pete.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 (pete.vger.email [0.0.0.0]); Wed, 18 Oct 2023 22:49:13 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780161766589562790 X-GMAIL-MSGID: 1780161766589562790 Hi all, Today's linux-next merge of the bitmap tree got a conflict in: include/linux/linkmode.h between commit: 26c5334d344d ("ethtool: Add forced speed to supported link modes maps") from the net-next tree and commit: f849608560af ("linkmode: convert linkmode_{test,set,clear,mod}_bit() to macros") from the bitmap 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 include/linux/linkmode.h index cd38f89553e6,f231e2edbfa5..000000000000 --- a/include/linux/linkmode.h