All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] [PATCH] batctl: Merge differences between v2010.0.0
Date: Sun, 20 Jun 2010 22:13:46 +0200	[thread overview]
Message-ID: <201006202213.48253.sven.eckelmann@gmx.de> (raw)
In-Reply-To: <1277053035-26751-1-git-send-email-sven.eckelmann@gmx.de>

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

Sven Eckelmann wrote:
> batctl started to diverge when the batctl-0.2.x (later batctl-maint) was
> created. Even when not all changes inside the batctl branch has to be in
> the batctl-maint branch, it must be ensured that all changes in
> batctl-maint are also part of batctl.
> 
> Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
> ---

It seems that some changes from maint and master must be merged by hand. I 
will send an updated patch later.

Best regards,
	Sven

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

  reply	other threads:[~2010-06-20 20:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-20 16:57 [B.A.T.M.A.N.] [PATCH] batctl: Merge differences between v2010.0.0 Sven Eckelmann
2010-06-20 20:13 ` Sven Eckelmann [this message]
2010-06-20 20:49   ` [B.A.T.M.A.N.] [PATCHv2] " Sven Eckelmann
2010-06-20 21:14     ` 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=201006202213.48253.sven.eckelmann@gmx.de \
    --to=sven.eckelmann@gmx.de \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.