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=-2.4 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 E9631CA9EDB for ; Tue, 5 Nov 2019 07:20:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD0A521929 for ; Tue, 5 Nov 2019 07:20:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="HK0KyAv0"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="whBX6Ztt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387701AbfKEHUz (ORCPT ); Tue, 5 Nov 2019 02:20:55 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:46985 "EHLO wout4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387484AbfKEHUz (ORCPT ); Tue, 5 Nov 2019 02:20:55 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 79927510; Tue, 5 Nov 2019 02:20:53 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 05 Nov 2019 02:20:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=UJLtdOaEwqfmY7P1hSDZedWEWW/ B7GmvAucQ8GBiNdA=; b=HK0KyAv0xX5FkE2Bl2MhYXZRHxhyOpFP9o7jiYhztt9 9prPq9c7QMeHuqTXU443EcHzQe57eMG5W8VTe3upGUPv8hRsyycFcc8/ayHcjYqG zqsWDi41ORfffH7sESLWAxyWwh3WkMQVMdrQVwyasdSdXuXeNDcsAq85bCMbEqmt XdQVaAFsr48U/NHra60/rvdJzC/0wFbw85Tkf9d05F8jWbj/Dt0cD1r790rOQkb6 OmyNCowuXWj50hKn5SHzVU+l3Xd5b63LZ7dP9R6D4F1U4N3THrJigJkGP8KSymxy 6dEQ4H/4R3tcrhXgWBcwsMPKxy9Smmqv/xPQfHNhQew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=UJLtdO aEwqfmY7P1hSDZedWEWW/B7GmvAucQ8GBiNdA=; b=whBX6ZttplPe9JNGm2pk1f MQjoC3Btyo/kpf0/fhIWgqWwjHTGqYmdW/BVnF3hVHkcoALzYfCfZDrif6Y23vVm fYWbOrHRFQ5o7+vvMP1AqqzpgVrai70uzFH/t4CSmRw7GSDnmpXsLK/buSdNJByI gOEB00r+4+4UkTWrRSFOwDP0ghpU2NvkpWj7FQyhX+a1lroabWQrsEDoORKdIhXH /Fl5WRIOlZ7+VrgKNVMXICiMVvlcc9Z1JgRrrs8GB+dMBR1RvV4cugv8VMtq/5LP 4FZC/Ba2wfDkWSuNADUYjCFa8biJxToKa3BG6/egsyfB+kAmlkRQehY5zaZbVI9A == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedruddugedguddtkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpeffhffvuffkfhggtggujggfsehttdertddtredvnecuhfhrohhmpefirhgv ghcumffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucfkphepudelhedrieekrdeird dutddvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomhen ucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (host6-102.lan-isdn.imaginet.fr [195.68.6.102]) by mail.messagingengine.com (Postfix) with ESMTPA id B055D80059; Tue, 5 Nov 2019 02:20:51 -0500 (EST) Date: Tue, 5 Nov 2019 08:20:50 +0100 From: Greg KH To: Stephen Rothwell Cc: David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Hans de Goede , Joe Perches , =?iso-8859-1?B?Suly9G1l?= Pouiller Subject: Re: linux-next: manual merge of the staging tree with the staging.current and net-next trees Message-ID: <20191105072050.GB2587462@kroah.com> References: <20191105165313.59a5cc11@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191105165313.59a5cc11@canb.auug.org.au> User-Agent: Mutt/1.12.2 (2019-09-21) Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Tue, Nov 05, 2019 at 04:53:13PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/Kconfig > drivers/staging/Makefile > > between commits: > > df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support") > 52340b82cf1a ("hp100: Move 100BaseVG AnyLAN driver to staging") > > from the staging.current and net-next trees and commit: > > a7a91ca5a23d ("staging: wfx: add infrastructure for new driver") > > from the staging 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. Thanks for this, I knew it would happen :( greg k-h