linux-kernel - Re: linux-next: manual merge of the thermal-soc 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190514141531.GA16968@localhost.localdomain>
Date:   Tue, 14 May 2019 07:15:33 -0700
From:   Eduardo Valentin <edubezval@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Gal Pressman <galpress@...zon.com>,
        Jason Gunthorpe <jgg@...lanox.com>,
        Talel Shenhar <talel@...zon.com>
Subject: Re: linux-next: manual merge of the thermal-soc tree with Linus' tree

Hey Stephen,

On Tue, May 14, 2019 at 02:40:06PM +1000, Stephen Rothwell wrote:
> Hi Eduardo,
> 
> On Mon, 13 May 2019 20:44:11 -0700 Eduardo Valentin <edubezval@...il.com> wrote:
> >
> > Thanks for spotting this. I am re-doing the branch based off v5.1-rc7,
> > where the last conflict went in with my current queue.
> 
> Its really not worth the rebase.  Just fix the build problem and send it
> all to Linus.

Yeah, I think I was not super clear in my first email. I am about to
send the content of my branch to Linus.  This specific conflict was
because a change in MAINTAINERS went in before the change I have in it,
causing a conflict there. The rebase is simply to make it easier for him
to pull when I send the git pull.

> 
> -- 
> Cheers,
> Stephen Rothwell