From: Peter Korsgaard <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] [pull request] Pull request for branch codesourcery-toolchain-support
Date: Thu, 08 Apr 2010 10:23:18 +0200 [thread overview]
Message-ID: <87bpdupd3d.fsf@macbook.be.48ers.dk> (raw)
In-Reply-To: <cover.1270502861.git.thomas.petazzoni@free-electrons.com> (Thomas Petazzoni's message of "Mon, 5 Apr 2010 23:27:57 +0200")
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> The following changes since commit 6cdcc4d7d8134f4b60f0eb9039090f9ad4c38366:
Thomas> Peter Korsgaard (1):
Thomas> gcc: hide shared libgcc option if BR2_PREFER_STATIC_LIB is enabled
Thomas> are available in the git repository at:
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot codesourcery-toolchain-support
Looks good, but:
From git://git.busybox.net/~tpetazzoni/git/buildroot
* branch codesourcery-toolchain-support -> FETCH_HEAD
Auto-merging toolchain/external-toolchain/ext-tool.mk
CONFLICT (content): Merge conflict in toolchain/external-toolchain/ext-tool.mk
Automatic merge failed; fix conflicts and then commit the result.
Could you rebase please?
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2010-04-08 8:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-05 21:27 [Buildroot] [pull request] Pull request for branch codesourcery-toolchain-support Thomas Petazzoni
2010-04-05 21:27 ` [Buildroot] [PATCH 1/4] external toolchains: take into account architecture variant Thomas Petazzoni
2010-04-05 21:27 ` [Buildroot] [PATCH 2/4] external-toolchain: support libraries outside of /lib Thomas Petazzoni
2010-04-05 21:28 ` [Buildroot] [PATCH 3/4] external-toolchain: Support for multilib toolchains Thomas Petazzoni
2010-04-05 21:28 ` [Buildroot] [PATCH 4/4] busybox: make sure architecture flags are used at link time Thomas Petazzoni
2010-04-08 8:23 ` Peter Korsgaard [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-04-17 0:12 [Buildroot] [pull request] Pull request for branch codesourcery-toolchain-support Thomas Petazzoni
2010-04-21 8:40 ` Peter Korsgaard
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=87bpdupd3d.fsf@macbook.be.48ers.dk \
--to=jacmet@uclibc.org \
--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.