[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LRH.2.00.0912031435380.9567@twin.jikos.cz>
Date: Thu, 3 Dec 2009 14:37:06 +0100 (CET)
From: Jiri Kosina <jkosina@...e.cz>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for December 3
On Thu, 3 Dec 2009, Stephen Rothwell wrote:
> Changes since 20091202:
>
> New tree: kbuild-current
>
> The powerpc tree lost its build failure.
>
> The ext3 tree gained a build failure for which I reverted a commit.
>
> The net tree lost a conflict.
>
> The mtd tree gained a conflict against the mips tree.
>
> The tip tree lost a conflict.
>
> The workqueues tree lost its conflicts.
[ ... ]
> Below is a summary of the state of the merge.
[ ... ]
> Merging trivial/for-next
> CONFLICT (content): Merge conflict in Documentation/video4linux/gspca.txt
Hi Stephen,
have you been sending out e-mail about this conflict? I don't seem to have
received any.
Thanks,
--
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists