Re: linux-next: Tree for December 3

Jiri Kosina
2009-12-03T13:37:06Z

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.