From owner-freebsd-mips@FreeBSD.ORG Tue Aug 24 16:37:41 2010 Return-Path: Delivered-To: freebsd-mips@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFB8F1065673 for ; Tue, 24 Aug 2010 16:37:41 +0000 (UTC) (envelope-from c.jayachandran@gmail.com) Received: from mail-ew0-f54.google.com (mail-ew0-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id 285098FC12 for ; Tue, 24 Aug 2010 16:37:40 +0000 (UTC) Received: by ewy26 with SMTP id 26so3982029ewy.13 for ; Tue, 24 Aug 2010 09:37:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=lrQFcROexWr8Z/mdLIWu0bvF6uZBC+Mwgan2tgpb9RY=; b=h+K1GGr0zJ+wQBkukrwTea5YvabytJ+8si/vcJdrlo1EN7xElnmqpo6iihZC9eByvA C1MuXFaxO/u8Q4hn2+ReqtzPwvAu+PSH113b3udAIEDE/mGMWmzf4ANu42Wn0KxfKHRs O/6AN4541GrUGD5NP9+aOh8jwWCkdtbSBN+Ls= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=vFvOiu3d9Dlf3NdzwNfmwkOr7KlLydiRZhS9NSC340qwxMwY0wEjWMDpohS+VkJCCh eOhy5BjQmwpxlZp/8+o1iIjpOlfHBOELemoaT05IZYdKiPdTcDW2tQ6ggopIaQO8dgOQ 1fgGbKGIs5D3SPh5Bqfaj2/HzBVxY6mEMiMTA= MIME-Version: 1.0 Received: by 10.216.59.131 with SMTP id s3mr6097028wec.71.1282667859799; Tue, 24 Aug 2010 09:37:39 -0700 (PDT) Received: by 10.216.156.135 with HTTP; Tue, 24 Aug 2010 09:37:38 -0700 (PDT) In-Reply-To: <20100824.095934.469056195874343280.imp@bsdimp.com> References: <20100824.095934.469056195874343280.imp@bsdimp.com> Date: Tue, 24 Aug 2010 22:07:38 +0530 Message-ID: From: "Jayachandran C." To: "M. Warner Losh" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: gonzo@freebsd.org, swarron@gmail.com, freebsd-mips@freebsd.org Subject: Re: Has the mips branch code been merged into the head main-line? X-BeenThere: freebsd-mips@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting FreeBSD to MIPS List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2010 16:37:41 -0000 On Tue, Aug 24, 2010 at 9:29 PM, M. Warner Losh wrote: > In message: > =A0 =A0 =A0 =A0 =A0 =A0"S.W Arron" writes: > : Hi, Oleksandr > : > : It seems that the mips branch is removed from the base/projects/mips in= the > : svn repository, and i can't "svn update" to update the mips code. But "= svn > : diff" is still ok, very strange. It is appreciated if some help can be > : provided. > : > : Since 8.0 there is mips directory in sys/, not sure the mips branch cod= e has > : already been merged into the mainline. Can you help confirm it or give = some > : instruction where to get the latest version for freebsd-mips? Thanks a = lot! > > The mips code has been merged to the mainline. =A0projects/mips has been > svn deleted since we've collapsed it all into head. =A0Juli Mallet does > have a Cavium Octeon branch, but I believe almost all the changes (and > all the important ones) have been merged. =A0FreeBSD 8.x has some mips > code, but the mips code in -current is much better. =A0There's talk > about merging it back to 8, but that's a lot of work that nobody has > had time to do so far. Is there any writeup on how this is done - if it is just a matter of svn merge and fixing up may be I can have a go at this. JC.