From: David Miller <davem@davemloft.net>
To: netdev@vger.kernel.org
Cc: jgg@mellanox.com, dledford@redhat.com, idosch@mellanox.com,
dsahern@gmail.com, sd@queasysnail.net
Subject: [GIT] 'net' merged into 'net-next'
Date: Fri, 23 Mar 2018 11:40:59 -0400 (EDT) [thread overview]
Message-ID: <20180323.114059.297397691681485266.davem@davemloft.net> (raw)
This merge was a little bit more hectic than usual.
But thankfully, I had some sample conflict resolutions to work
with, in particular for the mlx5 infiniband changes which were
the most difficult to resolve.
Please double check my work and provide any fixup patches if
necessary.
Thank you.
next reply other threads:[~2018-03-23 15:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 15:40 David Miller [this message]
2018-03-23 17:26 ` [GIT] 'net' merged into 'net-next' Jason Gunthorpe
2018-03-23 17:36 ` David Miller
2018-03-23 18:34 ` Saeed Mahameed
2018-03-23 18:05 ` Ido Schimmel
-- strict thread matches above, loose matches on Subject: below --
2011-09-22 7:24 [GIT]: " 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=20180323.114059.297397691681485266.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=dsahern@gmail.com \
--cc=idosch@mellanox.com \
--cc=jgg@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=sd@queasysnail.net \
/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).