From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christian Brauner <christian@brauner.io>
Subject: Re: linux-next: manual merge of the pidfd tree with Linus' tree
Date: Wed, 22 May 2019 09:55:00 +0200
Message-ID: <CEB120FD-547A-4D92-92AE-43E6AF8E767B@brauner.io>
References: <20190522110115.7350be3e@canb.auug.org.au> <20190522055235.GC13702@kroah.com> <20190522174725.6bfd51bd@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain;
 charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20190522174725.6bfd51bd@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Stephen Rothwell <sfr@canb.auug.org.au>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Thomas Gleixner <tglx@linutronix.de>, "Joel Fernandes (Google)" <joel@joelfernandes.org>
List-Id: linux-next.vger.kernel.org

On May 22, 2019 9:48:33 AM GMT+02:00, Stephen Rothwell <sfr@canb=2Eauug=2Eo=
rg=2Eau> wrote:
>Hi Greg,
>
>On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman
><gregkh@linuxfoundation=2Eorg> wrote:
>>
>> Sorry, you are going to get a number of these types of minor
>conflicts
>> now=2E  That's the problem of touching thousands of files :(
>
>Yeah, I expected that one I saw the commits=2E  At least is is just after
>-rc1, hopefully most maintainers will start their -next branches after
>today :-)

I can just rebase if that helps you out=2E

Christian