From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Gilad Ben-Yossef <gilad@benyossef.com>
Subject: Re: linux-next: manual merge of the staging tree with the crypto tree
Date: Thu, 15 Mar 2018 11:18:26 +0100 [thread overview]
Message-ID: <20180315101826.GA2802@kroah.com> (raw)
In-Reply-To: <20180315175841.5c3de18d@canb.auug.org.au>
On Thu, Mar 15, 2018 at 05:58:41PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/ccree/Kconfig
> drivers/staging/ccree/Makefile
>
> between commit:
>
> e294ca1cca3a ("staging: ccree: rename staging ver and mark as broken")
>
> from the crypto tree and commit:
>
> 8b0217965418 ("staging: ccree: remove ccree staging driver copy")
>
> from the staging tree.
>
> I fixed it up (I just removed the files) 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, we knew it was going to happen, sorry :(
You did the correct merge.
greg k-h
next prev parent reply other threads:[~2018-03-15 10:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 6:58 linux-next: manual merge of the staging tree with the crypto tree Stephen Rothwell
2018-03-15 10:18 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-18 5:21 Stephen Rothwell
2020-09-18 5:41 ` Herbert Xu
2020-09-18 7:49 ` Greg KH
2020-09-18 7:50 ` Herbert Xu
2020-09-18 8:05 ` Greg KH
2020-09-20 14:01 ` Greg KH
2018-07-09 4:15 Stephen Rothwell
2018-08-15 23:49 ` Stephen Rothwell
2016-02-22 3:55 Stephen Rothwell
2016-02-23 1:36 ` 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=20180315101826.GA2802@kroah.com \
--to=greg@kroah.com \
--cc=gilad@benyossef.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.