diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-04-11 09:08:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-04-11 09:11:53 +0200 |
| commit | c62f09151dfc7af6e0368b6d3712b2dcd1129cfb (patch) | |
| tree | 0c6fd8c60aa687262eb06a53e428e9deffd69e80 /init | |
| parent | 1d3b80670f543f532f0d8e588c71e5be6861441a (diff) | |
| parent | d8cf82b410b4be8a1266c10d05453128bd40d03a (diff) | |
| download | common-c62f09151dfc7af6e0368b6d3712b2dcd1129cfb.tar.gz | |
Merge 5.10.29 into android12-5.10
Changes in 5.10.29
ARM: dts: am33xx: add aliases for mmc interfaces
bus: ti-sysc: Fix warning on unbind if reset is not deasserted
platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
bpf, x86: Use kvmalloc_array instead kmalloc_array in bpf_jit_comp
net/mlx5e: Enforce minimum value check for ICOSQ size
net: pxa168_eth: Fix a potential data race in pxa168_eth_remove
kunit: tool: Fix a python tuple typing error
mISDN: fix crash in fritzpci
mac80211: Check crypto_aead_encrypt for errors
mac80211: choose first enabled channel for monitor
drm/msm/dsi_pll_7nm: Fix variable usage for pll_lockdet_rate
drm/msm/adreno: a5xx_power: Don't apply A540 lm_setup to other GPUs
drm/msm: Ratelimit invalid-fence message
netfilter: conntrack: Fix gre tunneling over ipv6
netfilter: nftables: skip hook overlap logic if flowtable is stale
net: ipa: fix init header command validation
platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
kselftest/arm64: sve: Do not use non-canonical FFR register value
drm/msm/disp/dpu1: icc path needs to be set before dpu runtime resume
x86/build: Turn off -fcf-protection for realmode targets
block: clear GD_NEED_PART_SCAN later in bdev_disk_changed
platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms
ptp_qoriq: fix overflow in ptp_qoriq_adjfine() u64 calcalation
scsi: target: pscsi: Clean up after failure in pscsi_map_sg()
selftests/vm: fix out-of-tree build
ia64: mca: allocate early mca with GFP_ATOMIC
ia64: fix format strings for err_inject
cifs: revalidate mapping when we open files for SMB1 POSIX
cifs: Silently ignore unknown oplock break handle
io_uring: fix timeout cancel return code
math: Export mul_u64_u64_div_u64
tools/resolve_btfids: Build libbpf and libsubcmd in separate directories
tools/resolve_btfids: Check objects before removing
tools/resolve_btfids: Set srctree variable unconditionally
kbuild: Add resolve_btfids clean to root clean target
kbuild: Do not clean resolve_btfids if the output does not exist
tools/resolve_btfids: Add /libbpf to .gitignore
bpf, x86: Validate computation of branch displacements for x86-64
bpf, x86: Validate computation of branch displacements for x86-32
init/Kconfig: make COMPILE_TEST depend on !S390
init/Kconfig: make COMPILE_TEST depend on HAS_IOMEM
Linux 5.10.29
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib3f9484150747de48eca46c69d690830b790418e
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 4d2e8885cbe9..cd402972fc2f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -114,8 +114,7 @@ config INIT_ENV_ARG_LIMIT config COMPILE_TEST bool "Compile also drivers which will not load" - depends on !UML - default n + depends on HAS_IOMEM help Some drivers can be compiled on a different platform than they are intended to be run on. Despite they cannot be loaded there (or even |