Merge branch 'buster' into carnil/linux-carnil/4.19-stable-updates
Resolve the conflict in debian/changelog.
This commit is contained in:
commit
af539cd9db
|
@ -1225,6 +1225,9 @@ linux (4.19.97-1) UNRELEASED; urgency=medium
|
||||||
- ocfs2: call journal flush to mark journal as empty after journal
|
- ocfs2: call journal flush to mark journal as empty after journal
|
||||||
recovery when mount
|
recovery when mount
|
||||||
|
|
||||||
|
[ Joe Richey ]
|
||||||
|
* [cloud-amd64] tpm: Enable TPM drivers for Cloud (Closes: #946237)
|
||||||
|
|
||||||
[ Salvatore Bonaccorso ]
|
[ Salvatore Bonaccorso ]
|
||||||
* Refresh powerpc-fix-mcpu-options-for-spe-only-compiler.patch (Context
|
* Refresh powerpc-fix-mcpu-options-for-spe-only-compiler.patch (Context
|
||||||
changes in 4.19.88)
|
changes in 4.19.88)
|
||||||
|
|
|
@ -185,7 +185,19 @@ CONFIG_XEN_BLKDEV_FRONTEND=m
|
||||||
##
|
##
|
||||||
## file: drivers/char/tpm/Kconfig
|
## file: drivers/char/tpm/Kconfig
|
||||||
##
|
##
|
||||||
# CONFIG_TCG_TPM is not set
|
CONFIG_TCG_TPM=m
|
||||||
|
# CONFIG_HW_RANDOM_TPM is not set
|
||||||
|
CONFIG_TCG_TIS=m
|
||||||
|
# CONFIG_TCG_TIS_SPI is not set
|
||||||
|
# CONFIG_TCG_TIS_I2C_ATMEL is not set
|
||||||
|
# CONFIG_TCG_TIS_I2C_INFINEON is not set
|
||||||
|
# CONFIG_TCG_TIS_I2C_NUVOTON is not set
|
||||||
|
# CONFIG_TCG_NSC is not set
|
||||||
|
# CONFIG_TCG_ATMEL is not set
|
||||||
|
# CONFIG_TCG_INFINEON is not set
|
||||||
|
CONFIG_TCG_XEN=m
|
||||||
|
CONFIG_TCG_CRB=m
|
||||||
|
CONFIG_TCG_VTPM_PROXY=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/char/xillybus/Kconfig
|
## file: drivers/char/xillybus/Kconfig
|
||||||
|
|
Loading…
Reference in New Issue