[Buildroot] [PATCH 1/2 next] Revert "reproducible: fix DATE/TIME macros in toolchain-wrapper"

[Arnout Vandecappelle]

On 22-02-17 14:23, Peter Korsgaard wrote:
>>>>>> "Arnout" == Arnout Vandecappelle <arnout at 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? 

 You indeed get merge commits on next, but is that a problem? With more merge
commits, it's IMHO easier to understand the history because each merge makes
things line up in 'git log --graph'.

> What happens when next is then merged
> back to master?

 It shouldn't make much of a difference. Except that you probably get less merge
conflicts.

 Regards,
 Arnout

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF