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
| ||
|
Date: Wed, 2 Nov 2011 10:28:50 +0800 From: Yong Zhang <yong.zhang0@...il.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Ben Dooks <ben-linux@...ff.org>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the bjdooks-i2c tree with Linus' tree On Wed, Nov 02, 2011 at 12:22:21PM +1100, Stephen Rothwell wrote: > Hi Ben, > > Today's linux-next merge of the bjdooks-i2c tree got a conflict in > drivers/i2c/busses/i2c-designware-platdrv.c between commit 4311051c358a > ("i2c: irq: Remove IRQF_DISABLED") from Linus' tree and commit > f8420b7bf6ce ("fixup merge") from the bjdooks-i2c tree. > > I fixed it up (by removing the IRQF_DISABLED flag) but this change should > probably be sent to Linus as it appears to have been fixed up incorrectly > there. Yeah, we should remove that flag. And that is what commit 4311051c358a want to achieve. Thanks, Yong -- 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