linux-kernel - Re: linux-next: manual merge of the async

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 27 May 2011 09:53:36 +0200
From:	Jean Delvare <khali@...ux-fr.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Dan Williams <dan.j.williams@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Havard Skinnemoen <hskinnemoen@...il.com>,
	Jiri Kosina <jkosina@...e.cz>,
	Viresh Kumar <viresh.kumar@...com>
Subject: Re: linux-next: manual merge of the async_tx tree with Linus' tree

Hi Stephen, Dan,

On Fri, 27 May 2011 13:30:03 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the async_tx tree got a conflict in
> drivers/dma/dw_dmac.c between commit e05503ef1186 ("Haavard Skinnemoen
> has left Atmel") from Linus' tree and commit aecb7b64dd9e
> ("dmaengine/dw_dmac: Update maintainer-ship") from the async_tx tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Dan's patch is just plain wrong. MODULE_AUTHOR is about who wrote the
code, not who maintains it. A change of maintainer should lead to an
update or addition to file MAINTAINERS.

Thanks Viresh for stepping in, BTW, new maintainers are always welcome.

(As a side note, the relevance of MODULE_AUTHOR given the development
and maintenance model the Linux kernel has embraced can certainly be
discussed, but that's a different story.)

-- 
Jean Delvare
--
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/