| Message ID | YIa1vyM7xuTKUqAL@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 63fa73e2151848ed5930dfe0040c823ffe1f2cc4 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/1] net: Fix typo in comment about ancillary data | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Mon, 26 Apr 2021 09:44:47 -0300 you wrote: > Ingo sent typo fixes for tools/ and this resulted in a warning when > building the perf/core branch that will be sent upstream in the next > merge window: > > Warning: Kernel ABI header at 'tools/perf/trace/beauty/include/linux/socket.h' differs from latest version at 'include/linux/socket.h' > diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h > > [...] Here is the summary with links: - [1/1] net: Fix typo in comment about ancillary data https://git.kernel.org/netdev/net-next/c/63fa73e21518 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/include/linux/socket.h b/include/linux/socket.h index 385894b4a8bbac2c..b8fc5c53ba6fa755 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -85,7 +85,7 @@ struct mmsghdr { /* * POSIX 1003.1g - ancillary data object information - * Ancillary data consits of a sequence of pairs of + * Ancillary data consists of a sequence of pairs of * (cmsghdr, cmsg_data[]) */
Ingo sent typo fixes for tools/ and this resulted in a warning when building the perf/core branch that will be sent upstream in the next merge window: Warning: Kernel ABI header at 'tools/perf/trace/beauty/include/linux/socket.h' differs from latest version at 'include/linux/socket.h' diff -u tools/perf/trace/beauty/include/linux/socket.h include/linux/socket.h Fix the typo on the kernel file to address this. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- include/linux/socket.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)