From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [git commit branch/next] linux: fix up bad merge conflict
Date: Mon, 20 Feb 2017 22:02:52 +0100 [thread overview]
Message-ID: <20170220210349.3AC2E82156@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=09c989420db1599c7650ae614c672ea5e699d641
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/next
Fix commit 400eaa3452e9380ec77ac62266530055506ea6e7 ("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>
---
linux/Config.in | 4 ----
1 file changed, 4 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index 7f18219..890b848 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -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
reply other threads:[~2017-02-20 21:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20170220210349.3AC2E82156@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.