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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 10 Nov 2009 12:42:31 +0100 From: Jean Delvare <khali@...ux-fr.org> To: Stephen Rothwell <sfr@...b.auug.org.au>, Ben Hutchings <bhutchings@...arflare.com> Cc: David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Mika Kuoppala <mika.kuoppala@...ia.com> Subject: Re: linux-next: manual merge of the net tree with the i2c tree Hi Stephen, Ben, On Mon, 26 Oct 2009 13:37:57 +1100, Stephen Rothwell wrote: > Today's linux-next merge of the net tree got a conflict in > drivers/net/sfc/sfe4001.c between commit > 3f7c0648f727a6d5baf6117653e4001dc877b90b ("i2c: Prevent priority > inversion on top of bus lock") from the i2c tree and commit > c9597d4f89565b6562bd3026adbe6eac6c317f47 ("sfc: Merge sfe4001.c into > falcon_boards.c") from the net tree. > > I have applied the following merge fixup patch (after removing > drivers/net/sfc/sfe4001.c) and can carry it as necessary. I've merged the new API to get and release the i2c_adapter mutex: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=afa08974fe80c198b8650f73ed8ab59135ca10d0 Ben, you can adjust your own patches to make use of this API instead of accessing the i2c_adapter mutex directly. That way, you are no longer dependent of implementation changes, and this should solve the conflict. Stephen, you can then drop your fixup patch. Thanks, -- Jean Delvare -- 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