From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757499AbZDGPzm (ORCPT ); Tue, 7 Apr 2009 11:55:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755424AbZDGPzc (ORCPT ); Tue, 7 Apr 2009 11:55:32 -0400 Received: from acsinet12.oracle.com ([141.146.126.234]:22513 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754161AbZDGPzb (ORCPT ); Tue, 7 Apr 2009 11:55:31 -0400 Message-ID: <49DB774B.6080907@oracle.com> Date: Tue, 07 Apr 2009 08:54:51 -0700 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Randy Dunlap CC: linux-kernel@vger.kernel.org, Andrew Morton Subject: Re: mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl ++ mtd) References: <200904070812.n378CCnZ030736@imap1.linux-foundation.org> <49DB769B.7010203@oracle.com> In-Reply-To: <49DB769B.7010203@oracle.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt701.oracle.com [141.146.40.71] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A010209.49DB7742.028E:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Randy Dunlap wrote: > akpm@linux-foundation.org wrote: >> The mm-of-the-moment snapshot 2009-04-07-01-06 has been uploaded to >> >> http://userweb.kernel.org/~akpm/mmotm/ >> >> and will soon be available at >> >> git://git.zen-sources.org/zen/mmotm.git >> >> It contains the following patches against 2.6.29: > > > some kind of patch/diff problem here: > > drivers/serial/8250_pci.c: > > static int > <<<<<<< HEAD:drivers/serial/8250_pci.c > pci_ni8430_setup(struct serial_private *priv, > const struct pciserial_board *board, > ======= > pci_ni8430_setup(struct serial_private *priv, struct pciserial_board *board, >>>>>>>> FETCH_HEAD:drivers/serial/8250_pci.c > struct uart_port *port, int idx) > { > > > and here: > > kernel/sysctl.c: > > static int zero; > <<<<<<< HEAD:kernel/sysctl.c > static int __maybe_unused one = 1; > static int __maybe_unused two = 2; > ======= > static int two = 2; >>>>>>>> FETCH_HEAD:kernel/sysctl.c > static unsigned long one_ul = 1; > static int one_hundred = 100; > static int one_thousand = 1000; > and in drivers/mtd/maps/Makefile: <<<<<<< HEAD:drivers/mtd/maps/Makefile obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o obj-$(CONFIG_MTD_VMU) += vmu-flash.o ======= -- ~Randy