mctp-2.4

[williamspatrick]

mctp-2.4 was released. It includes a previously submitted patch,
so drop that.

Signed-off-by: Patrick Williams [email protected]

[kraj]

fails to build on musl systems

| FAILED: [code=1] mctp-bench.p/src_mctp-bench.c.o
| ccache aarch64-yoe-linux-musl-clang -mcpu=cortex-a72+crc+nocrypto --dyld-prefix=/usr -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/recipe-sysroot -Imctp-bench.p -I. -I../sources/mctp-2.3 -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wno-unused-parameter -O2 -g -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/sources/mctp-2.3=/usr/src/debug/mctp/2.3 -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/build=/usr/src/debug/mctp/2.3 -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/recipe-sysroot= -ffile-prefix-map=/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/mctp/2.3/recipe-sysroot-native= -pipe -MD -MQ mctp-bench.p/src_mctp-bench.c.o -MF mctp-bench.p/src_mctp-bench.c.o.d -o mctp-bench.p/src_mctp-bench.c.o -c ../sources/mctp-2.3/src/mctp-bench.c
| In file included from ../sources/mctp-2.3/src/mctp-bench.c:16:
| ../recipe-sysroot/usr/include/sys/prctl.h:88:8: error: redefinition of 'prctl_mm_map'
|    88 | struct prctl_mm_map {
|       |        ^
| ../recipe-sysroot/usr/include/linux/prctl.h:134:8: note: previous definition is here
|   134 | struct prctl_mm_map {
|       |        ^
| 1 error generated.

[williamspatrick]

@jk-ozlabs - Can you investigate / fix this in the mctp repo?

[jk-ozlabs]

PR for mctp: CodeConstruct/mctp#125

[jk-ozlabs]

... and maybe we should be covering this in CI, issue for that here: CodeConstruct/mctp#126

[williamspatrick]

PR for mctp: CodeConstruct/mctp#125

Can we tag a v2.3.1 with this fix?

[jk-ozlabs]

We don't really have a need (at this stage) for patchlevel vs minor version bumps, so I have tagged 2.4: CodeConstruct/mctp@8b019a3

[williamspatrick]

@kraj - I updated this PR to include a commit for the 2.4 tag from @jk-ozlabs . Let me know if you'd prefer that these are squashed together.

[kraj]

@kraj - I updated this PR to include a commit for the 2.4 tag from @jk-ozlabs . Let me know if you'd prefer that these are squashed together.

@williamspatrick ideally, I like rebases more than merged to keep history linear. So please squash and rebase

[williamspatrick]

@williamspatrick ideally, I like rebases more than merged to keep history linear. So please squash and rebase

Done.

[kraj]

merged with 5a4c632