From: Sven Eckelmann <sven.eckelmann@gmx.de>
To: Greg KH <greg@kroah.com>
Cc: b.a.t.m.a.n@lists.open-mesh.net
Subject: Re: [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (5)
Date: Thu, 22 Jul 2010 23:46:26 +0200 [thread overview]
Message-ID: <201007222346.28234.sven.eckelmann@gmx.de> (raw)
In-Reply-To: <20100722213007.GA26362@kroah.com>
[-- Attachment #1: Type: Text/Plain, Size: 801 bytes --]
Greg KH wrote:
[...]
> > I can also provide a patch on top of linux-next instead of
> > staging-next-2.6 if you would prefer it in this situation. I will call
> > it
> > "[PATCH-next 1/3] Staging: batman-adv: Don't increment stats of foreign
> > device"
> >
> > I hope that it doesn't create more confusion as necessary. :)
>
> I just applied the 3 patches, I shouldn't need to apply the other one on
> top of -next, right?
No, it was just in case that some merges happened before you apply them (and
you would get the same situation as it is currently in linux-next).
I hope that the person who must resolve the merge conflict between staging-
next and net-next does the right thing... but I am sure that everything will
work fine (it is relative trivial).
thanks,
Sven
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2010-07-22 21:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-20 22:25 [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (5) Sven Eckelmann
2010-07-20 22:25 ` [B.A.T.M.A.N.] [PATCH 1/3] Staging: batman-adv: Don't increment stats of foreign device Sven Eckelmann
2010-07-20 22:25 ` [B.A.T.M.A.N.] [PATCH 2/3] Staging: batman-adv: don't use default init_module/cleanup_module function names Sven Eckelmann
2010-07-20 22:25 ` [B.A.T.M.A.N.] [PATCH 3/3] Staging: batman-adv: Update TODO with new points from review Sven Eckelmann
2010-07-22 21:30 ` [B.A.T.M.A.N.] Staging: batman-adv for 2.6.36 (5) Greg KH
2010-07-22 21:46 ` Sven Eckelmann [this message]
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=201007222346.28234.sven.eckelmann@gmx.de \
--to=sven.eckelmann@gmx.de \
--cc=b.a.t.m.a.n@lists.open-mesh.net \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=greg@kroah.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 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.