kernel/git/next/linux-next.git/scripts, branch akpm-baseThe linux-next integration testing treehttps://git.rulkc.org/pub/scm/linux/kernel/git/next/linux-next.git/atom?h=akpm-base2022-06-28T06:54:02+00:00Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm2022-06-28T06:54:02+00:00Stephen Rothwellsfr@canb.auug.org.au2022-06-28T06:54:02+00:00urn:sha1:8f850ad6cf932b8b5125f9585cb397e08403cccdMerge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git2022-06-28T05:41:14+00:00Stephen Rothwellsfr@canb.auug.org.au2022-06-28T05:41:14+00:00urn:sha1:6d2c4faac6e3168b1ad7f77a8ac59dd8311cdb24
# Conflicts:
# Makefile
# include/uapi/linux/android/binder.h
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git2022-06-28T01:09:16+00:00Stephen Rothwellsfr@canb.auug.org.au2022-06-28T01:09:16+00:00urn:sha1:c95333b2ff8c3325df74d1eb36c3c797c9096dc0
# Conflicts:
# arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
Merge branch 'docs-next' of git://git.lwn.net/linux.git2022-06-28T00:43:09+00:00Stephen Rothwellsfr@canb.auug.org.au2022-06-28T00:43:09+00:00urn:sha1:8d6308e68cd854eb7bfdbd0133c62f3e84f4826cMerge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git2022-06-27T22:56:31+00:00Stephen Rothwellsfr@canb.auug.org.au2022-06-27T22:56:31+00:00urn:sha1:a15a8e7f4e9d849531b250ea1978b42b231d46e9Merge branch 'master' into mm-nonmm-stable2022-06-27T17:31:44+00:00akpmakpm@linux-foundation.org2022-06-27T17:31:44+00:00urn:sha1:ee56c3e8eec166f4e4a2ca842b7804d14f3a0208kbuild: Ignore __this_module in gen_autoksyms.sh2022-06-25T21:15:05+00:00Sami Tolvanensamitolvanen@google.com2022-06-16T19:57:59+00:00urn:sha1:ff139766764675b9df12bcbc8928a02149b7ba95
Module object files can contain an undefined reference to __this_module,
which isn't resolved until we link the final .ko. The kernel doesn't
export this symbol, so ignore it in gen_autoksyms.sh.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Tested-by: Steve Muckle <smuckle@google.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Tested-by: Ramji Jiyani <ramjiyani@google.com>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net2022-06-23T19:33:24+00:00Jakub Kicinskikuba@kernel.org2022-06-23T19:33:24+00:00urn:sha1:93817be8b62c7fa1f1bdc3e8c037a73a60026be9
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
modpost: fix section mismatch check for exported init/exit sections2022-06-19T23:18:03+00:00Masahiro Yamadamasahiroy@kernel.org2022-06-10T18:32:30+00:00urn:sha1:28438794aba47a27e922857d27b31b74e8559143
Since commit f02e8a6596b7 ("module: Sort exported symbols"),
EXPORT_SYMBOL* is placed in the individual section ___ksymtab(_gpl)+<sym>
(3 leading underscores instead of 2).
Since then, modpost cannot detect the bad combination of EXPORT_SYMBOL
and __init/__exit.
Fix the .fromsec field.
Fixes: f02e8a6596b7 ("module: Sort exported symbols")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Merge tag 'objtool-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip2022-06-19T14:54:16+00:00Linus Torvaldstorvalds@linux-foundation.org2022-06-19T14:54:16+00:00urn:sha1:5d770f11a1623eef83894b60686fb328794ccd23
Pull build tooling updates from Thomas Gleixner:
- Remove obsolete CONFIG_X86_SMAP reference from objtool
- Fix overlapping text section failures in faddr2line for real
- Remove OBJECT_FILES_NON_STANDARD usage from x86 ftrace and replace it
with finegrained annotations so objtool can validate that code
correctly.
* tag 'objtool-urgent-2022-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ftrace: Remove OBJECT_FILES_NON_STANDARD usage
faddr2line: Fix overlapping text section failures, the sequel
objtool: Fix obsolete reference to CONFIG_X86_SMAP