diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-03-12 22:53:34 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-03-20 00:16:00 +0300 |
| commit | edab1ca5ec6fffecbf340e26956ce73e502901d5 (patch) | |
| tree | d1cec843415f5b36a31d50e4f164d0d9a2a2fadb /include/linux/build_bug.h | |
| parent | 9ac76f3d0bb2940db3a9684d596b9c8f301ef315 (diff) | |
| parent | a1d9d8e833781c44ab688708804ce35f20f3cbbd (diff) | |
| download | linux-edab1ca5ec6fffecbf340e26956ce73e502901d5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-7.0-rc5).
net/netfilter/nft_set_rbtree.c
598adea720b97 ("netfilter: revert nft_set_rbtree: validate open interval overlap")
3aea466a43998 ("netfilter: nft_set_rbtree: don't disable bh when acquiring tree lock")
https://lore.kernel.org/abgaQBpeGstdN4oq@sirena.org.uk
No adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/build_bug.h')
| -rw-r--r-- | include/linux/build_bug.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/build_bug.h b/include/linux/build_bug.h index 2cfbb4c65c78..d3dc5dc5f916 100644 --- a/include/linux/build_bug.h +++ b/include/linux/build_bug.h @@ -32,7 +32,8 @@ /** * BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied * error message. - * @condition: the condition which the compiler should know is false. + * @cond: the condition which the compiler should know is false. + * @msg: build-time error message * * See BUILD_BUG_ON for description. */ @@ -60,6 +61,7 @@ /** * static_assert - check integer constant expression at build time + * @expr: expression to be checked * * static_assert() is a wrapper for the C11 _Static_assert, with a * little macro magic to make the message optional (defaulting to the |