diff options
author | Avi Kivity <avi@redhat.com> | 2012-08-05 06:25:10 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-08-05 06:25:10 -0400 |
commit | fe56097b23b1303b894eefd91582e4a64247d03f (patch) | |
tree | 4b3ab60eb19e8cfe2884e2da66dd4e4e25ae2274 /arch/powerpc/configs/ppc64_defconfig | |
parent | e115676e042f4d9268c6b6d8cb7dc962aa6cfd7d (diff) | |
parent | e7882d6c40874a5b5033ca85f7508a602a60b662 (diff) |
Merge remote-tracking branch 'upstream' into next
- bring back critical fixes (esp. aa67f6096c19bc)
- provide an updated base for development
* upstream: (4334 commits)
missed mnt_drop_write() in do_dentry_open()
UBIFS: nuke pdflush from comments
gfs2: nuke pdflush from comments
drbd: nuke pdflush from comments
nilfs2: nuke write_super from comments
hfs: nuke write_super from comments
vfs: nuke pdflush from comments
jbd/jbd2: nuke write_super from comments
btrfs: nuke pdflush from comments
btrfs: nuke write_super from comments
ext4: nuke pdflush from comments
ext4: nuke write_super from comments
ext3: nuke write_super from comments
Documentation: fix the VM knobs descritpion WRT pdflush
Documentation: get rid of write_super
vfs: kill write_super and sync_supers
ACPI processor: Fix tick_broadcast_mask online/offline regression
ACPI: Only count valid srat memory structures
ACPI: Untangle a return statement for better readability
Linux 3.6-rc1
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
-rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index f2fe0c2b41e..db27c82e054 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -279,7 +279,8 @@ CONFIG_HVC_RTAS=y | |||
279 | CONFIG_HVC_BEAT=y | 279 | CONFIG_HVC_BEAT=y |
280 | CONFIG_HVCS=m | 280 | CONFIG_HVCS=m |
281 | CONFIG_IBM_BSR=m | 281 | CONFIG_IBM_BSR=m |
282 | # CONFIG_HW_RANDOM is not set | 282 | CONFIG_HW_RANDOM=m |
283 | CONFIG_HW_RANDOM_PSERIES=m | ||
283 | CONFIG_RAW_DRIVER=y | 284 | CONFIG_RAW_DRIVER=y |
284 | CONFIG_I2C_CHARDEV=y | 285 | CONFIG_I2C_CHARDEV=y |
285 | CONFIG_I2C_AMD8111=y | 286 | CONFIG_I2C_AMD8111=y |
@@ -485,7 +486,8 @@ CONFIG_CRYPTO_TEA=m | |||
485 | CONFIG_CRYPTO_TWOFISH=m | 486 | CONFIG_CRYPTO_TWOFISH=m |
486 | CONFIG_CRYPTO_LZO=m | 487 | CONFIG_CRYPTO_LZO=m |
487 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | 488 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
488 | # CONFIG_CRYPTO_HW is not set | 489 | CONFIG_CRYPTO_HW=y |
490 | CONFIG_CRYPTO_DEV_NX=m | ||
489 | CONFIG_VIRTUALIZATION=y | 491 | CONFIG_VIRTUALIZATION=y |
490 | CONFIG_KVM_BOOK3S_64=m | 492 | CONFIG_KVM_BOOK3S_64=m |
491 | CONFIG_KVM_BOOK3S_64_HV=y | 493 | CONFIG_KVM_BOOK3S_64_HV=y |