From patchwork Wed Oct 17 05:05:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 191967 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7E39F2C00A7 for ; Wed, 17 Oct 2012 16:05:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871Ab2JQFFb (ORCPT ); Wed, 17 Oct 2012 01:05:31 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:36373 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751423Ab2JQFFa (ORCPT ); Wed, 17 Oct 2012 01:05:30 -0400 Received: from localhost (cpe-66-108-116-58.nyc.res.rr.com [66.108.116.58]) by shards.monkeyblade.net (Postfix) with ESMTPSA id A7046581179; Tue, 16 Oct 2012 22:05:31 -0700 (PDT) Date: Wed, 17 Oct 2012 01:05:28 -0400 (EDT) Message-Id: <20121017.010528.614908812231452770.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] Networking From: David Miller X-Mailer: Mew version 6.5 on Emacs 24.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org 1) Fix regression in /proc/net/if_inet6, sometimes devices do not get listed. From Eric Dumazet. 2) Add IPSEC networking sub-section to MAINTAINERS. 3) S390 networking fixes from Hendrik Brueckner and Stefan Raspl. 4) Fix enslavement of devices that can't do VLAN properly, from Jiri Pirko. 5) SCTP sack handling fix from Zijie Pan. Please pull, thanks a lot. The following changes since commit 29bb4cc5e0547a7589556f8629e39016c5d203c0: docbook: networking: fix file paths for uapi headers (2012-10-15 08:04:41 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git master for you to fetch changes up to 9f0d3c2781baa1102108e16efbe640dd74564a7c: ipv6: addrconf: fix /proc/net/if_inet6 (2012-10-16 14:41:47 -0400) ---------------------------------------------------------------- David S. Miller (1): MAINTAINERS: Add explicit section for IPSEC networking. Dmitry Kravkov (1): bnx2x: fix handling mf storage modes Eric Dumazet (1): ipv6: addrconf: fix /proc/net/if_inet6 Hendrik Brueckner (1): smsgiucv: reestablish IUCV path after resume Jiri Pirko (1): vlan: fix bond/team enslave of vlan challenged slave/port Stefan Raspl (1): qeth: fix deadlock between recovery and bonding driver Zijie Pan (1): sctp: fix call to SCTP_CMD_PROCESS_SACK in sctp_cmd_interpreter() MAINTAINERS | 14 ++++++++++++++ drivers/net/bonding/bond_main.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 +++++++--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +- drivers/s390/net/qeth_l2_main.c | 11 ++++++----- drivers/s390/net/qeth_l3_main.c | 11 ++++++----- drivers/s390/net/smsgiucv.c | 2 +- net/8021q/vlan_core.c | 9 ++++++++- net/ipv6/addrconf.c | 15 +++++++++------ net/sctp/sm_sideeffect.c | 3 ++- 10 files changed, 55 insertions(+), 24 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html