netdev - Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

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: Windows password security audit tool. GUI, reports in PDF.

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

Message-Id: <20090423.044343.133646582.davem@davemloft.net>
Date:	Thu, 23 Apr 2009 04:43:43 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	ubraun@...ux.vnet.ibm.com
Cc:	netdev@...r.kernel.org, linux-s390@...r.kernel.org,
	schwidefsky@...ibm.com, heiko.carstens@...ibm.com,
	ursula.braun@...ibm.com
Subject: Re: [patch 0/8] iucv / af_iucv patches for net-next-2.6.30-rc1

From: Ursula Braun <ubraun@...ux.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 :-)
--
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