From: Sowmini Varadhan <sowmini.varadhan@oracle.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: sowmini.varadhan@oracle.com
Subject: net.git commit 3bb549ae4c51
Date: Wed, 29 Jun 2016 15:18:55 -0400 [thread overview]
Message-ID: <20160629191855.GA15982@oracle.com> (raw)
Hi,
I'm getting ready with the next installment of changes to rds-tcp
for mprds, and I noticed that commit 3bb549ae4c51 ("RDS: TCP:
rds_tcp_accept_one() should transition socket from RESETTING to UP")
has not made its way to net-next. I also noticed that (even though this
is a one-liner), this patch generates a conflict when applied as-is
to net-next.
My planned changes will cause more turbulence around this piece
of code, so they depend on this patch. What is the advised approach
here? Should I just port this patch over to net-next as part
of my patch-set, and make a note about the port, or something else?
--Sowmini
reply other threads:[~2016-06-29 19:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20160629191855.GA15982@oracle.com \
--to=sowmini.varadhan@oracle.com \
--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 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.