Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754800AbYLIRwd (ORCPT ); Tue, 9 Dec 2008 12:52:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754562AbYLIRwR (ORCPT ); Tue, 9 Dec 2008 12:52:17 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.123]:60613 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754371AbYLIRwQ (ORCPT ); Tue, 9 Dec 2008 12:52:16 -0500 Date: Tue, 9 Dec 2008 12:52:13 -0500 (EST) From: Steven Rostedt X-X-Sender: rostedt@gandalf.stny.rr.com To: =?ISO-8859-15?Q?Fr=E9d=E9ric_Weisbecker?= cc: LKML , linux-rt-users , Peter Zijlstra , Clark Williams , Ingo Molnar , Thomas Gleixner , Arnaldo Carvalho de Melo , Gregory Haskins , Darren Hart Subject: Re: [ANNOUNCE] The -rt git tree In-Reply-To: Message-ID: References: User-Agent: Alpine 1.10 (DEB 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1064 Lines: 34 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. -- Steve -- 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/