aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/android
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-02-03 17:36:16 -0800
committerJakub Kicinski <kuba@kernel.org>2022-02-03 17:36:16 -0800
commitc59400a68c53374179cdc5f99fa77afbd092dcf8 (patch)
treec5e17286fa5b7867a5290a975cca3bc5759d510e /include/uapi/linux/android
parentMerge branch 'dsa-mv88e6xxx-phylink_generic_validate' (diff)
parentgcc-plugins/stackleak: Use noinstr in favor of notrace (diff)
downloadlinux-dev-c59400a68c53374179cdc5f99fa77afbd092dcf8.tar.xz
linux-dev-c59400a68c53374179cdc5f99fa77afbd092dcf8.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi/linux/android')
0 files changed, 0 insertions, 0 deletions