From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC1BCECE58E for ; Tue, 8 Oct 2019 03:44:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 82111218AC for ; Tue, 8 Oct 2019 03:44:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Jv62sIcz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729917AbfJHDob (ORCPT ); Mon, 7 Oct 2019 23:44:31 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:55701 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729772AbfJHDob (ORCPT ); Mon, 7 Oct 2019 23:44:31 -0400 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 46nNWc6p6vz9sN1; Tue, 8 Oct 2019 14:44:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1570506269; bh=qVUvg5eUzi+xbVw93VditaCtDJH22M296dmyUJg5xss=; h=Date:From:To:Cc:Subject:From; b=Jv62sIcz58cn78k296RK/Dn1UlPyBD6Oxi2PQ+ApclHWCd/PAHEcr3EIrUaX9txvY QkHHk22k7KEIqKCYXqqzpr3BW9NnZW73dJIla8H1s247am/ERZeTlr7ffastTn5SAP bYnf/hboovWRnhZTWP7rpZHVUqxb0uu8OP+mJrx78ldIO1OTGwJEm1zd1C3sCKY1gg A30moEzMpwuBQ+95tel8ojzlXFSJ00o5wFi6x6fOaO2zA4imZG84PqwNLW7bMbtbKq CMaPxG6EVOjK2yv9hAJp9kQg6KfqPNERxh8UjZ64P+OXZpYtJnPny7/i+qKUv2NUMH N+ftxPHMw2NYg== Date: Tue, 8 Oct 2019 14:44:28 +1100 From: Stephen Rothwell To: Andrew Morton , Sasha Levin Cc: Linux Next Mailing List , Linux Kernel Mailing List , Branden Bonaby , Changbin Du Subject: linux-next: manual merge of the akpm tree with the hyperv tree Message-ID: <20191008144428.49143860@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/UOIwwKO65pwrsB6ikXZ4nzM"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/UOIwwKO65pwrsB6ikXZ4nzM Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the akpm tree got a conflict in: lib/Kconfig.debug between commit: 54dc8d00a0be ("drivers: hv: vmbus: Introduce latency testing") from the hyperv tree and patch: "kernel-hacking: create submenu for arch special debugging options" from the akpm 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. --=20 Cheers, Stephen Rothwell diff --cc lib/Kconfig.debug index 905ce80e6ac4,9a6d7e4955a5..000000000000 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@@ -2156,13 -2156,10 +2156,17 @@@ config DEBUG_AID_FOR_SYZBO help This option is intended for testing by syzbot. =20 + menu "$(SRCARCH) Debugging" +=20 source "arch/$(SRCARCH)/Kconfig.debug" =20 + endmenu +=20 +config HYPERV_TESTING + bool "Microsoft Hyper-V driver testing" + default n + depends on HYPERV && DEBUG_FS + help + Select this option to enable Hyper-V vmbus testing. + endmenu # Kernel hacking --Sig_/UOIwwKO65pwrsB6ikXZ4nzM Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl2cBhwACgkQAVBC80lX 0Gw0nQf/Wtq8UKGSqCvqgIl4myoTYNWLxJNSuf8EQvioR5wo5GgNaA6MoKdNFaEC fLF/iDPZrZTAOCE02g5ErVaqBBNnEMDhNnp3AGpslXivm4ZkLApv8WJl6+j8tWgC 8QXo3khnKsRZ3tWnDLBep9ngrXQtvo3wHYX4ibGGe/Owr8/voDR60aTbcAr1WOO5 eoXO7DI0QzJ7VibUNX3NTVRKiyUlXQP3U08anVEhhWUslJojZyExhX3dDtOhuUsT Xf4d2HAr/33PoRqu3s/LfChI002rKLZwHuCrnwxbrs96aFOfsYHVoTbt8MZWNgOn 5jUHPCULDTYOi1Rxa0coZ3Ektddv8g== =RXLL -----END PGP SIGNATURE----- --Sig_/UOIwwKO65pwrsB6ikXZ4nzM--