lkml.org 
[lkml]   [2009]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the trivial tree with the tree
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 sfr@canb.auug.org.au
>
> 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: kernel-janitors@vger.kernel.org
> - 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: bfields@fieldses.org
> -P: Neil Brown
> -M: neilb@suse.de
> +M: "J. Bruce Fields" <bfields@fieldses.org>
> +M: Neil Brown <neilb@suse.de>
> L: linux-nfs@vger.kernel.org
> 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


\
 
 \ /
  Last update: 2009-08-08 02:15    [W:0.057 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site