Re: [B.A.T.M.A.N.] [PATCH 4/4] Staging: batman-adv: fix whitespace style issues

Luis de Bethencourt
2010-04-04T11:10:12Z

On Sun, Apr 4, 2010 at 11:46 AM, Sven Eckelmann <sven.eckelmann@gmx.de> wrote:
> On Sunday 04 April 2010 03:45:52 Luis de Bethencourt wrote:
>> Sorry about the conflict, thanks for redoing the changes. Where can I
>> find the current and development branches?
>
> The development is currently done in different branches and SCMs outside the
> kernel. Andrew Lunn prepares a maint branch for submission to GregKH and sends
> it to him for staging.
>
> Most of the development of future features are done in
>  http://downloads.open-mesh.org/svn/batman/ under trunk/batman-adv-kernelland/
> This is usually not what you deal with as only the maint branch is submitted
> for inclusion into linux staging. Nevertheless all changes in svn for batman-
> adv-kernelland are automatically imported into
> http://git.open-mesh.net/?p=batman-adv (branch master).
>
> The maint work is now done inside the maint branch of that git repository. It
> doesn't contain the whole linux tree and holds all files to build an external
> module (used for example in OpenWRT and Debian). When Andrew thinks that it is
> ready to be send to GregKH, he will do a subtree merge into linus (holds the
> linux tree) and then rebase the changes in a private branch. This is needed to
> have the correct directories inside the patches and that files removed/added
> for the kernel are still being deleted/available.
>
> So doing your changes against the git maint branch is the correct way in most
> situations.
>
>> I want to avoid doing this
>> mistake again in the future. Specially since I'm planning on doing
>> some janitorial work on Staging for a while if it's OK with you guys.
>> I see it as nice experience and practice while learning and getting
>> ready for more valuable contributions :)
>
> Yes, contributors are welcome.
>
> There is also a userspace part which must also work with your changes. One
> problem was spotted by Marek. So it is maybe a good idea to send changes over
> the b.a.t.m.a.n. mailing list.
>
> Best regards,
>        Sven
>

Thanks a lot for the help Sven.

My patch didn't include changes to bat_sysfs.c, where are this changes
coming from? Sorry if I'm missing something obvious.

Luis