From: David Miller <davem@davemloft.net>
To: lucien.xin@gmail.com
Cc: netdev@vger.kernel.org, linux-sctp@vger.kernel.org,
marcelo.leitner@gmail.com, nhorman@tuxdriver.com
Subject: Re: [PATCH net-next 0/9] sctp: clean up sctp_sendmsg
Date: Sun, 04 Mar 2018 13:02:17 -0500 (EST) [thread overview]
Message-ID: <20180304.130217.1441144680336824217.davem@davemloft.net> (raw)
In-Reply-To: <cover.1519916440.git.lucien.xin@gmail.com>
From: Xin Long <lucien.xin@gmail.com>
Date: Thu, 1 Mar 2018 23:05:09 +0800
> This cleanup mostly does three things:
>
> - extract some codes into functions to make sendmsg more readable.
>
> - tidy up some codes to avoid the unnecessary checks.
>
> - adjust some logic so that it will be easier to add the send flags
> and cmsgs features that I will post after this.
>
> To make it easy to review and to check if the code is compatible with
> before, this patchset is to do it step by step in 9 patches.
>
> NOTE:
> There will be a conflict when merging
> Commit 2277c7cd75e3 ("sctp: Add LSM hooks") from selinux tree,
> the solution is to:
>
> 1. remove all the lines in [B]:
>
> <<<<<<< HEAD
> [A]
> =======
> [B]
> >>>>>>> 2277c7c... sctp: Add LSM hooks
>
> 2. and apply the following diff-output:
...
Series applied, thank you.
In particular, thanks for the merge resolution details.
prev parent reply other threads:[~2018-03-04 18:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 15:05 [PATCH net-next 0/9] sctp: clean up sctp_sendmsg Xin Long
2018-03-01 15:05 ` [PATCH net-next 1/9] sctp: factor out sctp_sendmsg_to_asoc from sctp_sendmsg Xin Long
2018-03-01 15:05 ` [PATCH net-next 2/9] sctp: factor out sctp_sendmsg_new_asoc " Xin Long
2018-03-01 15:05 ` [PATCH net-next 3/9] sctp: factor out sctp_sendmsg_check_sflags " Xin Long
2018-03-01 15:05 ` [PATCH net-next 4/9] sctp: factor out sctp_sendmsg_get_daddr " Xin Long
2018-03-01 15:05 ` [PATCH net-next 5/9] sctp: factor out sctp_sendmsg_parse " Xin Long
2018-03-01 15:05 ` [PATCH net-next 6/9] sctp: factor out sctp_sendmsg_update_sinfo " Xin Long
2018-03-01 15:05 ` [PATCH net-next 7/9] sctp: remove the unnecessary transport looking up " Xin Long
2018-03-01 15:05 ` [PATCH net-next 8/9] sctp: improve some variables in sctp_sendmsg Xin Long
2018-03-01 15:05 ` [PATCH net-next 9/9] sctp: adjust some codes in a better order " Xin Long
2018-03-01 18:09 ` [PATCH net-next 0/9] sctp: clean up sctp_sendmsg Neil Horman
2018-03-01 18:34 ` Marcelo Ricardo Leitner
2018-03-04 18:02 ` David Miller [this message]
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=20180304.130217.1441144680336824217.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-sctp@vger.kernel.org \
--cc=lucien.xin@gmail.com \
--cc=marcelo.leitner@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@tuxdriver.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).