From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Guenter Roeck <groeck@chromium•org>,
Gilad Ben-Yossef <gilad@benyossef•com>,
Michael Zoran <mzoran@crowfest•net>
Subject: Re: linux-next: manual merge of the staging tree with the usb tree
Date: Thu, 4 May 2017 16:42:15 -0700 [thread overview]
Message-ID: <20170504234215.GB13025@kroah.com> (raw)
In-Reply-To: <20170501140949.2c07b08d@canb.auug.org.au>
On Mon, May 01, 2017 at 02:09:49PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/Makefile
>
> between commit:
>
> f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
>
> from the usb tree and commit:
>
> 051420a997a5 ("staging: bcm2835-audio: Move driver under vc04_services")
> abefd6741d54 ("staging: ccree: introduce CryptoCell HW 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.
I'm the maintainer of both :)
Anyway, I knew this was going to happen, I'll take your fix when the
merge happens, thanks.
greg k-h
next prev parent reply other threads:[~2017-05-04 23:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-01 4:09 linux-next: manual merge of the staging tree with the usb tree Stephen Rothwell
2017-05-04 23:42 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-06-18 4:55 Stephen Rothwell
2013-06-18 16:03 ` Greg KH
2012-09-19 4:35 Stephen Rothwell
2012-09-19 7:18 ` Greg KH
2012-05-11 5:12 Stephen Rothwell
2012-05-11 14:44 ` Greg KH
2012-04-24 4:48 Stephen Rothwell
2012-04-24 14:45 ` Greg KH
2012-04-23 5:11 Stephen Rothwell
2012-04-23 16:38 ` 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=20170504234215.GB13025@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=gilad@benyossef$(echo .)com \
--cc=groeck@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mzoran@crowfest$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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