All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit] Merge branch 'next'
Date: Fri, 1 Dec 2017 21:56:44 +0100	[thread overview]
Message-ID: <20171201205342.303B680FC6@busybox.osuosl.org> (raw)

commit: https://git.buildroot.net/buildroot/commit/?id=1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.

A few conflicts had to be resolved:

 - In the DEVELOPERS file, because Fabrice Fontaine was added as a
   developer for libupnp in master, and for libupnp18 in
   next. Resolution is simple: add him for both.

 - linux/Config.in, because we updated the 4.13.x release used by
   default in master, while we moved to 4.14 in next. Resolution: use
   4.14.

 - package/libupnp/libupnp.hash: a hash for the license file was added
   in master, while the package was bumped into next. Resolution: keep
   the hash for the license file, and keep the hash for the newest
   version of libupnp.

 - package/linux-headers/Config.in.host: default version of the kernel
   headers for 4.13 was bumped to the latest 4.13.x in master, but was
   changed to 4.14 in next. Resolution: use 4.14.

 - package/samba4/: samba was bumped to 4.6.11 in master for security
   reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it

             reply	other threads:[~2017-12-01 20:56 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-01 20:56 Thomas Petazzoni [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-05 20:42 [Buildroot] [git commit] Merge branch 'next' Peter Korsgaard
2023-12-04 20:11 Peter Korsgaard
2023-09-07 14:50 Peter Korsgaard
2023-06-09 16:10 Peter Korsgaard
2023-03-12 21:45 Peter Korsgaard
2022-12-05  9:01 Peter Korsgaard
2022-09-11  7:57 Peter Korsgaard
2022-06-07 19:09 Peter Korsgaard
2022-03-09 13:23 Peter Korsgaard
2021-12-06 18:11 Peter Korsgaard
2021-09-04 17:57 Peter Korsgaard
2021-06-07 15:14 Peter Korsgaard
2021-03-08  7:06 Peter Korsgaard
2020-12-03  9:30 Peter Korsgaard
2020-09-02 16:14 Peter Korsgaard
2020-06-02 19:59 Thomas Petazzoni
2020-03-09 14:17 Peter Korsgaard
2019-12-02  8:39 Peter Korsgaard
2019-09-03 13:03 Peter Korsgaard
2019-06-02 20:11 Peter Korsgaard
2019-03-05  9:59 Peter Korsgaard
2018-12-02  7:16 Peter Korsgaard
2018-09-07 11:13 Peter Korsgaard
2018-06-02  9:21 Peter Korsgaard
2018-03-05 20:04 Peter Korsgaard
2017-09-02 13:10 Thomas Petazzoni
2017-06-01 20:28 Peter Korsgaard
2017-03-01 16:37 Peter Korsgaard
2016-12-02  7:53 Peter Korsgaard
2016-12-01 21:29 Peter Korsgaard
2016-12-01 23:08 ` François Perrad
2016-12-02  8:00   ` Peter Korsgaard
2016-09-02 14:20 Peter Korsgaard
2016-06-01 15:55 Peter Korsgaard
2016-03-02 20:25 Peter Korsgaard
2015-12-01 22:24 Peter Korsgaard
2015-09-01  7:59 Peter Korsgaard
2015-06-01 21:52 Peter Korsgaard
2015-03-02 22:26 Peter Korsgaard
2014-12-01 10:16 Peter Korsgaard
2014-09-01 13:22 Peter Korsgaard
2014-06-01  7:58 Peter Korsgaard
2014-02-28 13:30 Peter Korsgaard
2013-12-01 19:32 Peter Korsgaard
2013-08-31 21:32 Peter Korsgaard
2013-06-02 14:33 Peter Korsgaard
2013-03-01 10:11 Peter Korsgaard
2012-12-03  1:19 Peter Korsgaard
2012-09-03 19:59 Peter Korsgaard
2012-05-31  7:23 Peter Korsgaard
2012-03-01 13:05 Peter Korsgaard
2012-03-02 22:29 ` Arnout Vandecappelle
2012-03-03 20:27   ` Peter Korsgaard
2012-03-05  9:47   ` Thomas Petazzoni
2011-12-01  8:56 Peter Korsgaard

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=20171201205342.303B680FC6@busybox.osuosl.org \
    --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.