From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1
Date: Thu, 23 Apr 2009 04:43:43 -0700 (PDT)
Message-ID: <20090423.044343.133646582.davem@davemloft.net>
References: <1240400356.13951.11.camel@braunu-laptop>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org,
	schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com,
	ursula.braun@de.ibm.com
To: ubraun@linux.vnet.ibm.com
Return-path: <netdev-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:48931
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1752612AbZDWLnv (ORCPT
	<rfc822;netdev@vger.kernel.org>); Thu, 23 Apr 2009 07:43:51 -0400
In-Reply-To: <1240400356.13951.11.camel@braunu-laptop>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

From: Ursula Braun <ubraun@linux.vnet.ibm.com>
Date: Wed, 22 Apr 2009 13:39:16 +0200

> the af_iucv-patches sent today apply to net-next-2.6 without pulling
> yesterday's patches for net-2.6.
> 
> If you prefer to pull net-2.6 first (in order to avoid potential future
> merge conflicts), I can rebuild and resend today's net-next-2.6 patches
> based on yesterday's af_iucv patches for net-2.6.

I applied them all, then pulled net-2.6 into net-next-2.6 to
resolve the conflicts.

Please make sure I did the right thing :-)