lkml.org 
[lkml]   [2019]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the pidfd tree with Linus' tree
From
On May 22, 2019 9:48:33 AM GMT+02:00, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>Hi Greg,
>
>On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman
><gregkh@linuxfoundation.org> wrote:
>>
>> Sorry, you are going to get a number of these types of minor
>conflicts
>> now. That's the problem of touching thousands of files :(
>
>Yeah, I expected that one I saw the commits. 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.

Christian

\
 
 \ /
  Last update: 2019-05-22 09:55    [W:0.049 / U:0.456 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site