From patchwork Mon Apr 24 15:47:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 87107 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2860726vqo; Mon, 24 Apr 2023 09:21:53 -0700 (PDT) X-Google-Smtp-Source: AKy350ZfBnmA1qoPYMO/5aRs45wYu7ik602XKcIsJRqFKit/AVZypcIFW8x8WIbDS4ImjE85Tx4b X-Received: by 2002:a05:6a20:7d8e:b0:f2:bfe1:4867 with SMTP id v14-20020a056a207d8e00b000f2bfe14867mr11804846pzj.17.1682353313373; Mon, 24 Apr 2023 09:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682353313; cv=none; d=google.com; s=arc-20160816; b=WPMSPWxWXO/pb4wM6kHj2Ss9UNNpebMIe1IE/nKJnsNWzAjSndmKsXMGp2x3dLayBn uyExiOxIaJsnDpHoKxjEoGre8Kux0s1dsAZkM4KifMd93aqJS6LcNnL4dfJGU+dnah7j xpcSoVcD4IRMBgGDwuKcxOjLJFq/sT20hC4obafXQxwj3wSILrVIG1L88gY/R0OgGTqc rhoc8B+vUTfc0nnOcmYM36hycd4GP4cIVYyAkn5vnolQaq99ka7NcOqF2V0kwMMGHKyh 0r8qKN1/NSRjpYVNQQbxgNRId3cTYovGAOj45vi4Lz09I9RErHZiNpGvAf96lg1lj+o1 bnOw== 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=/oAe3OuDQWH0Ep46gqs9J+KKAUv9UkdXBnVx4/YJUTI=; b=veJqJ1then+JfBF8rAF6W9EEmwmKpZgPzuyUFSNOQHJYxTWniqej/XROLAed/XR4nB uzDER05a2JUPpJ9WLNIOMcXzgaz5D4zM0ZdVTDHGql0M+QVYebDPLyc9L7Q7OxP7hUST rqM6123cJEv+wfrDT2ZwM5Vq06zQo5r2KATgkp44oONNfvuiOtNhHAf+D/FaIradYdDF tcwgqX39eD86K8CTWZfobWQlFvtBUwfhBhdx+0WIc3+rLlR3dN1T/Gvnh/SbPvNGRP8Z x9kQz73s45p2dG62dpNlSBk+l7hrj1z2y6YW31CAjlAsTSgHaselKTC+4l9Tx2dnaMaZ wpHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=emyPd+T6; 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 n7-20020a6546c7000000b0050c0e269719si11445438pgr.513.2023.04.24.09.21.38; Mon, 24 Apr 2023 09:21:53 -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=emyPd+T6; 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 S232112AbjDXPsB (ORCPT + 99 others); Mon, 24 Apr 2023 11:48:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232100AbjDXPr5 (ORCPT ); Mon, 24 Apr 2023 11:47:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18CC0423C; Mon, 24 Apr 2023 08:47:53 -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 060E762675; Mon, 24 Apr 2023 15:47:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C744C433D2; Mon, 24 Apr 2023 15:47:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682351269; bh=tCNIk5EDB2upDajNictvyCPC5TncgFO7t/ssn/aQVR0=; h=From:To:Cc:Subject:Date:From; b=emyPd+T6jWaVtz7Nn4UrOWuN3wX/WlFE10Ocq/or1/0rNuE0ioCCdyNz/s/UdrlV0 NX+oXKTp/c4io2xqZ6PyG1E0VzhLrXNfSgVzx0b4vcIXohibFAs0VwgswATN8zksEv dADvi9pVSN3ZEt0xCNJwDxq//yJ2pVRsc2Bcw1LmNas23I3hMf9w4tJ2/2Y/rohmN+ 4XXJQDEndsOOvopOWxFtgaplwLxFLdv70occ7jBIM2GD94qhpuOHTkBrQVCUlF4web rF8rPTpqt/x50HiMIh/Cdw1rezPdak6jfFjUAbGdSt2owhSo5duvTM+pUrls/cPshG cAF8uagK5ms7w== From: broonie@kernel.org To: Luis Chamberlain Cc: Linux Kernel Mailing List , Linux Next Mailing List , Long Li , Wei Liu Subject: linux-next: manual merge of the sysctl tree with the hyperv tree Date: Mon, 24 Apr 2023 16:47:42 +0100 Message-Id: <20230424154742.131094-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1764075307952460246?= X-GMAIL-MSGID: =?utf-8?q?1764075307952460246?= Hi all, Today's linux-next merge of the sysctl tree got a conflict in: drivers/hv/vmbus_drv.c between commit: 9c318a1d9b500 ("Drivers: hv: move panic report code from vmbus to hv early init code") from the hyperv tree and commit: 525f23fe58b59 ("hv: simplify sysctl registration") from the sysctl 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/drivers/hv/vmbus_drv.c diff --cc drivers/hv/vmbus_drv.c index 1c65a6dfb9fae,229353f1e9c29..0000000000000 --- a/drivers/hv/vmbus_drv.c