All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [git commit] Merge branch 'next'
@ 2014-09-01 13:22 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2014-09-01 13:22 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=5aedb8be688d47526101bdb3e58598df588326e6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2024-03-05 20:42 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2024-03-05 20:42 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=216e99e9b4fd4c015443bfe15c7be3f06b21fe86
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2023-12-04 20:11 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2023-12-04 20:11 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=0c6f3d7f2e286d6f2eb66b1d8cd437942e87f1d5
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2023-09-07 14:50 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2023-09-07 14:50 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=600e36f8f2cc0702b603ea62c76d90fc9cbe0394
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2023-06-09 16:10 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2023-06-09 16:10 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=8ea4f3b549512d7f25696aece1b3db029aa427b8
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2023-03-12 21:45 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2023-03-12 21:45 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=df48bcd151988c6691c1b9d5b47b601bfafe11bd
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2022-12-05  9:01 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2022-12-05  9:01 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=6ca0edcb5f20c00336e7fb52ffa74cca2c2d5ef6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2022-09-11  7:57 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2022-09-11  7:57 UTC (permalink / raw)
  To: buildroot

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

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2022-06-07 19:09 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2022-06-07 19:09 UTC (permalink / raw)
  To: buildroot

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

Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2022-03-09 13:23 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2022-03-09 13:23 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=d0064df6bd29492b3472542b0d52dd5d1ca983dc
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2021-12-06 18:11 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2021-12-06 18:11 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=46ccda3a2f8336b1568672cb9f0c19c6a86607e7
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2021-09-04 17:57 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2021-09-04 17:57 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=72e1a75820590a50c9d2fcad8783bf90c9d4b2d9
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2021-06-07 15:14 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2021-06-07 15:14 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=8d07baab43b5624ad6d73ee58f5a9d4ab8b27049
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2021-03-08  7:06 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2021-03-08  7:06 UTC (permalink / raw)
  To: buildroot

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

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2020-12-03  9:30 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2020-12-03  9:30 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=6eff339082d2c9a7dca7f436ea898189f5510ef2
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2020-09-02 16:14 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2020-09-02 16:14 UTC (permalink / raw)
  To: buildroot

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

A number of merge conflicts, but hopefully they are all sorted out now.

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2020-06-02 19:59 Thomas Petazzoni
  0 siblings, 0 replies; 56+ messages in thread
From: Thomas Petazzoni @ 2020-06-02 19:59 UTC (permalink / raw)
  To: buildroot

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

A few conflicts had to be resolved:

 - Version number and hash for mesa3d-headers/mesa3d
 - Patches added in qemu, and the qemu version number
 - The gnuconfig README.buildroot

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2020-03-09 14:17 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2020-03-09 14:17 UTC (permalink / raw)
  To: buildroot

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

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2019-12-02  8:39 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2019-12-02  8:39 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=7b24bd59c83346d8181dec0e29530b11851a74a9
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2019-09-03 13:03 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2019-09-03 13:03 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=d8e6851f11a6dcacd7874993d4e09f82bc5c25da
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2019-06-02 20:11 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2019-06-02 20:11 UTC (permalink / raw)
  To: buildroot

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

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2019-03-05  9:59 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2019-03-05  9:59 UTC (permalink / raw)
  To: buildroot

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

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2018-12-02  7:16 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2018-12-02  7:16 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=13c43455a05b036002e79808ca1c8e0d91d7871b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2018-09-07 11:13 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2018-09-07 11:13 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=721e4cbb529d247c9c1ebef68275e70a3086ae0b
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2018-06-02  9:21 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2018-06-02  9:21 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=8b0fd3cb49566854fc038213e093e3c325618399
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2018-03-05 20:04 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2018-03-05 20:04 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=92b8bd0879e5f594d1233091437ac9a8b0c240d7
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2017-12-01 20:56 Thomas Petazzoni
  0 siblings, 0 replies; 56+ messages in thread
From: Thomas Petazzoni @ 2017-12-01 20:56 UTC (permalink / raw)
  To: buildroot

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2017-09-02 13:10 Thomas Petazzoni
  0 siblings, 0 replies; 56+ messages in thread
From: Thomas Petazzoni @ 2017-09-02 13:10 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=29ace1e216d8c1a588a505c83075c1efde45b299
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2017-06-01 20:28 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2017-06-01 20:28 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=11271540bfe6adafbc133caf6b5b902a816f5f02
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2017-03-01 16:37 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2017-03-01 16:37 UTC (permalink / raw)
  To: buildroot

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

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
  2016-12-01 23:08 ` François Perrad
@ 2016-12-02  8:00   ` Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2016-12-02  8:00 UTC (permalink / raw)
  To: buildroot

>>>>> "Fran?ois" == Fran?ois Perrad <francois.perrad@gadz.org> writes:

