deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: fix up bad merge conflict 

Fix commit 400eaa3452 ("linux: bump
default to version 4.10") in which a conflict was not correctly
resolved.

Reported-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017.05.x
Thomas Petazzoni 2017-02-20 22:02:52 +01:00
parent 6c5ffa24fa
commit 09c989420d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux/Config.in
View File

@ -97,11 +97,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
<<<<<<< a1e02440f3035cfbe5119c00457b3e1c2f7ac4d1
default "4.9.9" if BR2_LINUX_KERNEL_LATEST_VERSION
=======
default "4.10" if BR2_LINUX_KERNEL_LATEST_VERSION
>>>>>>> linux: bump default to version 4.10
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL