Merge remote-tracking branch 'aosp/android13-5.15' into lf-5.15.y_android-12
Conflicts: include/linux/mm_types.h Change-Id: If943423c84689f43086b4babb6bc2505079eb160
No related branches found
No related tags found
Showing
- Documentation/devicetree/bindings/mmc/mtk-sd.yaml 12 additions, 0 deletionsDocumentation/devicetree/bindings/mmc/mtk-sd.yaml
- OWNERS 12 additions, 2 deletionsOWNERS
- android/abi_gki_aarch64.xml 21343 additions, 17917 deletionsandroid/abi_gki_aarch64.xml
- android/abi_gki_aarch64_exynos 220 additions, 0 deletionsandroid/abi_gki_aarch64_exynos
- android/abi_gki_aarch64_honor 19 additions, 0 deletionsandroid/abi_gki_aarch64_honor
- android/abi_gki_aarch64_mtk 1 addition, 0 deletionsandroid/abi_gki_aarch64_mtk
- android/abi_gki_aarch64_oplus 204 additions, 0 deletionsandroid/abi_gki_aarch64_oplus
- android/abi_gki_aarch64_qcom 12 additions, 1 deletionandroid/abi_gki_aarch64_qcom
- android/abi_gki_aarch64_unisoc 8 additions, 0 deletionsandroid/abi_gki_aarch64_unisoc
- android/abi_gki_aarch64_vivo 2689 additions, 0 deletionsandroid/abi_gki_aarch64_vivo
- android/gki_aarch64_fips140_modules 2 additions, 0 deletionsandroid/gki_aarch64_fips140_modules
- arch/arm64/configs/gki_defconfig 2 additions, 0 deletionsarch/arm64/configs/gki_defconfig
- arch/arm64/include/asm/esr.h 1 addition, 0 deletionsarch/arm64/include/asm/esr.h
- arch/arm64/kvm/arm.c 4 additions, 3 deletionsarch/arm64/kvm/arm.c
- arch/arm64/mm/fault.c 5 additions, 1 deletionarch/arm64/mm/fault.c
- arch/x86/configs/gki_defconfig 2 additions, 0 deletionsarch/x86/configs/gki_defconfig
- block/bfq-iosched.c 3 additions, 0 deletionsblock/bfq-iosched.c
- block/blk-mq-tag.h 2 additions, 0 deletionsblock/blk-mq-tag.h
- block/blk-mq.h 2 additions, 0 deletionsblock/blk-mq.h
- build.config.common 1 addition, 1 deletionbuild.config.common
Loading
Please register or sign in to comment