path: root/board/qemu
diff options
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-01 21:56:44 +0100
commit1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch)
treedd26d5bc619271f8cccf0c9d7abdda9a1749d13f /board/qemu
parent57dcad243e6daefefbe21109e1fc97272053a7a0 (diff)
parent787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff)
Merge branch 'next'
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>
Diffstat (limited to 'board/qemu')
-rw-r--r--board/qemu/or1k/linux.config (renamed from board/qemu/or1k/linux-4.11.config)0
1 files changed, 0 insertions, 0 deletions
diff --git a/board/qemu/or1k/linux-4.11.config b/board/qemu/or1k/linux.config
index 0a817b1e7f..0a817b1e7f 100644
--- a/board/qemu/or1k/linux-4.11.config
+++ b/board/qemu/or1k/linux.config