* Re: mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl)
[not found] <200904070812.n378CCnZ030736@imap1.linux-foundation.org>
@ 2009-04-07 15:51 ` Randy Dunlap
2009-04-07 15:54 ` mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl ++ mtd) Randy Dunlap
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2009-04-07 15:51 UTC (permalink / raw)
To: linux-kernel; +Cc: Andrew Morton
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;
--
~Randy
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl ++ mtd)
2009-04-07 15:51 ` mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl) Randy Dunlap
@ 2009-04-07 15:54 ` Randy Dunlap
0 siblings, 0 replies; 2+ messages in thread
From: Randy Dunlap @ 2009-04-07 15:54 UTC (permalink / raw)
To: Randy Dunlap; +Cc: linux-kernel, Andrew Morton
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-04-07 15:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <200904070812.n378CCnZ030736@imap1.linux-foundation.org>
2009-04-07 15:51 ` mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl) Randy Dunlap
2009-04-07 15:54 ` mmotm 2009-04-07-01-06 uploaded (serial/8250_pci & kernel/sysctl ++ mtd) Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox