netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: netdev@vger.kernel.org
Cc: xiyou.wangcong@gmail.com
Subject: net merged into net-next
Date: Fri, 19 Jan 2018 23:02:33 -0500 (EST)	[thread overview]
Message-ID: <20180119.230233.543013153745056133.davem@davemloft.net> (raw)


Cong, please check my conflict resolution of drivers/net/tun.c, thank
you.

             reply	other threads:[~2018-01-20  4:02 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-20  4:02 David Miller [this message]
2018-01-20 20:17 ` net merged into net-next Cong Wang
2018-01-22  2:45   ` Jason Wang
  -- strict thread matches above, loose matches on Subject: below --
2018-12-20 20:06 David Miller
2018-05-21 20:38 David Miller
2018-01-17  5:19 David Miller
2018-01-17  7:27 ` Saeed Mahameed
2018-01-17 10:36 ` Daniel Borkmann
2016-04-24  0:12 David Miller
2016-04-24  1:39 ` Eric Dumazet
2016-04-25 14:38   ` Craig Gallek
2013-11-04 19:57 David Miller
2013-08-04  4:55 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=20180119.230233.543013153745056133.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=xiyou.wangcong@gmail.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 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).