diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2022-10-26 11:15:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2022-10-26 11:15:00 -0700 |
| commit | 98555239e4c3aab1810d84073166eef6d54eeb3d (patch) | |
| tree | bf9263e69fc1fedfe003a08a6d8542590bc9c228 /arch/arc/configs/axs103_smp_defconfig | |
| parent | Merge tag 'platform-drivers-x86-v6.1-2' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | ARC: mm: fix leakage of memory allocated for PTE (diff) | |
| download | linux-98555239e4c3aab1810d84073166eef6d54eeb3d.tar.gz linux-98555239e4c3aab1810d84073166eef6d54eeb3d.tar.bz2 linux-98555239e4c3aab1810d84073166eef6d54eeb3d.zip | |
Merge tag 'arc-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- fix for Page Table mem leak
- defconfig updates
- misc other fixes
* tag 'arc-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: mm: fix leakage of memory allocated for PTE
arc: update config files
arc: iounmap() arg is volatile
arc: dts: Harmonize EHCI/OHCI DT nodes name
ARC: bitops: Change __fls to return unsigned long
ARC: Fix comment typo
ARC: Fix comment typo
Diffstat (limited to 'arch/arc/configs/axs103_smp_defconfig')
| -rw-r--r-- | arch/arc/configs/axs103_smp_defconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arc/configs/axs103_smp_defconfig b/arch/arc/configs/axs103_smp_defconfig index fcbc952bc75b..2f336d99a8cf 100644 --- a/arch/arc/configs/axs103_smp_defconfig +++ b/arch/arc/configs/axs103_smp_defconfig @@ -35,9 +35,6 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y CONFIG_IP_PNP_RARP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_IPV6 is not set CONFIG_DEVTMPFS=y # CONFIG_STANDALONE is not set @@ -100,7 +97,6 @@ CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y -# CONFIG_ENABLE_MUST_CHECK is not set CONFIG_STRIP_ASM_SYMS=y CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10 |