netdev - Re: Shared i2c adapter locking

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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20091117.061355.205349414.davem@davemloft.net>
Date:	Tue, 17 Nov 2009 06:13:55 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	bhutchings@...arflare.com
Cc:	khali@...ux-fr.org, sfr@...b.auug.org.au, netdev@...r.kernel.org,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	mika.kuoppala@...ia.com, linux-i2c@...r.kernel.org
Subject: Re: Shared i2c adapter locking

From: Ben Hutchings <bhutchings@...arflare.com>
Date: Tue, 17 Nov 2009 13:32:54 +0000

> You will need to merge Linus's tree into net-next-2.6 and resolve the
> conflict by applying Jean's changes to drivers/net/sfc/falcon_boards.c.

Ok, I'll sort this out after I next push to Linus, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html