From: Xin Long <lucien.xin@xxxxxxxxx>
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.
--
To unsubscribe from this list: send the line "unsubscribe linux-sctp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
