From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] libnss: bump to version 3.21
Date: Sat, 21 Nov 2015 09:32:10 +0100 [thread overview]
Message-ID: <20151121093210.77ddf8e2@free-electrons.com> (raw)
In-Reply-To: <1448045240-23847-2-git-send-email-gustavo@zacarias.com.ar>
Dear Gustavo Zacarias,
On Fri, 20 Nov 2015 15:47:20 -0300, Gustavo Zacarias wrote:
> Disable gtests since they require C++ support.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/libnss/libnss.hash | 4 ++--
> package/libnss/libnss.mk | 3 ++-
> 2 files changed, 4 insertions(+), 3 deletions(-)
I've applied to next. However, there was a conflict since you based
your patch on master where libnss has been bumped to 3.20.1. But in
next, the libnss version is still 3.20. I've fixed that up when
applying.
Peter: this means you will get a conflict when merging back next into
master, but it is trivial to resolve (hash file conflict and
<pkg>_VERSION conflict).
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2015-11-21 8:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-20 18:47 [Buildroot] [PATCH 1/2] libnspr: bump to version 4.11 Gustavo Zacarias
2015-11-20 18:47 ` [Buildroot] [PATCH 2/2] libnss: bump to version 3.21 Gustavo Zacarias
2015-11-21 8:32 ` Thomas Petazzoni [this message]
2015-11-21 9:42 ` Peter Korsgaard
2015-11-21 8:31 ` [Buildroot] [PATCH 1/2] libnspr: bump to version 4.11 Thomas Petazzoni
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=20151121093210.77ddf8e2@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--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 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.