From: Jean Delvare <khali@linux-fr.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Dan Williams <dan.j.williams@intel.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Havard Skinnemoen <hskinnemoen@gmail.com>,
Jiri Kosina <jkosina@suse.cz>, Viresh Kumar <viresh.kumar@st.com>
Subject: Re: linux-next: manual merge of the async_tx tree with Linus' tree
Date: Fri, 27 May 2011 09:53:36 +0200 [thread overview]
Message-ID: <20110527095336.25007886@endymion.delvare> (raw)
In-Reply-To: <20110527133003.8299b429.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2011-05-27 7:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-27 3:30 linux-next: manual merge of the async_tx tree with Linus' tree Stephen Rothwell
2011-05-27 7:53 ` Jean Delvare [this message]
2011-05-27 19:08 ` Dan Williams
2011-05-28 8:20 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110527095336.25007886@endymion.delvare \
--to=khali@linux-fr.org \
--cc=dan.j.williams@intel.com \
--cc=hskinnemoen@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viresh.kumar@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox