From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Benjamin Poirier <bpoirier@suse.com>
Subject: Re: linux-next: manual merge of the usb tree with the net-next tree
Date: Fri, 9 Aug 2019 10:53:26 +0200 [thread overview]
Message-ID: <20190809085326.GA21320@kroah.com> (raw)
In-Reply-To: <20190809151940.06c2e7a5@canb.auug.org.au>
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
next prev parent reply other threads:[~2019-08-09 9:18 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 5:19 linux-next: manual merge of the usb tree with the net-next tree Stephen Rothwell
2019-08-09 8:53 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-08-13 6:13 Stephen Rothwell
2013-08-13 6:22 ` Greg KH
2012-05-21 6:10 Stephen Rothwell
2012-05-21 6:16 ` Kalle Valo
2012-05-21 6:28 ` Stephen Rothwell
2012-05-21 13:08 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190809085326.GA21320@kroah.com \
--to=greg@kroah.com \
--cc=bpoirier@suse.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).