linux-kernel - Re: linux-next: manual merge of the spi tree with the i2c 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: <Y+7GVqNu2ED2xhhR@sirena.org.uk>
Date:   Fri, 17 Feb 2023 00:12:06 +0000
From:   Mark Brown <broonie@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Wolfram Sang <wsa@...-dreams.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Wolfram Sang <wsa@...nel.org>
Subject: Re: linux-next: manual merge of the spi tree with the i2c tree

On Thu, Feb 16, 2023 at 08:48:02PM +0100, Alain Volmat wrote:
> Hi,
> 
> sorry for the mistake.  I should have made a serie with those
> 2 patches in order to avoid this conflict.  Sorry about that.
> I know now for a next case.

This sort of trivial add/add change is generally not a problem,
it's just good for the people sending the trees to be aware.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)