From patchwork Thu Jun 8 00:31:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 104780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp592798vqr; Wed, 7 Jun 2023 18:15:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5pCv5F4KKswMENifFzHUC3lIXN8SHqMUhzJlaVfrpsMt5KOQYhTEGGQuh+uch3NvBV7L14 X-Received: by 2002:a05:6a00:194d:b0:656:e7a2:5322 with SMTP id s13-20020a056a00194d00b00656e7a25322mr8761752pfk.26.1686186936096; Wed, 07 Jun 2023 18:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686186936; cv=none; d=google.com; s=arc-20160816; b=KARFo1tCC/z2iWBPXSGTY797ugaQGtaihopVZEMe6XZbLQnVDG9VTEXSlEJJEmAl12 sdD0SjblShl2dldelyb3i8KKmabnXc618b2kXCLkczSG6T8trpT6XB7Q2QWgCqB2IQlt jpGJjQsT3MB0pvnewIoraljE8rp17BBxuPcBxcMOq0ybxmcAZV1+3hyPhH0q8aMqidKe 7bwE6qz2s436B/AaFyxyoQQ/88ilbsf/SiIU4x8+6+BobhxwuOWCBFuYbx2vC3FK/N+H tlQg5GFI61Agsz+EIErxqNr3XI34NDjUT1uJ4zF9fKyidCFaQtRMlRfLc9pBV4bnEhvs 64uQ== 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=8F60OUp8CBqwzKFBb/J0sj2amxP/qg9IkT2KgaJBCzU=; b=1IZp0SzVxKY1BhRIOZGh5Bz89vkxNUKQ8VeG8WUQVoE6Qp5uqEL0TbZikjzoCKdh64 3Fk1HZZHQ0YQJm6iPO1nyT+8wbGg42YrLLKCI0yC33eJ6X9BaOzj81X6aBaXXiyaCioF 2VrhrYg5wTNZs9KHNmAcJ6GolVl3tbL6Sf6LfOlzyj43nbAO7S/1T31kAWQEK3VAFSBi tg0HOPFB0RzXQ7EPilOpESZU9AOQvD1xzH1qooP8CkWa2alxLomDGDWbJZ2lWCTGHXTP +Eipn6fNkBMqjxoV/McQNhEN4lOQS1vGH/ki9kFEMpeCAWFk41ktjnaXAGAjL3EzieYr nGoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=C3PWvFii; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 79-20020a630252000000b00540ca6239a0si125077pgc.538.2023.06.07.18.15.23; Wed, 07 Jun 2023 18:15:36 -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=@canb.auug.org.au header.s=201702 header.b=C3PWvFii; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231151AbjFHAbj (ORCPT + 99 others); Wed, 7 Jun 2023 20:31:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229659AbjFHAbh (ORCPT ); Wed, 7 Jun 2023 20:31:37 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 609632128; Wed, 7 Jun 2023 17:31:35 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Qc4rw0QHQz4wgv; Thu, 8 Jun 2023 10:31:27 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686184288; bh=8F60OUp8CBqwzKFBb/J0sj2amxP/qg9IkT2KgaJBCzU=; h=Date:From:To:Cc:Subject:From; b=C3PWvFiiyycWravL3+GM6DwHS5Ln6nUX1FN8GqvXB9i/H+AlZX2OtNWS0xpxem7Df at/w2As1RARwqgY/s5+aAlXcrIlHk1IsKqT7huEe7/mwnb0v2eUtL4BNSlEyXs7M0F XJT1fB1m6gCUQhcqlR9s8WO21VLC/aRZsISIFWFFNjNLsUeiqGbePxVyZACB1NUe5g rDtVhCQW1W7j06IQvogFMcd+EFYxmadIpJ+tQNBV2beM3OyuD3A/DEMR3NcNTLrj4j ulALn2z2nPi1+eSSOeRZ3HI9d/Kq0uL56q24XLZMCWASWJpFE/WWV4gJKw8HQoPB7f rA3gHcvka+gYQ== Date: Thu, 8 Jun 2023 10:31:26 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Jakub Kicinski , Eric Dumazet , Linux Kernel Mailing List , Linux Next Mailing List , Vladimir Oltean Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20230608103126.24c01d43@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,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?1768095152653583525?= X-GMAIL-MSGID: =?utf-8?q?1768095152653583525?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/sch_taprio.c between commit: d636fc5dd692 ("net: sched: add rcu annotations around qdisc->qdisc_sleeping") from the net tree and commit: dced11ef84fb ("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()") from the net-next tree. I fixed it up (I think - 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 net/sched/sch_taprio.c index dd7dea2f6e83,3c4c2c334878..000000000000 --- a/net/sched/sch_taprio.c