linux-kernel - Re: linux-next: manual merge of the rpmsg tree with the spi 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: <20221206084046.020e03ea@canb.auug.org.au>
Date:   Tue, 6 Dec 2022 08:40:46 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>
Cc:     Mathieu Poirier <mathieu.poirier@...aro.org>,
        Amit Kumar Mahapatra <amit.kumar-mahapatra@....com>,
        Ben Levinsky <ben.levinsky@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Michal Simek <michal.simek@....com>,
        Rajan Vaja <rajan.vaja@...inx.com>,
        Tanmay Shah <tanmay.shah@....com>,
        Bjorn Andersson <andersson@...nel.org>
Subject: Re: linux-next: manual merge of the rpmsg tree with the spi tree

Hi Mark,

On Mon, 5 Dec 2022 19:55:19 +0000 Mark Brown <broonie@...nel.org> wrote:
>
> On Mon, Dec 05, 2022 at 10:24:48AM -0700, Mathieu Poirier wrote:
> > On Sun, 27 Nov 2022 at 19:41, Stephen Rothwell <sfr@...b.auug.org.au> wrote:  
> 
> > >   1e400cb9cff2 ("firmware: xilinx: Add qspi firmware interface")  
> 
> > Mark - since this is in the SPI tree, can you send me a pull request
> > for this commit?  I will do the refactoring on my side.  
> 
> That would basically be the entire SPI tree up to that point since it's
> all mostly on one branch...

Both sides just need to mention it to Linus when you send your pull
requests - it is not a problematic conflict.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped