| 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: <1349754132.1648.5253.camel@vkoul-udesk3> Date: Tue, 09 Oct 2012 09:12:12 +0530 From: Vinod Koul <vinod.koul@...ux.intel.com> To: Chris Ball <cjb@...top.org> Cc: Linus Torvalds <torvalds@...ux-foundation.org>, linux-kernel@...r.kernel.org, linux-mmc@...r.kernel.org Subject: Re: [GIT PULL] MMC updates for 3.7-rc1 On Mon, 2012-10-08 at 23:36 -0400, Chris Ball wrote: > Hi Linus, > > On Mon, Oct 08 2012, Chris Ball wrote: > > Please pull from: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1 > > > > to receive the MMC merge for 3.7. There are currently two conflicts > > due to header renames for the ARM single zImage work; they should be > > resolved by taking the changes already in your tree. Thanks. > > Sorry, the merge isn't so one-sided -- here's my resolution for you to > compare with: > > git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git tags/mmc-merge-for-3.7-rc1-merged > > davinci_mmc.c now uses <linux/edma.h> which is provided by a commit > in the slave-dmaengine tree, which hasn't sent in a pull request yet. > Vinod, please can you do that soon? ...just finished sending the request. > > Let me know if I should do anything else. Thanks, > > - Chris. -- ~Vinod -- 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