Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754768AbYLISiR (ORCPT ); Tue, 9 Dec 2008 13:38:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753998AbYLISiA (ORCPT ); Tue, 9 Dec 2008 13:38:00 -0500 Received: from mail-qy0-f11.google.com ([209.85.221.11]:60349 "EHLO mail-qy0-f11.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753706AbYLISh7 (ORCPT ); Tue, 9 Dec 2008 13:37:59 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=Ref3HFWjudu3/XIV2FbkUFpT4+63TL6UUi07Fb2RFV1t846R3Y8AI1mvztnoXZlo1p 3Z0QkOx5v3CwqbfLA7Y4MGHtvjdvjg1HTDJX7ZEeG5H1zVmd38DztmPMGS+yvMDod/vA bmy/DcVxZQL5iuZNi4v7VUoe+jFgCIZAoJURQ= Message-ID: Date: Tue, 9 Dec 2008 19:37:58 +0100 From: "=?ISO-8859-1?Q?Fr=E9d=E9ric_Weisbecker?=" To: "Steven Rostedt" Subject: Re: [ANNOUNCE] The -rt git tree Cc: LKML , linux-rt-users , "Peter Zijlstra" , "Clark Williams" , "Ingo Molnar" , "Thomas Gleixner" , "Arnaldo Carvalho de Melo" , "Gregory Haskins" , "Darren Hart" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1244 Lines: 37 2008/12/9 Steven Rostedt : > > On Tue, 9 Dec 2008, Fr?d?ric Weisbecker wrote: >> >> Hi Steve. >> >> That's a good news. >> >> But after converting these spinlocks into lock_t, how will you synchronize with >> the mainline on each release? You will have a huge amount of conflicts >> at every merges... > > This is why master is separate from rt-master. The rt-master will grow > like tip/master does. But the master will be recreated each time. > Basically, the creation of master is this: > > > git checkout master > git reset --hard rt-master > ./scripts/convert-spinlocks > git commit -a -m 'Convert all spinlocks to lock_t' > ./scripts/convert-locks > git commit -a -m 'Convert some locks back to spinlock_t' > > Thus we do not need to worry about the conflicts caused by the lock > conversion. That will be done automatically each time we create a new > master. I see... A lot is done with the scripts. I think I will follow closely what happens on this tree :-) Thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/