Subject: Re: linux-next: manual merge of the trivial tree with the tree

From: Jiri Kosina <[email-masked]>
Date: Sat, 8 Aug 2009 02:13:36 +0200 (CEST)

On Fri, 31 Jul 2009, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> MAINTAINERS between commit 24725d1ecf26ba05d74c1cc3ae7467b61a900421
> ("MAINTAINERS: Update KERNEL JANITORS") from Linus' tree and commit
> 70301b8cc8a23d57d3e6120c012c86569285efcb ("trivial: update the Kernel
> Janitors' web-page URL") from the trivial tree.
> 
> Just context differences.  I fixed it up (see below) and can carry the
> fix as necessary.
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> 
> diff --cc MAINTAINERS
> index fa86fd5,354cc16..0000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2912,13 -3374,16 +2912,13 @@@ F:	Makefil
>   F:	scripts/Makefile.*
>   
>   KERNEL JANITORS
>  -P:	Several
>   L:	[email-masked]
> - W:	http://www.kerneljanitors.org/
> + W:	http://janitor.kernelnewbies.org/
>  -S:	Maintained
>  +S:	Odd fixes
>   
>   KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
>  -P:	J. Bruce Fields
>  -M:	[email-masked]
>  -P:	Neil Brown
>  -M:	[email-masked]
>  +M:	"J. Bruce Fields" <[email-masked]>
>  +M:	Neil Brown <[email-masked]>
>   L:	[email-masked]
>   W:	http://nfs.sourceforge.net/
>   S:	Supported

[ sorry for late reply, have been on vacation, totally offline, for two 
  weeks ]

I have fast-forwarded the 'for-next' branch of trivial tree and fixed the 
conflict, so it should be OK the next time you pull.

Thanks,

-- 
Jiri Kosina
SUSE Labs