Re: New tree for linux-next
From: Stephen Rothwell
Date: Wed Mar 20 2013 - 19:48:13 EST
On Wed, 20 Mar 2013 23:02:14 +0900 Alexandre Courbot <gnurou@xxxxxxxxx> wrote:
> I am currently trying to get rid of the GENERIC_GPIO config option in
> order to center GPIO support around gpiolib. The patch series has been
> rather welcome and I collected a few acks, but since the change is
> rather intrusive and affects a lot of of architectures, it has been
> suggested that I submit it as a separate branch on linux-next to see
> how it (mis)behaves (full discussion is visible at
> https://lkml.org/lkml/2013/3/13/74 ).
OK, that seems sensible.
> So I have set up a branch on github on
> git://github.com/Gnurou/linux.git , for_next branch. Could you include
> it in linux-next to see if people start complaining about broken
> builds? I also actually have a couple questions about the submission
Added from today. I have called it gen-gpio and you are the only listed
contact (in case I have problems with it).
> - My branch is based on the latest stable, similarly to what I have
> seen elsewhere. One of the patches triggers a merge conflict on
> today's linux-next due to a whitespace change. Is there something I
> can do to fix this?
Do not worry about merge conflicts, that is my and Linus' job.
> - By the meantime, another person has submited a new patch that
> re-uses the option I am trying to remove. Is there a way for me to
> base on given next release to fix this as well? Or should I contact
> that person to ask him not to use this option anymore?
The latter. Also if you could supply me (and them) with any hints on how
to cope with the merge problem, that would help.
One point: if this branch is meant to be merged by others, it *must not*
be rebased or rewritten, it can only be appended to.
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
* submitted under GPL v2 (or later) and include the Contributor's
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
Description: PGP signature