From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
To: a@unstable.cc
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: Re: pull request [net]: batman-adv 20160430
Date: Wed, 04 May 2016 14:13:50 -0400 (EDT) [thread overview]
Message-ID: <20160504.141350.1935086155659300721.davem@davemloft.net> (raw)
In-Reply-To: <20160503.123330.1810855853724486551.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
From: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Date: Tue, 03 May 2016 12:33:30 -0400 (EDT)
> From: Antonio Quartulli <a@unstable.cc>
> Date: Tue, 3 May 2016 22:42:29 +0800
>
>> Do you have any plan on merging net into net-next in the following days ?
>>
>> I am asking because I'd prefer to avoid you the hassle of dealing with the
>> conflicts.
>
> I'll try to do this in the next few days.
Just FYI I did this last night.
next prev parent reply other threads:[~2016-05-04 18:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1462035963-28970-1-git-send-email-a@unstable.cc>
2016-04-30 17:06 ` [PATCH 1/4] batman-adv: fix DAT candidate selection (must use vid) Antonio Quartulli
2016-04-30 17:06 ` [PATCH 2/4] batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event Antonio Quartulli
2016-04-30 17:06 ` [PATCH 3/4] batman-adv: Fix reference counting of vlan object for tt_local_entry Antonio Quartulli
2016-04-30 17:06 ` [PATCH 4/4] batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node Antonio Quartulli
[not found] ` <1462035963-28970-1-git-send-email-a-2CpIooy/SPIKlTDg6p0iyA@public.gmane.org>
2016-05-03 4:18 ` pull request [net]: batman-adv 20160430 David Miller
2016-05-03 14:42 ` Antonio Quartulli
[not found] ` <20160503144229.GD11201-bY/dlpGjfuDhXIiyNabO3w@public.gmane.org>
2016-05-03 16:33 ` David Miller
[not found] ` <20160503.123330.1810855853724486551.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2016-05-04 18:13 ` David Miller [this message]
2016-05-04 18:18 ` Antonio Quartulli
2016-04-30 17:05 Antonio Quartulli
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=20160504.141350.1935086155659300721.davem@davemloft.net \
--to=davem-ft/pcqaiutieiz0/mpfg9q@public.gmane.org \
--cc=a@unstable.cc \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.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;
as well as URLs for NNTP newsgroup(s).