From: Arnout Vandecappelle <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] cryptodev-linux: bump to version 1.8
Date: Tue, 1 Dec 2015 20:57:20 +0100 [thread overview]
Message-ID: <565DFBA0.8020704@mind.be> (raw)
In-Reply-To: <20151201174650.358ed096@free-electrons.com>
On 01-12-15 17:46, Thomas Petazzoni wrote:
[snip]
> Applied to next (soon to be master).
>
> Peter: this might create a conflict when merging back to master. The
> 0002-Fix-compilation-against-linux-4.3.patch that Gustavo is removing
> here has never been added to next, it had only been added to master. So
> when I applied this commit to the next branch, it just discarded the
> information that this commit removes
> 0002-Fix-compilation-against-linux-4.3.patch.
>
> However, when you merge next into master, please make sure to re-remove
> 0002-Fix-compilation-against-linux-4.3.patch. Otherwise, it will fail
> to apply after extracting the new version of cryptodev-linux.
Perhaps in the next cycle you should regularly merge master->next to avoid this
kind of issue. You were also bitten by it with unscd so it's not a rare problem.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
prev parent reply other threads:[~2015-12-01 19:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-01 13:52 [Buildroot] [PATCH] cryptodev-linux: bump to version 1.8 Gustavo Zacarias
2015-12-01 16:46 ` Thomas Petazzoni
2015-12-01 19:57 ` Arnout Vandecappelle [this message]
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=565DFBA0.8020704@mind.be \
--to=arnout@mind.be \
--cc=buildroot@busybox.net \
/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