Hi,

 > With this merge, the following commits are missing :
 > *     xterm: depend on libXinerama if appropriatenext    J?r?me Pouiller
 > *     rpm: switch to version 4.13.0    James Knight
 > *     package/libdvbcsa: fix altivec problems on powerpc64    Sam bobroff
 > *     Revert "jasper: Disable debugging when building for xtensa"
 > Max Filippov
 > *     ncftp: bump version to 3.2.6    Vicente Olivert Riera
 > *     libgtk3: bump version to 3.22.4    Vicente Olivert Riera
 > *     luarocks: bump to version 2.4.2    Francois Perrad
 > *     lua-messagepack: bump to version 0.3.6    Francois Perrad
 > *     lsqlite3: bump to version 0.9.4    Francois Perrad
 > *     lttng-libust: bump version to 2.9.0    Vicente Olivert Riera
 > *     lttng-babeltrace: bump version to 1.5.0    Vicente Olivert Riera
 > *     lttng-modules: bump version to 2.9.0    Vicente Olivert Riera
 > *     lttng-tools: bump version to 2.9.0    Vicente Olivert Riera
 > *     toolchain-external: bump Linaro AArch64 toolchain to 2016.11
 > Romain Naour
 > *     toolchain-external: bump Linaro ARMeb toolchain to 2016.11    Romain Naour
 > *     toolchain-external: bump Linaro ARM toolchain to 2016.11    Romain Naour

Argh, indeed. My local next branch was not uptodate. I've merged the
remaining commits now.

Thanks!

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2016-12-02  7:53 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2016-12-02  7:53 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=44d2cc99a47fd2a3201785bc558716c162b081ab
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

My local 'next' branch was not uptodate, so the previous merge was missing
the most recent changes.

Thanks to Fran??ois Perrad for noticing.

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
  2016-12-01 21:29 Peter Korsgaard
@ 2016-12-01 23:08 ` François Perrad
  2016-12-02  8:00   ` Peter Korsgaard
  0 siblings, 1 reply; 56+ messages in thread
From: François Perrad @ 2016-12-01 23:08 UTC (permalink / raw)
  To: buildroot

With this merge, the following commits are missing :
*     xterm: depend on libXinerama if appropriatenext    J?r?me Pouiller
*     rpm: switch to version 4.13.0    James Knight
*     package/libdvbcsa: fix altivec problems on powerpc64    Sam bobroff
*     Revert "jasper: Disable debugging when building for xtensa"
Max Filippov
*     ncftp: bump version to 3.2.6    Vicente Olivert Riera
*     libgtk3: bump version to 3.22.4    Vicente Olivert Riera
*     luarocks: bump to version 2.4.2    Francois Perrad
*     lua-messagepack: bump to version 0.3.6    Francois Perrad
*     lsqlite3: bump to version 0.9.4    Francois Perrad
*     lttng-libust: bump version to 2.9.0    Vicente Olivert Riera
*     lttng-babeltrace: bump version to 1.5.0    Vicente Olivert Riera
*     lttng-modules: bump version to 2.9.0    Vicente Olivert Riera
*     lttng-tools: bump version to 2.9.0    Vicente Olivert Riera
*     toolchain-external: bump Linaro AArch64 toolchain to 2016.11
Romain Naour
*     toolchain-external: bump Linaro ARMeb toolchain to 2016.11    Romain Naour
*     toolchain-external: bump Linaro ARM toolchain to 2016.11    Romain Naour

Fran?ois


