tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

libbpf: fix spelling mistake "conflictling" -> "conflicting"

There are several spelling mistakes in pr_warning messages. Fix these.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Colin Ian King and committed by
Alexei Starovoitov 900de4ac 7ae9f281

+4 -4
+4 -4
tools/lib/bpf/libbpf.c
··· 1169 1169 pr_debug("map '%s': found key_size = %u.\n", 1170 1170 map_name, sz); 1171 1171 if (map->def.key_size && map->def.key_size != sz) { 1172 - pr_warning("map '%s': conflictling key size %u != %u.\n", 1172 + pr_warning("map '%s': conflicting key size %u != %u.\n", 1173 1173 map_name, map->def.key_size, sz); 1174 1174 return -EINVAL; 1175 1175 } ··· 1197 1197 pr_debug("map '%s': found key [%u], sz = %lld.\n", 1198 1198 map_name, t->type, sz); 1199 1199 if (map->def.key_size && map->def.key_size != sz) { 1200 - pr_warning("map '%s': conflictling key size %u != %lld.\n", 1200 + pr_warning("map '%s': conflicting key size %u != %lld.\n", 1201 1201 map_name, map->def.key_size, sz); 1202 1202 return -EINVAL; 1203 1203 } ··· 1212 1212 pr_debug("map '%s': found value_size = %u.\n", 1213 1213 map_name, sz); 1214 1214 if (map->def.value_size && map->def.value_size != sz) { 1215 - pr_warning("map '%s': conflictling value size %u != %u.\n", 1215 + pr_warning("map '%s': conflicting value size %u != %u.\n", 1216 1216 map_name, map->def.value_size, sz); 1217 1217 return -EINVAL; 1218 1218 } ··· 1240 1240 pr_debug("map '%s': found value [%u], sz = %lld.\n", 1241 1241 map_name, t->type, sz); 1242 1242 if (map->def.value_size && map->def.value_size != sz) { 1243 - pr_warning("map '%s': conflictling value size %u != %lld.\n", 1243 + pr_warning("map '%s': conflicting value size %u != %lld.\n", 1244 1244 map_name, map->def.value_size, sz); 1245 1245 return -EINVAL; 1246 1246 }