From: Antonio Quartulli <a@unstable.cc>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org
Subject: Re: [B.A.T.M.A.N.] pull request [net]: batman-adv 20160216
Date: Tue, 23 Feb 2016 13:07:50 +0800 [thread overview]
Message-ID: <20160223050750.GP5584@prodigo.lan> (raw)
In-Reply-To: <20160220052840.GF5584@prodigo.lan>
[-- Attachment #1: Type: text/plain, Size: 989 bytes --]
On Sat, Feb 20, 2016 at 01:28:40PM +0800, Antonio Quartulli wrote:
> On Fri, Feb 19, 2016 at 03:37:18PM -0500, David Miller wrote:
> > And thanks for the heads up about the potential merge issues, I'll watch
> > for that.
> >
>
> Hi David,
>
> actually I just realized that the patches that will create the conflict
> are not yet in net-next, but they are still pending in my queue.
>
> At this point I will wait for you to merge net into net-next first
> (there should be no conflict at that point) and then I will rebase
> my pending patches on top of that.
>
>
> This should prevent you from dealing with any conflict.
Hi David,
I know this kind of mails steal you some time, but do you have any plan
about merging net into net-next in the next days ?
I have some more new changes coming, but I'd like to send them only after
the merge operation is done to avoid you to deal with some conflicts (as per
above).
Thanks !
--
Antonio Quartulli
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-02-23 5:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 15:01 [B.A.T.M.A.N.] pull request [net]: batman-adv 20160216 Antonio Quartulli
2016-02-16 15:01 ` [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Only put gw_node list reference when removed Antonio Quartulli
2016-02-16 15:01 ` [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: Only put orig_node_vlan " Antonio Quartulli
2016-02-16 15:01 ` [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: Avoid endless loop in bat-on-bat netdevice check Antonio Quartulli
2016-02-17 4:20 ` [B.A.T.M.A.N.] pull request [net]: batman-adv 20160216 Antonio Quartulli
2016-02-19 20:37 ` David Miller
2016-02-20 5:28 ` Antonio Quartulli
2016-02-23 5:07 ` Antonio Quartulli [this message]
2016-02-23 5:12 ` David Miller
2016-02-23 5:36 ` David Miller
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=20160223050750.GP5584@prodigo.lan \
--to=a@unstable.cc \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox