From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2 next] Revert "reproducible: fix DATE/TIME macros in toolchain-wrapper"
Date: Wed, 22 Feb 2017 14:23:29 +0100 [thread overview]
Message-ID: <8737f6nyum.fsf@dell.be.48ers.dk> (raw)
In-Reply-To: <6881dd6c-140a-9cb3-a948-8cb7d0a4a8a4@mind.be> (Arnout Vandecappelle's message of "Wed, 22 Feb 2017 12:50:36 +0100")
>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> On 21-02-17 22:01, Thomas Petazzoni wrote:
>> Hello,
>>
>> On Tue, 21 Feb 2017 21:54:35 +0100, Yann E. MORIN wrote:
>>
>>> It is needed to revert this patch in next before applying the following
>>> patch.
>>
>> Since it has already been reverted in master, I believe we will wait
>> for the release, and next to be merged in master before applying.
> Alternatively, merge master into next now and apply patch 2 to next.
> Is there any reason not to regularly merge master into next?
I have no problem doing that if it is useful, but I haven't personally
tried that kind of back/forward merges before. Don't we then end up with
a number of merge commits on next? What happens when next is then merged
back to master?
--
Bye, Peter Korsgaard
next prev parent reply other threads:[~2017-02-22 13:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 20:32 [Buildroot] [PATCH 0/2 next] toolchain/wrapper: adhere to SOURCE_DATE_EPOCH Yann E. MORIN
2017-02-21 20:32 ` [Buildroot] [PATCH 1/2 next] Revert "reproducible: fix DATE/TIME macros in toolchain-wrapper" Yann E. MORIN
2017-02-21 20:47 ` Thomas Petazzoni
2017-02-21 20:54 ` Yann E. MORIN
2017-02-21 21:01 ` Thomas Petazzoni
2017-02-22 11:50 ` Arnout Vandecappelle
2017-02-22 13:23 ` Peter Korsgaard [this message]
2017-02-22 13:44 ` Arnout Vandecappelle
2017-02-22 13:44 ` Thomas Petazzoni
2017-02-21 20:32 ` [Buildroot] [PATCH 2/2 next] toolchain/wrapper: fake __DATE_ and __TIME__ for older gcc Yann E. MORIN
2017-03-01 22:12 ` Thomas Petazzoni
2017-03-02 17:05 ` Yann E. MORIN
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=8737f6nyum.fsf@dell.be.48ers.dk \
--to=peter@korsgaard.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox