From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755537AbYGYXzw (ORCPT ); Fri, 25 Jul 2008 19:55:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753099AbYGYXzl (ORCPT ); Fri, 25 Jul 2008 19:55:41 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:42026 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752915AbYGYXzk (ORCPT ); Fri, 25 Jul 2008 19:55:40 -0400 Date: Fri, 25 Jul 2008 16:55:39 -0700 (PDT) Message-Id: <20080725.165539.91586849.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 5.2 on Emacs 22.1 / Mule 5.0 (SAKAKI) 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 A fix for a lockdep problem reported by Ingo, and a cure for order-5 page allocations that can be triggered by IPCOMP decompression from Herbert Xu. Please pull, thanks a lot! The following changes since commit f867e6af94239a04ec23aeec2fcda5aa58e41db7: Jarek Poplawski (1): pkt_sched: sch_sfq: dump a real number of flows are available in the git repository at: master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master David S. Miller (1): pkt_sched: Fix locking in shutdown_scheduler_queue() Herbert Xu (2): ipsec: ipcomp - Merge IPComp implementations ipsec: ipcomp - Decompress into frags if necessary include/net/ipcomp.h | 6 + net/ipv4/Kconfig | 4 +- net/ipv4/ipcomp.c | 315 +------------------------------------- net/ipv6/Kconfig | 4 +- net/ipv6/ipcomp6.c | 298 +----------------------------------- net/sched/sch_generic.c | 4 +- net/xfrm/Kconfig | 6 + net/xfrm/Makefile | 1 + net/xfrm/xfrm_ipcomp.c | 385 +++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 415 insertions(+), 608 deletions(-) create mode 100644 net/xfrm/xfrm_ipcomp.c