2016-12-01 22:29 GMT+01:00 Peter Korsgaard <peter@korsgaard.com>:
> commit: https://git.buildroot.net/buildroot/commit/?id=8852f08eeda3c9ff4c5f9cc90a169338bda1bff9
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Patch is too large, so refusing to show it
> Patch is too large, so refusing to show it
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2016-12-01 21:29 Peter Korsgaard
  2016-12-01 23:08 ` François Perrad
  0 siblings, 1 reply; 56+ messages in thread
From: Peter Korsgaard @ 2016-12-01 21:29 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=8852f08eeda3c9ff4c5f9cc90a169338bda1bff9
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2016-09-02 14:20 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2016-09-02 14:20 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=7353967690b425fd6519756979f3ef839b1a9cd1
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Quite some conflicts, so here goes ..

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2016-06-01 15:55 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2016-06-01 15:55 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=577021e81b0bf894d26d8127822410267b2bb411
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2016-03-02 20:25 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2016-03-02 20:25 UTC (permalink / raw)
  To: buildroot

commit: https://git.buildroot.net/buildroot/commit/?id=28cd1ed30aa4959c744ee37a6070cf22a66fb31f
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2015-12-01 22:24 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2015-12-01 22:24 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=cc257ee493bbf3261417908684dbff834d853ae6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2015-09-01  7:59 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2015-09-01  7:59 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=cfc70a48027b1b56231df62a30a7da888f33e3ce
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2015-06-01 21:52 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2015-06-01 21:52 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=cddaae8229f69aba753bcb6603f2f1e395e4f8dd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2015-03-02 22:26 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2015-03-02 22:26 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=7403ea730d75ce0af51cb1bd5665674bb5bfae42
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2014-12-01 10:16 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2014-12-01 10:16 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=fe1b2ef1d3236ffd36e0ec033566d45fcd9ba3fb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2014-06-01  7:58 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2014-06-01  7:58 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=27a5414804f7b8ab41101aad219ebef02d364bde
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Conflicts:
	package/gdb/Config.in.host

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2014-02-28 13:30 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2014-02-28 13:30 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=b108fdcb83d457e5d43298fb93dbfd805d076f24
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2013-12-01 19:32 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2013-12-01 19:32 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=50ce7ffb76b989c90636876153e568da7615b8c3
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2013-08-31 21:32 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2013-08-31 21:32 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=91141b141190b481422b7aea56e8f4d265c44e88
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2013-06-02 14:33 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2013-06-02 14:33 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=1ba51d2fbddd5650f8caea0a327b9031238ad843
Patch is too large, so refusing to show it
Patch is too large, so refusing to show it

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2013-03-01 10:11 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2013-03-01 10:11 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=ca79d2393519759d3fbe84472ab8bfa359c08592
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2012-12-03  1:19 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2012-12-03  1:19 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=8cdabd76950e227af088729c53c7f741a46bd9cc
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Kickoff 2013.02 cycle

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2012-09-03 19:59 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2012-09-03 19:59 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=32a0454d3c495b12824ef4a0d0341237302d148a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Conflicts:
	package/e2fsprogs/e2fsprogs.mk
	package/libfuse/libfuse.mk
	package/multimedia/mpd/mpd.mk
	package/smartmontools/smartmontools.mk

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2012-05-31  7:23 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2012-05-31  7:23 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

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

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
  2012-03-02 22:29 ` Arnout Vandecappelle
  2012-03-03 20:27   ` Peter Korsgaard
@ 2012-03-05  9:47   ` Thomas Petazzoni
  1 sibling, 0 replies; 56+ messages in thread
From: Thomas Petazzoni @ 2012-03-05  9:47 UTC (permalink / raw)
  To: buildroot

Le Fri, 2 Mar 2012 22:29:21 +0000,
Arnout Vandecappelle <arnout@mind.be> a ?crit :

>  It's annoying that all commit mails are resent when you merge next into
> master.  Any chance to avoid that?  E.g. temporarily disabling the commit
> mails when you push the merge?

I don't find this really annoying, and it allows to be reminded about
what was in -next and therefore what go pushed in master. If we had
thousands of commits, I would call it annoying. With only a few dozens
commits, I'm happy with the way it is today.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
  2012-03-02 22:29 ` Arnout Vandecappelle
@ 2012-03-03 20:27   ` Peter Korsgaard
  2012-03-05  9:47   ` Thomas Petazzoni
  1 sibling, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2012-03-03 20:27 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 Arnout> On Thursday 01 March 2012 13:05:41 Peter Korsgaard wrote:
 >> commit: http://git.buildroot.net/buildroot/commit/?id=7a58ed7317573f23da2e2ad822003705db85a58f
 >> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 Arnout>  It's annoying that all commit mails are resent when you merge
 Arnout> next into master.  Any chance to avoid that?  E.g. temporarily
 Arnout> disabling the commit mails when you push the merge?

Ok, I'll try to remember for the next cycle.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
  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
  0 siblings, 2 replies; 56+ messages in thread
From: Arnout Vandecappelle @ 2012-03-02 22:29 UTC (permalink / raw)
  To: buildroot

On Thursday 01 March 2012 13:05:41 Peter Korsgaard wrote:
> commit: http://git.buildroot.net/buildroot/commit/?id=7a58ed7317573f23da2e2ad822003705db85a58f
> branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

 It's annoying that all commit mails are resent when you merge next into
master.  Any chance to avoid that?  E.g. temporarily disabling the commit
mails when you push the merge?

 Regards,
 Arnout

-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2012-03-01 13:05 Peter Korsgaard
  2012-03-02 22:29 ` Arnout Vandecappelle
  0 siblings, 1 reply; 56+ messages in thread
From: Peter Korsgaard @ 2012-03-01 13:05 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=7a58ed7317573f23da2e2ad822003705db85a58f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

^ permalink raw reply	[flat|nested] 56+ messages in thread

* [Buildroot] [git commit] Merge branch 'next'
@ 2011-12-01  8:56 Peter Korsgaard
  0 siblings, 0 replies; 56+ messages in thread
From: Peter Korsgaard @ 2011-12-01  8:56 UTC (permalink / raw)
  To: buildroot

commit: http://git.buildroot.net/buildroot/commit/?id=c3b72c6cd7b82e70cf61f4eac59f176444eaebf1
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

And kickoff 2012.02 cycle.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

^ permalink raw reply	[flat|nested] 56+ messages in thread

end of thread, other threads:[~2024-03-05 20:46 UTC | newest]

Thread overview: 56+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-01 13:22 [Buildroot] [git commit] Merge branch 'next' Peter Korsgaard
  -- strict thread matches above, loose matches on Subject: below --
2024-03-05 20:42 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-12-01 20:56 Thomas Petazzoni
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-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

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.