public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Marek Lindner <lindner_marek@yahoo.de>,
	Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Subject: [B.A.T.M.A.N.] Merging of changes only in maint back to trunk
Date: Mon, 3 May 2010 00:12:09 +0200	[thread overview]
Message-ID: <201005030012.18621.sven.eckelmann@gmx.de> (raw)

[-- Attachment #1: Type: Text/Plain, Size: 949 bytes --]

Hi,

I worked today on a small project [1] to recreated all current features for 
0.3 on top of the current changeset in maint. This would be handy when Andrew 
Lunn will send them to the kernel folks.

I discovered several small differences between maint and master which results 
in slightly different content in the rebase branch. This comes from the 
missing merged README and CHANGELOG and some inconsistent changes in my "80 
chars per line" patch. I would like to encourage to merge that changes even if 
the README has currently some outdated information.

I would also want to ask Daniel Seither, Simon Wunderlich and Marek Lindner to 
check if I accidentally changed their patches in a way they don't want to 
support. I know that the commit messages aren't up to date, but would like to 
receive any kind of corrections for them.

Best regards,
	Sven

[1] http://git.open-mesh.net/?p=ecsv/master-rebase.git;a=summary

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2010-05-02 22:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-02 22:12 Sven Eckelmann [this message]
2010-05-02 22:14 ` [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Merge CHANGELOG with 0.2.1 release Sven Eckelmann
2010-05-02 22:14 ` [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: Merge README " Sven Eckelmann
2010-05-02 22:14 ` [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: Synchronize formating with maint Sven Eckelmann
2010-05-02 22:41 ` [B.A.T.M.A.N.] Merging of changes only in maint back to trunk Marek Lindner

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=201005030012.18621.sven.eckelmann@gmx.de \
    --to=sven.eckelmann@gmx.de \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=lindner_marek@yahoo.de \
    --cc=siwu@hrz.tu-chemnitz.de \
    /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