From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D6BADE1D5 for ; Wed, 7 Jan 2009 14:04:58 +1100 (EST) Received: from [127.0.0.1] (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id n0734rnW006694 for ; Tue, 6 Jan 2009 21:04:54 -0600 Subject: linux-powerpc "master" going to be rebased From: Benjamin Herrenschmidt To: linuxppc-dev list Content-Type: text/plain Date: Wed, 07 Jan 2009 14:04:53 +1100 Message-Id: <1231297493.14860.54.camel@pasglop> Mime-Version: 1.0 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Just a little warning... I mistakenly did the same merge twice in "next" and "master" resulting in those two branches now drifting for ever which they shouldn't. I'm not going to rebase "next" as I pretty much promised, so I'm going to rebase "master" to point to the same commit as "next". I'll do that sometimes tomorrow. Cheers, Ben.