linux-kernel - Re: linux-next: manual merge of the pidfd tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20190522180524.4e751614@canb.auug.org.au>
Date:   Wed, 22 May 2019 18:05:24 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christian Brauner <christian@...uner.io>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        "Joel Fernandes (Google)" <joel@...lfernandes.org>
Subject: Re: linux-next: manual merge of the pidfd tree with Linus' tree

Hi Christian,

On Wed, 22 May 2019 09:55:00 +0200 Christian Brauner <christian@...uner.io> wrote:
>
> On May 22, 2019 9:48:33 AM GMT+02:00, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >Hi Greg,
> >
> >On Wed, 22 May 2019 07:52:35 +0200 Greg Kroah-Hartman
> ><gregkh@...uxfoundation.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.

No need, those conflicts are now in my "git rerere" cache, so I
hopefully won;t have ot worry about them again.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped