From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 27 Sep 2005 10:06:50 +0100 (BST) Received: from ns2.sagem.com ([62.160.59.241]:35188 "EHLO mx2.sagem.com") by ftp.linux-mips.org with ESMTP id S8133566AbVI0JGd (ORCPT ); Tue, 27 Sep 2005 10:06:33 +0100 To: Jan-Benedict Glaw Cc: linux-mips@linux-mips.org Subject: =?ISO-8859-1?Q?R=E9f=2E_=3A_Re=3A_linux-mips_Vs_kernel=2Eorg?= MIME-Version: 1.0 Message-ID: From: Florian DELIZY Date: Tue, 27 Sep 2005 11:06:25 +0200 Content-Type: multipart/mixed; boundary="=_mixed 00320CF0C1257089_=" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 9048 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: florian.delizy@sagem.com Precedence: bulk X-list: linux-mips --=_mixed 00320CF0C1257089_= Content-Type: multipart/alternative; boundary="=_alternative 00320CF0C1257089_=" --=_alternative 00320CF0C1257089_= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Is that meaning that kernel.org source code is merged into linux-mips.org=20 repository,=20 or that linux-mips.org code is merged into the kernel.org source=20 repository ? Jan-Benedict Glaw Envoy=E9 par : linux-mips-bounce@linux-mips.org 27/09/2005 10:12 Remis le : 27/09/2005 10:13 =20 Pour : linux-mips@linux-mips.org cc : (ccc : Florian DELIZY/EXT/SAGEM) Objet : Re: linux-mips Vs kernel.org On Tue, 2005-09-27 09:52:01 +0200, Florian DELIZY=20 wrote: > We currently working with the 2.6.12 kernel, and wondering which from > linux-mips or kernel.org version we should use, > in a more general manner, what are the differences between linux-mips=20 and > kernel.org kernel source code, is one the > mirror of the other, or is there one that frequently merge with the=20 other Use the linux-mips.org tree to do any work. To find out about the differences, just download a kernel.org kernel and run a 'diff -Nurp' against what you find on linux-mips.org. Up to now, merges happened every now-and-then, but not on a very regular basis. However, there's hope for more timely merges since Ralf is on the way to move the souce base over to GIT, which should ease further merges... MfG, JBG -- Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 =5F O =5F "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg=20 =5F =5F O f=FCr einen Freien Staat voll Freier B=FCrger" | im Internet! | im Irak!= O=20 O O ret =3D do=5Factions((curr | FREE=5FSPEECH) & ~(NEW=5FCOPYRIGHT=5FLAW | DRM= |=20 TCPA)); --=_alternative 00320CF0C1257089_= Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable
Is that meaning that kernel.org sour= ce code is merged into linux-mips.org repository,
or that linux-mips.org code is merge= d into the kernel.org source repository ?




Jan-Benedict Glaw <jbglaw@lug-= owl.de>

Envoy=E9 par : linux-mips-bounce@lin= ux-mips.org

27/09/2005 10:12
Remis le : 27/09/2005 10:13

       
        Pour : &= nbsp;      linux-mips@linux-mips.org
        cc : &nb= sp;      (ccc : Florian DELIZY/EXT/SAGEM)
        Objet : =        Re: linux-mips Vs kernel.org



On Tue, 2005-09-27 09:52:01 +0200, Florian DELIZY &l= t;florian.delizy@sagem.com> wrote:
> We currently working with the 2.6.12 kernel, and wondering which from<= br> > linux-mips or kernel.org version we should use,
> in a more general manner, what are the differences between linux-mips = and
> kernel.org kernel source code, is one the
> mirror of the other, or is there one that frequently merge with the ot= her

Use the linux-mips.org tree to do any work.

To find out about the differences, just download a k= ernel.org kernel
and run a 'diff -Nurp' against what you find on linux-mips.org.

Up to now, merges happened every now-and-then, but n= ot on a very
regular basis. However, there's hope for more timely merges since Ralf
is on the way to move the souce base over to GIT, which should ease
further merges...

MfG, JBG

--
Jan-Benedict Glaw       jbglaw@lug-owl.de    . +49= -172-7608481             =5F O =5F
"Eine Freie Meinung in  einem Freien Kopf    | Gegen Ze= nsur | Gegen Krieg  =5F =5F O

f=FCr einen Freien Staat voll Freier B=FCrger" =  | im Internet! |   im Irak!   O O O
ret =3D do=5Factions((curr | FREE=5FSPEECH) & ~(NEW=5FCOPYRIGHT=5FLAW |= DRM | TCPA));



--=_alternative 00320CF0C1257089_=-- --=_mixed 00320CF0C1257089_= Content-Type: application/octet-stream; name="signature.asc" Content-Disposition: attachment; filename="signature.asc" Content-Transfer-Encoding: base64 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NClZlcnNpb246IEdudVBHIHYxLjQuMSAoR05V L0xpbnV4KQ0KDQppRDhEQlFGRE9QN3ZIYjFlZFlPWjRic1JBbXB0QUowYkhGS2Z6Z05IcWZiYjhw S3VIYXZQTzlkU1VBQ2ZTLzNyDQppbHJsTG5kUk9UeHZDcEVQMi8yaDk1QT0NCj0yTXpLDQotLS0t LUVORCBQR1AgU0lHTkFUVVJFLS0tLS0NCg0K --=_mixed 00320CF0C1257089_=-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 27 Sep 2005 10:12:15 +0100 (BST) Received: from lug-owl.de ([195.71.106.12]:28122 "EHLO lug-owl.de") by ftp.linux-mips.org with ESMTP id S8133566AbVI0JMA (ORCPT ); Tue, 27 Sep 2005 10:12:00 +0100 Received: by lug-owl.de (Postfix, from userid 1001) id 099E7F0054; Tue, 27 Sep 2005 11:12:00 +0200 (CEST) Date: Tue, 27 Sep 2005 11:11:59 +0200 From: Jan-Benedict Glaw To: linux-mips@linux-mips.org Subject: Re: =?utf-8?Q?R=C3=A9f?= =?utf-8?Q?=2E?= : Re: linux-mips Vs kernel.org Message-ID: <20050927091159.GB5743@lug-owl.de> Mail-Followup-To: linux-mips@linux-mips.org References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="jPJw4wSVUvI9Tm/b" Content-Disposition: inline In-Reply-To: X-Operating-System: Linux mail 2.6.12.3lug-owl X-gpg-fingerprint: 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB X-gpg-key: wwwkeys.de.pgp.net X-Echelon-Enable: howto poison arsenous mail psychological biological nuclear warfare test the bombastical terror of flooding the spy listeners explosion sex drugs and rock'n'roll X-TKUeV: howto poison arsenous mail psychological biological nuclear warfare test the bombastical terror of flooding the spy listeners explosion sex drugs and rock'n'roll User-Agent: Mutt/1.5.9i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 9049 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jbglaw@lug-owl.de Precedence: bulk X-list: linux-mips --jPJw4wSVUvI9Tm/b Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, 2005-09-27 11:06:25 +0200, Florian DELIZY wrote: > Is that meaning that kernel.org source code is merged into linux-mips.org= =20 > repository,=20 Yes. Regularly. > or that linux-mips.org code is merged into the kernel.org source=20 > repository ? Yes. From time to time. MfG, JBG --=20 Jan-Benedict Glaw jbglaw@lug-owl.de . +49-172-7608481 = _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg = _ _ O f=C3=BCr einen Freien Staat voll Freier B=C3=BCrger" | im Internet! | i= m Irak! O O O ret =3D do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)= ); --jPJw4wSVUvI9Tm/b Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFDOQzfHb1edYOZ4bsRAtFwAJ0VQHTUWDQP+iAAFFy26Sp+8r+WoQCgh5Ti WI5hXtbGMlYF7tBQ3Ov8B6k= =i9RF -----END PGP SIGNATURE----- --jPJw4wSVUvI9Tm/b-- From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 27 Sep 2005 10:13:19 +0100 (BST) Received: from 209-232-97-206.ded.pacbell.net ([209.232.97.206]:31407 "EHLO dns0.mips.com") by ftp.linux-mips.org with ESMTP id S8133566AbVI0JM7 (ORCPT ); Tue, 27 Sep 2005 10:12:59 +0100 Received: from mercury.mips.com (sbcns-dmz [209.232.97.193]) by dns0.mips.com (8.12.11/8.12.11) with ESMTP id j8R9CnCq018784; Tue, 27 Sep 2005 02:12:50 -0700 (PDT) Received: from [192.168.236.16] (grendel [192.168.236.16]) by mercury.mips.com (8.12.9/8.12.11) with ESMTP id j8R9Cl17007723; Tue, 27 Sep 2005 02:12:47 -0700 (PDT) Message-ID: <43390E6E.7030703@mips.com> Date: Tue, 27 Sep 2005 11:18:38 +0200 From: "Kevin D. Kissell" User-Agent: Mozilla Thunderbird 1.0.6 (X11/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Florian DELIZY CC: Jan-Benedict Glaw , linux-mips@linux-mips.org Subject: Re: =?ISO-8859-1?Q?R=E9f=2E_=3A_Re=3A_linux-mips_Vs_ke?= =?ISO-8859-1?Q?rnel=2Eorg?= References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.39 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 9050 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: kevink@mips.com Precedence: bulk X-list: linux-mips Florian DELIZY wrote: > Is that meaning that kernel.org source code is merged into linux-mips.org > repository, > or that linux-mips.org code is merged into the kernel.org source > repository ? Les deux. But kernel.org -> linux-mips.org merges are more frequent. Regards, Kevin K.