From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: Question regarding commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b
Date: Thu, 02 Jan 2020 17:01:46 +0100
Message-ID: <2a223eacbb2a1d4e420feba09179b908@ipfire.org>
In-Reply-To: <3be68b16-54ef-1fa6-e370-fdf4f072651c@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3882172827716337520=="
List-Id: <development.lists.ipfire.org>

--===============3882172827716337520==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

Am 2020-01-01 21:18, schrieb Peter Müller:
> Hello Arne, hello list (CC'ed),
> 
> I just noticed commit fd2dccaabb2e28cf875d7d81c7faf90f7941f56b was 
> merged
> into the "master" branch of 
> https://git.ipfire.org/?p=ipfire-2.x.git;a=summary ,
> but does not seem to be applied to the "next" branch, too.
> 
> Is this intentional? If yes, why?

This happens when a late fix is inserted to a core and i have forgotten 
to merge the
master into next tree afterwards. thx for the information.

Arne


> 
> Anyway:
>> #define YEAR 2020
>> #include <bestwishes>
>> #include <peace>
>> #include <security>
> 
> :-)
> 
> Thanks, and best regards,
> Peter Müller

--===============3882172827716337520==--