From owner-freebsd-arch@FreeBSD.ORG  Fri Jan 28 02:56:03 2011
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: arch@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E853106566B
	for <arch@freebsd.org>; Fri, 28 Jan 2011 02:56:03 +0000 (UTC)
	(envelope-from jroberson@jroberson.net)
Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com
	[209.85.212.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 015ED8FC20
	for <arch@freebsd.org>; Fri, 28 Jan 2011 02:56:02 +0000 (UTC)
Received: by vws9 with SMTP id 9so1066069vws.13
	for <arch@freebsd.org>; Thu, 27 Jan 2011 18:56:02 -0800 (PST)
Received: by 10.220.193.77 with SMTP id dt13mr439179vcb.217.1296183360603;
	Thu, 27 Jan 2011 18:56:00 -0800 (PST)
Received: from [10.0.1.198] ([72.253.42.56])
	by mx.google.com with ESMTPS id o13sm5918031vch.16.2011.01.27.18.55.58
	(version=SSLv3 cipher=RC4-MD5); Thu, 27 Jan 2011 18:56:00 -0800 (PST)
Date: Thu, 27 Jan 2011 16:59:01 -1000 (HST)
From: Jeff Roberson <jroberson@jroberson.net>
X-X-Sender: jroberson@desktop
To: arch@freebsd.org
Message-ID: <alpine.BSF.2.00.1101271653470.1412@desktop>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
Cc: 
Subject: ofed merge soon
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussion related to FreeBSD architecture <freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Jan 2011 02:56:03 -0000

Hi Folks,

I am merging ofed very soon.  Here is the diff between the ofed base and 
head branches, which includes all of the diffs to vendor files and FreeBSD 
files:

http://people.freebsd.org/~jeff/ofed.diff

If you want to ignore the ofed parts just skip sys/ofed and contrib/ofed 
and you will be left with the changes to the base system required to 
support ofed.  This includes things such as:

1)  new config(8) options
2)  Makefile glue
3)  type change in sysctls for arg2.
4)  IFT_INFINIBAND and related stack changes.
5)  More generic vlan support
6)  VM_WIRE_WRITE
7)  endian changes

The diffs are actually quite small when you eliminate ofed diffs.  I don't 
know why I have so many merge properties but I'll just apply this diff to 
current, build & test before committing rather than have svn do it. 
Unless someone tells me otherwise.

Before I commit I'm going to switch the default to not build ofed and the 
related kernel modules.  I may add some more comments in various pieces as 
well.

This is a last call for review.  I had already sent out the individual 
pieces to interested parties.

Thanks,
Jeff