From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Herbert Xu <herbert@gondor.apana.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Kees Cook <keescook@chromium.org>,
Boris BREZILLON <boris.brezillon@free-electrons.com>
Subject: linux-next: manual merge of the tip tree with the crypto tree
Date: Wed, 8 Nov 2017 13:21:56 +1100 [thread overview]
Message-ID: <20171108132156.701f77fe@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/crypto/mv_cesa.c
between commit:
27b43fd95b14 ("crypto: marvell - Remove the old mv_cesa driver")
from the crypto tree and commit:
f34d8d506eef ("crypto: Convert timers to use timer_setup()")
from the tip tree.
I fixed it up (I removed the file again) 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
next reply other threads:[~2017-11-08 2:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 2:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-11-28 1:29 linux-next: manual merge of the tip tree with the crypto tree Stephen Rothwell
2020-07-21 4:28 Stephen Rothwell
2020-08-03 22:14 ` Stephen Rothwell
2020-07-17 4:46 Stephen Rothwell
2020-07-17 6:27 ` Uros Bizjak
2020-07-17 6:44 ` Herbert Xu
2020-07-17 6:56 ` Stephen Rothwell
2020-07-17 7:31 ` Uros Bizjak
2020-07-20 4:03 ` Stephen Rothwell
2020-07-20 6:13 ` Uros Bizjak
2020-07-20 6:29 ` Stephen Rothwell
2020-07-20 11:59 ` Herbert Xu
2015-10-12 3:24 Stephen Rothwell
2015-10-12 6:18 ` Herbert Xu
2015-06-17 3:21 Michael Ellerman
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=20171108132156.701f77fe@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=boris.brezillon@free-electrons.com \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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).