| 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
| ||
|
Message-ID: <20110607190607.GB3011@acer> Date: Tue, 7 Jun 2011 22:06:07 +0300 From: Mika Westerberg <mika.westerberg@....fi> To: Grant Likely <grant.likely@...retlab.ca> Cc: linux-arm-kernel@...ts.infradead.org, hsweeten@...ionengravers.com, rmallon@...il.com, vinod.koul@...el.com, dan.j.williams@...el.com, lrg@...com, broonie@...nsource.wolfsonmicro.com, linux-kernel@...r.kernel.org Subject: Re: [PATCH v2 5/5] spi/ep93xx: add DMA support On Tue, Jun 07, 2011 at 12:45:26PM -0600, Grant Likely wrote: > On Tue, Jun 7, 2011 at 11:14 AM, Mika Westerberg <mika.westerberg@....fi> wrote: > > > > I just realized that once the SPI driver renaming patch (spi: reorganize > > drivers) enters linux-next, this patch (which sits on Vinod's tree) will cause > > a merge conflict. Any ideas how to avoid it beforehand? > > Yes, put the whole series into a separate branch all by itself. Merge > that branch into Vinod's tree and I'll also merge it into spi/next, > and I'll fix up the merge conflict when I do. More stupid questions: Do you mean that I create a branch in my public repository somewhere? If that is the case, then there is a problem that I don't have any public repository and I doubt that I get such before linux-next is rebuilt. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists