Re: mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl)

[Randy Dunlap]

akpm@xxxxxxxxxxxxxxxxxxxx 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;

-- 
~Randy
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/