* net.git commit 3bb549ae4c51
@ 2016-06-29 19:18 Sowmini Varadhan
0 siblings, 0 replies; only message in thread
From: Sowmini Varadhan @ 2016-06-29 19:18 UTC (permalink / raw)
To: netdev, davem; +Cc: sowmini.varadhan
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-06-29 19:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-29 19:18 net.git commit 3bb549ae4c51 Sowmini Varadhan
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).