1c8dda3e43
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. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> |
||
|---|---|---|
| .. | ||
| aarch64-virt | ||
| arm-versatile | ||
| arm-vexpress | ||
| m68k-mcf5208 | ||
| m68k-q800 | ||
| microblazebe-mmu | ||
| microblazeel-mmu | ||
| mips32r2-malta | ||
| mips32r2el-malta | ||
| mips32r6-malta | ||
| mips32r6el-malta | ||
| mips64-malta | ||
| mips64el-malta | ||
| mips64r6-malta | ||
| mips64r6el-malta | ||
| nios2-10m50 | ||
| or1k | ||
| ppc64-pseries | ||
| ppc64le-pseries | ||
| ppc-g3beige | ||
| ppc-mpc8544ds | ||
| ppc-virtex-ml507 | ||
| sh4-r2d | ||
| sh4eb-r2d | ||
| sparc64-sun4u | ||
| sparc-ss10 | ||
| x86 | ||
| x86_64 | ||
| xtensa-lx60 | ||