diff options
| author | Boohbah | 2015-12-14 02:44:54 +0000 |
|---|---|---|
| committer | Boohbah | 2015-12-14 02:44:54 +0000 |
| commit | 72f710a79ed8b3f7ea4277676ddd2a6a74e88448 (patch) | |
| tree | 64ffd31f7e86a72664764b12b0f74071b2fc48ea /config.x86_64 | |
| parent | 78a56abcd8758cc761379a3a29180878dd20b424 (diff) | |
| download | aur-72f710a79ed8b3f7ea4277676ddd2a6a74e88448.tar.gz | |
4.4-rc5 and fix file conflict
Diffstat (limited to 'config.x86_64')
| -rw-r--r-- | config.x86_64 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config.x86_64 b/config.x86_64 index de93d73a5cf6..5017c2f4ab3d 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.0-rc3 Kernel Configuration +# Linux/x86 4.4.0-rc5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -51,7 +51,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-g31ade3b" +CONFIG_LOCALVERSION="-g9f9499a" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y @@ -314,7 +314,6 @@ CONFIG_MODULE_COMPRESS=y CONFIG_MODULE_COMPRESS_GZIP=y # CONFIG_MODULE_COMPRESS_XZ is not set CONFIG_MODULES_TREE_LOOKUP=y -CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y @@ -2062,6 +2061,7 @@ CONFIG_MEGARAID_SAS=m CONFIG_SCSI_MPT3SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m CONFIG_SCSI_UFSHCD_PLATFORM=m @@ -2407,6 +2407,8 @@ CONFIG_ATL1=m CONFIG_ATL1E=m CONFIG_ATL1C=m CONFIG_ALX=m +CONFIG_NET_VENDOR_AURORA=y +CONFIG_AURORA_NB8800=m CONFIG_NET_CADENCE=y CONFIG_MACB=m CONFIG_NET_VENDOR_BROADCOM=y @@ -5974,7 +5976,6 @@ CONFIG_UIO_PRUSS=m CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VFIO_VIRQFD=m CONFIG_VFIO=m -CONFIG_VFIO_NOIOMMU=y CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VFIO_PCI_MMAP=y |