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 4C52EC31E40 for ; Fri, 9 Aug 2019 09:18:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 030B4217D7 for ; Fri, 9 Aug 2019 09:18:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="nSbxfpek"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="lK5KXLCV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406169AbfHIJSV (ORCPT ); Fri, 9 Aug 2019 05:18:21 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:42639 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406007AbfHIJSU (ORCPT ); Fri, 9 Aug 2019 05:18:20 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 734D92205E; Fri, 9 Aug 2019 05:18:19 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Fri, 09 Aug 2019 05:18:19 -0400 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=fm1; bh=7mMXW9cnAZ1j+T1wlyyUtiNi5ou 7J3bcd1b/yM9O7ds=; b=nSbxfpektxuFALpWBYSRtTDj1pyWsalG65H7JS1zRYh r0HUvUkUkzryzlpbC8XS9M2ayFF48sJ4UIHasAprkC8V+FzwXZIrPZ7I2D8sCZkE MYp8yy88eEDKdWwqRW+YpJQNuIrQXmKXwsdHZLbWojo9JJShLNY0+Vnjv1FwyN0H QEDLHwHqgFG+GAR1qym6vWAcB/bJAAFtNtE2StQJ39PyhBL1eDIkXAaeGJJJBpHJ Ts/rOcxzMifIF6W4Vs5TVQcD70K3hw9VDKr5bxCwAC8PA5yOKKxF0J4rXCuaqN09 wRqIr1FSv2pe+KX2W8BVGufsr8i6vOBjEub//ryjorw== 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=fm3; bh=7mMXW9 cnAZ1j+T1wlyyUtiNi5ou7J3bcd1b/yM9O7ds=; b=lK5KXLCVY8IcTt7jNKmGnj ilB2CIBhwQp7lzj+8rR3MODedC0mUcD2UDNyidI+pJboepM7Br8bHfvVtPrAW+g8 NvUK6kYygyJpulyDR9ZmocKXIZxL9AYxqVze4L5/nXyMd5hG4YjX6W6VmICB6ILO KUxfwxs1z3WLg8j+GRyaxSjpmmcFIwKjphcn0KWrladq2wg08HefHJU5vjR3eJZl r5nogb8uGfWdOJeHZIN0mGfpMKveCkiyhuzBVef4QGr5kHqrRbOHtN/UxqH29Ctb UGAzOAzsYerRkArFODgsQ6VIbW6xB9r1M9tuyC50OiXSNZb5RVfbINyYw869iLUw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddujedgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjfgesthdtredttdervdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecukfhppeekfedrkeeirdekledrud dtjeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhmnecu vehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 43A408005A; Fri, 9 Aug 2019 05:18:18 -0400 (EDT) Date: Fri, 9 Aug 2019 10:53:26 +0200 From: Greg KH To: Stephen Rothwell Cc: David Miller , Networking , Linux Next Mailing List , Linux Kernel Mailing List , Benjamin Poirier Subject: Re: linux-next: manual merge of the usb tree with the net-next tree Message-ID: <20190809085326.GA21320@kroah.com> References: <20190809151940.06c2e7a5@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190809151940.06c2e7a5@canb.auug.org.au> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 09, 2019 at 03:19:40PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the usb tree got conflicts in: > > drivers/staging/Kconfig > drivers/staging/Makefile > > between commit: > > 955315b0dc8c ("qlge: Move drivers/net/ethernet/qlogic/qlge/ to drivers/staging/qlge/") > > from the net-next tree and commit: > > 71ed79b0e4be ("USB: Move wusbcore and UWB to staging as it is obsolete") > > from the usb 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/staging/Kconfig > index 0b8a614be11e,cf419d9c942d..000000000000 > --- a/drivers/staging/Kconfig > +++ b/drivers/staging/Kconfig > @@@ -120,6 -120,7 +120,9 @@@ source "drivers/staging/kpc2000/Kconfig > > source "drivers/staging/isdn/Kconfig" > > +source "drivers/staging/qlge/Kconfig" > + > + source "drivers/staging/wusbcore/Kconfig" > + source "drivers/staging/uwb/Kconfig" > + > endif # STAGING > diff --cc drivers/staging/Makefile > index 741152511a10,38179bc842a8..000000000000 > --- a/drivers/staging/Makefile > +++ b/drivers/staging/Makefile > @@@ -50,4 -50,5 +50,6 @@@ obj-$(CONFIG_EROFS_FS) += erofs > obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/ > obj-$(CONFIG_KPC2000) += kpc2000/ > obj-$(CONFIG_ISDN_CAPI) += isdn/ > +obj-$(CONFIG_QLGE) += qlge/ > + obj-$(CONFIG_UWB) += uwb/ > + obj-$(CONFIG_USB_WUSB) += wusbcore/ Merge looks good to me, thanks! greg k-h