From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qaf0Q-0007mb-Gc for garchives@archives.gentoo.org; Sun, 26 Jun 2011 02:23:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 352F21C079; Sun, 26 Jun 2011 02:23:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CDDDA1C079 for ; Sun, 26 Jun 2011 02:23:07 +0000 (UTC) Received: from mail-vw0-f53.google.com (mail-vw0-f53.google.com [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id 412952AC0E7 for ; Sun, 26 Jun 2011 02:23:07 +0000 (UTC) Received: by vws13 with SMTP id 13so3394561vws.40 for ; Sat, 25 Jun 2011 19:23:05 -0700 (PDT) Received: by 10.52.168.3 with SMTP id zs3mr6442785vdb.76.1309054985279; Sat, 25 Jun 2011 19:23:05 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Received: by 10.52.158.168 with HTTP; Sat, 25 Jun 2011 19:22:45 -0700 (PDT) In-Reply-To: <4E062735.4050907@gentoo.org> References: <4E062735.4050907@gentoo.org> From: Matt Turner Date: Sat, 25 Jun 2011 22:22:45 -0400 Message-ID: Subject: Re: [gentoo-catalyst] Differences between 2.x and 3.x, future merging To: gentoo-catalyst@lists.gentoo.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 72aafd4f8e4ef0cd6df72fc1504a82ba On Sat, Jun 25, 2011 at 2:21 PM, Sebastian Pipping wrote= : > Hello! > > > The current process of copying changes from 2.x to 3.x or vice versa is > suboptimal, especially with no recent merge commit around. > > I would like to start this thread to list and discuss differences > between catalyst 2.x and 3.x so we can then decide what needs to be > merged in which direction and then have a single branch soon (ideally) > or at least two branches with clear and to-the-point diffs. > > Difference I have noticed (without searching) so far: > > =A0- Subarch "sh4aeb" is not supported on 3.x but 2.x > > =A0- Folder ./arch of 2.x is ./modules/catalyst/arch in 3.x > > Please add any differences you are aware of. =A0Many thanks! As an aside, patches should go into master first, and cherry-picked back to catalyst_2, not the other way around. Matt