linux-kernel - Re: [PATCHv2 0/3] spi: omap2-mcspi: spi cleanups

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: <20120822171358.GW7995@opensource.wolfsonmicro.com>
Date:	Wed, 22 Aug 2012 18:13:58 +0100
From:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
To:	Shubhrajyoti Datta <omaplinuxkernel@...il.com>
Cc:	Shubhrajyoti D <shubhrajyoti@...com>,
	spi-devel-general@...ts.sourceforge.net, grant.likely@...retlab.ca,
	linux-omap@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCHv2 0/3] spi: omap2-mcspi: spi cleanups

On Wed, Aug 22, 2012 at 10:33:55PM +0530, Shubhrajyoti Datta wrote:

> Actually there was a patch in your tree that I sent which is not yet
> in linus tree so I rebased
> it to linux-next to avoid any merge conflicts.

> Henceforth I will rebase it to your tree.

That's also a good option, though for simple conflcits it's OK if the
person applying the patch has to resolve them especially if you give
some warning.

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