From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 23 Jun 2006 16:37:26 +0100 (BST) Received: from localhost.localdomain ([127.0.0.1]:59579 "EHLO bacchus.dhis.org") by ftp.linux-mips.org with ESMTP id S8133941AbWFWPhL (ORCPT ); Fri, 23 Jun 2006 16:37:11 +0100 Received: from denk.linux-mips.net (denk.linux-mips.net [127.0.0.1]) by bacchus.dhis.org (8.13.6/8.13.4) with ESMTP id k5NFbBa2023348; Fri, 23 Jun 2006 16:37:11 +0100 Received: (from ralf@localhost) by denk.linux-mips.net (8.13.6/8.13.6/Submit) id k5NFb9Aj023347; Fri, 23 Jun 2006 16:37:09 +0100 Date: Fri, 23 Jun 2006 16:37:09 +0100 From: Ralf Baechle To: Sergei Shtylyov Cc: Domen Puncer , linux-mips@linux-mips.org Subject: Re: [patch 1/8] au1xxx: psc fixes + add au1200 adresses Message-ID: <20060623153709.GA23267@linux-mips.org> References: <20060623095703.GA30980@domen.ultra.si> <20060623095831.GA31017@domen.ultra.si> <449BE538.5030203@ru.mvista.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <449BE538.5030203@ru.mvista.com> User-Agent: Mutt/1.4.2.1i 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: 11831 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: ralf@linux-mips.org Precedence: bulk X-list: linux-mips On Fri, Jun 23, 2006 at 04:57:28PM +0400, Sergei Shtylyov wrote: > That was my patch, originally. And (surprise!) it just went from the -mm > tree to Linus. Congrats, now we're going to have a patch conflict. :-) Shit happens - but it's annoying have to sort that out so better be avoided ... Ralf