From: Ido Schimmel <idosch@mellanox.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, jgg@mellanox.com, dledford@redhat.com,
dsahern@gmail.com, sd@queasysnail.net
Subject: Re: [GIT] 'net' merged into 'net-next'
Date: Fri, 23 Mar 2018 21:05:59 +0300 [thread overview]
Message-ID: <20180323180559.GA29672@splinter> (raw)
In-Reply-To: <20180323.114059.297397691681485266.davem@davemloft.net>
On Fri, Mar 23, 2018 at 11:40:59AM -0400, David Miller wrote:
>
> 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.
Fixup for mlxsw:
http://patchwork.ozlabs.org/patch/890093/
next prev parent reply other threads:[~2018-03-23 18:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-23 15:40 [GIT] 'net' merged into 'net-next' David Miller
2018-03-23 17:26 ` Jason Gunthorpe
2018-03-23 17:36 ` David Miller
2018-03-23 18:34 ` Saeed Mahameed
2018-03-23 18:05 ` Ido Schimmel [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-22 7:24 [GIT]: " David Miller
2011-09-22 7:24 ` 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=20180323180559.GA29672@splinter \
--to=idosch@mellanox.com \
--cc=davem@davemloft.net \
--cc=dledford@redhat.com \
--cc=dsahern@gmail.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 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.