diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-05 21:46:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-05 21:46:24 +0300 |
| commit | 130951bbc61f59133ed04e244db25a63edc6935f (patch) | |
| tree | ba8eae8ba92f0d5c8c72a5da7562d8081b8540c9 /arch/s390/configs/defconfig | |
| parent | 97fcc07be81d4f49e1763483144ca7ff79fe0ad5 (diff) | |
| parent | ecd92e2167c30faa18df21e3ec3dbec510ddebaa (diff) | |
| download | linux-130951bbc61f59133ed04e244db25a63edc6935f.tar.xz | |
Merge tag 's390-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Heiko Carstens:
- fix zstd build for -march=z900 (undefined reference to __clzdi2)
- add missing .got.plts to vdso linker scripts to fix kpatch build
errors
- update defconfigs
* tag 's390-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: update defconfigs
s390/boot: fix zstd build for -march=z900
s390/vdso: add .got.plt in vdso linker script
Diffstat (limited to 'arch/s390/configs/defconfig')
| -rw-r--r-- | arch/s390/configs/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index b671642967ba..1667a3cdcf0a 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -325,7 +325,7 @@ CONFIG_L2TP_DEBUGFS=m CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m -CONFIG_BRIDGE=m +CONFIG_BRIDGE=y CONFIG_BRIDGE_MRP=y CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y |