2008/12/9 Steven Rostedt <rostedt@xxxxxxxxxxx>: > > 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-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
