From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754226Ab0DYWMw (ORCPT ); Sun, 25 Apr 2010 18:12:52 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:44171 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751239Ab0DYWMu (ORCPT ); Sun, 25 Apr 2010 18:12:50 -0400 Date: Sun, 25 Apr 2010 15:12:56 -0700 (PDT) Message-Id: <20100425.151256.159623106.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] Networking From: David Miller X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The TCP bind conflict port allocation fix had a bug on the ipv6 side, hit by a bunch of folks. Fix from Eric Dumazet. An e100 crash fix from Alan Cox that should cure a bunch of hits we've got on kerneloops.org, no mutual exclusion done by the TX timeout workqueue causes crashes as two threads of control try to reset the chip in parallel. Please pull, thanks a lot! The following changes since commit ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e: Linus Torvalds (1): Merge branch 'fixes' of git://git.kernel.org/.../davej/cpufreq are available in the git repository at: master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master Alan Cox (1): e100: Fix the TX workqueue race Eric Dumazet (1): ipv6: Fix inet6_csk_bind_conflict() drivers/net/e100.c | 10 ++++++++-- net/ipv6/inet6_connection_sock.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-)