Conflicts: drivers/net/can/dev.c commit 03f16c5075b2 ("can: dev: can_restart: fix use after free bug") commit 3e77f70e7345 ("can: dev: move driver related infrastructure into separate subdir") Code move. drivers/net/dsa/b53/b53_common.c commit 8e4052c32d6b ("net: dsa: b53: fix an off by one in checking "vlan->vid"") commit b7a9e0da2d1c ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects") Field rename.
Showing the changes to tools/include/linux (1 of 285 files). Show all
Unified · Split
| @@ -79,9 +79,4 @@ · 78 unmodified lines | |||
| 79 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) | 79 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg) |
| 80 | #endif // static_assert | 80 | #endif // static_assert |
| 81 | 81 | ||
| 82 | #ifdef __GENKSYMS__ | ||
| 83 | /* genksyms gets confused by _Static_assert */ | ||
| 84 | #define _Static_assert(expr, ...) | ||
| 85 | #endif | ||
| 86 | |||
| 87 | #endif /* _LINUX_BUILD_BUG_H */ | 82 | #endif /* _LINUX_BUILD_BUG_H */ |