diff --git a/.gitignore b/.gitignore index 3b8b9b33be3..3e200368faf 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,8 @@ extra_certificates signing_key.priv signing_key.x509 x509.genkey + +# Xodia +fips_fmp_utils +security/selinux/av_permissions.h +security/selinux/flask.h diff --git a/arch/arm64/configs/lineage_zerofltexx_defconfig b/arch/arm64/configs/lineage_zerofltexx_defconfig index 8e088d523d5..ee5cc047cae 100644 --- a/arch/arm64/configs/lineage_zerofltexx_defconfig +++ b/arch/arm64/configs/lineage_zerofltexx_defconfig @@ -36,19 +36,17 @@ CONFIG_GENERIC_BUG=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y -CONFIG_STATE_NOTIFIER=y # # General setup # CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" -CONFIG_LOCALVERSION="-Xodia" +CONFIG_LOCALVERSION="-Xodia-flte" CONFIG_LOCALVERSION_AUTO=y CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_SYSVIPC is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_FHANDLE is not set CONFIG_AUDIT=y @@ -105,13 +103,17 @@ CONFIG_RCU_FANOUT_LEAF=16 CONFIG_LOG_BUF_SHIFT=19 CONFIG_GENERIC_SCHED_CLOCK=y CONFIG_CGROUPS=y -# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y # CONFIG_CGROUP_DEVICE is not set # CONFIG_CPUSETS is not set CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y -# CONFIG_MEMCG is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_SWAP_ENABLED=y +CONFIG_MEMCG_FORCE_USE_VM_SWAPPINESS=y +# CONFIG_MEMCG_KMEM is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y @@ -121,7 +123,6 @@ CONFIG_RT_GROUP_SCHED=y # CONFIG_CHECKPOINT_RESTORE is not set CONFIG_NAMESPACES=y CONFIG_UTS_NS=y -CONFIG_IPC_NS=y # CONFIG_USER_NS is not set CONFIG_PID_NS=y CONFIG_NET_NS=y @@ -177,8 +178,8 @@ CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_DEFERRED_INITCALLS=y -# CONFIG_PROFILING is not set -# CONFIG_TRACEPOINTS is not set +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y # CONFIG_JUMP_LABEL is not set CONFIG_HAVE_64BIT_ALIGNED_ACCESS=y CONFIG_HAVE_ARCH_TRACEHOOK=y @@ -216,7 +217,7 @@ CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set # CONFIG_MODULE_SIG is not set CONFIG_STOP_MACHINE=y @@ -254,12 +255,12 @@ CONFIG_BLOCK_SUPPORT_STLOG=y # # IO Schedulers # -CONFIG_IOSCHED_CFQ=y -CONFIG_IOSCHED_ROW=y -CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_NOOP=y -CONFIG_DEFAULT_ROW=y -CONFIG_DEFAULT_IOSCHED="row" +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_UNINLINE_SPIN_UNLOCK=y CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y @@ -333,10 +334,8 @@ CONFIG_EXYNOS_SPI_RESET_DURING_DSTOP=y # CONFIG_MSM_SYSMON_COMM is not set # CONFIG_TIMA is not set # CONFIG_TIMA_LKMAUTH is not set -# CONFIG_TIMA_RKP is not set +# CONFIG_TIMA_LKM_BLOCK is not set # CONFIG_RKP_KDP is not set -# CONFIG_RKP_DMAP_PROT is not set -# CONFIG_RKP_NS_PROT is not set # CONFIG_SEC_BAT_AUT is not set # @@ -394,11 +393,7 @@ CONFIG_SWP_EMULATE=y CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y CONFIG_ARCH_NR_GPIO=1024 -CONFIG_HZ=300 -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_300=y -# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y @@ -451,16 +446,12 @@ CONFIG_ARMV7_COMPAT=y CONFIG_ARMV7_COMPAT_CPUINFO=y CONFIG_SECCOMP=y # CONFIG_CC_STACKPROTECTOR is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y # # Boot options # CONFIG_CMDLINE="" -CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y -CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES="exynos7420-zeroflte_eur_open_00 exynos7420-zeroflte_eur_open_01 exynos7420-zeroflte_eur_open_02 exynos7420-zeroflte_eur_open_03 exynos7420-zeroflte_eur_open_04 exynos7420-zeroflte_eur_open_05 exynos7420-zeroflte_eur_open_06 exynos7420-zeroflte_eur_open_07" -CONFIG_ARM64_APPENDED_DTB=y +# CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE is not set # # Userspace binary formats @@ -473,12 +464,12 @@ CONFIG_BINFMT_SCRIPT=y # CONFIG_BINFMT_MISC is not set CONFIG_COREDUMP=y CONFIG_COMPAT=y -CONFIG_SYSVIPC_COMPAT=y CONFIG_KEYS_COMPAT=y # # Power management options # +CONFIG_BOEFFLA_WL_BLOCKER=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y CONFIG_HAS_WAKELOCK=y @@ -501,7 +492,7 @@ CONFIG_ARCH_HAS_OPP=y CONFIG_PM_OPP=y CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y -CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_PM_GENERIC_DOMAINS_SLEEP=y CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y CONFIG_CPU_PM=y @@ -515,30 +506,19 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=y # CONFIG_CPU_FREQ_STAT_DETAILS is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_NEXUS=y -# CONFIG_CPU_FREQ_GOV_BIOSHOCK it not set -CONFIG_CPU_FREQ_GOV_BLU_ACTIVE=y -CONFIG_CPU_FREQ_GOV_CAFACTIVE=y -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -# CONFIG_CPU_FREQ_GOV_DANCEDANCE it not set -# CONFIG_CPU_FREQ_GOV_ELECTRODEMAND it not set -# CONFIG_CPU_FREQ_GOV_HYPER it not set -CONFIG_CPU_FREQ_GOV_IMPULSE=y -# CONFIG_CPU_FREQ_GOV_INTELLIDEMAND it not set -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_CPU_FREQ_GOV_NEXUS=y -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_GOV_ONDEMAND_X it not set -# CONFIG_CPU_FREQ_GOV_PEGASUSQ it not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_RELAXED=y -# CONFIG_CPU_FREQ_GOV_SMARTASS2 it not set -# CONFIG_CPU_FREQ_GOV_SMARTMAX it not set -# CONFIG_CPU_FREQ_GOV_SMARTMAX_EPS it not set +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set CONFIG_CPU_FREQ_GOV_USERSPACE=y -# CONFIG_CPU_FREQ_GOV_WHEATLEY it not set +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_INTERACTIVE=y CONFIG_MODE_AUTO_CHANGE=y +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set # CONFIG_GENERIC_CPUFREQ_CPU0 is not set # @@ -628,7 +608,7 @@ CONFIG_NET_IP_TUNNEL=y # CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set -CONFIG_NET_IPVTI=y +# CONFIG_NET_IPVTI is not set CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y @@ -640,22 +620,24 @@ CONFIG_INET_XFRM_MODE_BEET=y # CONFIG_INET_LRO is not set CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y -CONFIG_INET_UDP_DIAG=y +# CONFIG_INET_UDP_DIAG is not set CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=y CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_HSTCP=y -CONFIG_TCP_CONG_HTCP=y -CONFIG_TCP_CONG_HYBLA=y -CONFIG_TCP_CONG_ILLINOIS=y -CONFIG_TCP_CONG_LP=y -CONFIG_TCP_CONG_SCALABLE=y -CONFIG_TCP_CONG_WESTWOOD=y -CONFIG_TCP_CONG_VEGAS=y -CONFIG_TCP_CONG_VENO=y -CONFIG_TCP_CONG_YEAH=y -CONFIG_DEFAULT_WESTWOOD=y -CONFIG_DEFAULT_TCP_CONG="westwood" +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +CONFIG_DEFAULT_BIC=y +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="bic" # CONFIG_TCP_MD5SIG is not set # CONFIG_SEC_LOCALE_CHN is not set CONFIG_IPV6=y @@ -834,7 +816,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_ECN=y -CONFIG_IP_NF_MATCH_RPFILTER=y +# CONFIG_IP_NF_MATCH_RPFILTER is not set CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y @@ -850,7 +832,7 @@ CONFIG_NF_NAT_H323=y CONFIG_IP_NF_MANGLE=y # CONFIG_IP_NF_TARGET_CLUSTERIP is not set # CONFIG_IP_NF_TARGET_ECN is not set -CONFIG_IP_NF_TARGET_TTL=y +# CONFIG_IP_NF_TARGET_TTL is not set CONFIG_IP_NF_RAW=y CONFIG_IP_NF_SECURITY=y CONFIG_IP_NF_ARPTABLES=y @@ -870,7 +852,7 @@ CONFIG_IP6_NF_IPTABLES=y # CONFIG_IP6_NF_MATCH_HL is not set # CONFIG_IP6_NF_MATCH_IPV6HEADER is not set # CONFIG_IP6_NF_MATCH_MH is not set -CONFIG_IP6_NF_MATCH_RPFILTER=y +# CONFIG_IP6_NF_MATCH_RPFILTER is not set # CONFIG_IP6_NF_MATCH_RT is not set # CONFIG_IP6_NF_TARGET_HL is not set CONFIG_IP6_NF_FILTER=y @@ -968,6 +950,7 @@ CONFIG_NET_SCH_FIFO=y # CONFIG_VSOCKETS is not set # CONFIG_NETLINK_MMAP is not set # CONFIG_NETLINK_DIAG is not set +# CONFIG_KNOX_NCM is not set # CONFIG_RMNET_DATA is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y @@ -1183,7 +1166,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_UID_CPUTIME=y CONFIG_CHECK_SIMSLOT_COUNT=y # CONFIG_CHECK_GPIO_DETECT is not set -# CONFIG_TIMA_LOG is not set +CONFIG_TIMA_LOG=y # CONFIG_SEC_FPGA_ICE40XX is not set # CONFIG_C2PORT is not set @@ -1391,7 +1374,7 @@ CONFIG_DM_CRYPT=y # CONFIG_DM_DELAY is not set # CONFIG_DM_UEVENT is not set # CONFIG_DM_FLAKEY is not set -CONFIG_DM_VERITY=y +# CONFIG_DM_VERITY is not set # CONFIG_TARGET_CORE is not set # CONFIG_FUSION is not set @@ -1677,9 +1660,9 @@ CONFIG_BCMDHD_PREALLOC_MEMDUMP=y # CONFIG_WLAN_HERO is not set # CONFIG_WLAN_HERO2 is not set # CONFIG_WLAN_GRACE is not set +CONFIG_SPLIT_ARGOS_SET=y # CONFIG_BCM4358_A3 is not set # CONFIG_BCMDHD_DEBUG_PAGEALLOC is not set -CONFIG_SPLIT_ARGOS_SET=y # CONFIG_BCM43454 is not set # CONFIG_BRCMFMAC is not set # CONFIG_HOSTAP is not set @@ -1759,10 +1742,7 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_KEYBOARD_CYPRESS_TOUCH_20075 is not set CONFIG_KEYBOARD_CYPRESS_TOUCH_MBR31X5=y # CONFIG_INPUT_MOUSE is not set -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_XPAD=y -CONFIG_JOYSTICK_XPAD_FF=y -CONFIG_JOYSTICK_XPAD_LEDS=y +# CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ADS7846 is not set @@ -1813,8 +1793,6 @@ CONFIG_TOUCHSCREEN_FTS=y # CONFIG_TOUCHSCREEN_MELFAS_MMS449 is not set # CONFIG_TOUCHSCREEN_MELFAS_MMS458 is not set # CONFIG_TOUCHSCREEN_MELFAS_MMS492 is not set -CONFIG_TOUCHSCREEN_DOUBLETAP2WAKE=y -CONFIG_TOUCHSCREEN_PREVENT_SLEEP=y # CONFIG_DUAL_TSP is not set # CONFIG_INPUT_WACOM is not set # CONFIG_EPEN_WACOM_G5SP is not set @@ -2654,26 +2632,53 @@ CONFIG_VGA_ARB_MAX_GPUS=16 # ARM GPU Configuration # # CONFIG_MALI_T6XX is not set +# CONFIG_MALI_GATOR_SUPPORT is not set +# CONFIG_MALI_T6XX_DVFS is not set +# CONFIG_MALI_T6XX_RT_PM is not set +# CONFIG_MALI_T6XX_ENABLE_TRACE is not set CONFIG_MALI_EXYNOS_TRACE=y +# CONFIG_MALI_T6XX_DEBUG_SYS is not set +CONFIG_MALI_EXPERT=y +# CONFIG_MALI_PLATFORM_FAKE is not set CONFIG_MALI_PLATFORM_THIRDPARTY=y -# CONFIG_MALI_MIDGARD is not set +CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="exynos" +# CONFIG_MALI_DEBUG is not set +# CONFIG_MALI_NO_MALI is not set +# CONFIG_MALI_TRACE_TIMELINE is not set +# CONFIG_MALI_SYSTEM_TRACE is not set +# CONFIG_MALI_GPU_TRACEPOINTS is not set +CONFIG_MALI_MIDGARD=y +# CONFIG_DYNIMIC_ABB is not set # CONFIG_MALI_MIDGARD_WK04 is not set CONFIG_MALI_DVFS=y CONFIG_DDK_VERSION_OS="n" CONFIG_MALI_T7XX=y # CONFIG_MALI_R7P0 is not set +# CONFIG_MALI_R12P0 is not set CONFIG_MALI_R15P0=y +# CONFIG_MALI_R22P0 is not set CONFIG_MALI_SYSTRACE_SUPPORT=y CONFIG_MALI_RT_PM=y +# CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set CONFIG_MALI_DEBUG_SYS=y +# CONFIG_MALI_DEVFREQ is not set CONFIG_MALI_SEC_HWCNT=y -CONFIG_EXYNOS_SOC_NAME="" +CONFIG_EXYNOS_SOC_NAME="7420" +# CONFIG_MALI_DMA_FENCE is not set +# CONFIG_MALI_PRFCNT_SET_SECONDARY is not set +# CONFIG_MALI_MIDGARD_DVFS is not set +# CONFIG_MALI_CORESTACK is not set +CONFIG_MALI_FENCE_DEBUG=y CONFIG_MALI_SEC_CL_BOOST=y CONFIG_MALI_SEC_UTILIZATION=y CONFIG_MALI_PM_QOS=y # CONFIG_MALI_BTS_OPTIMIZATION is not set CONFIG_MALI_DEBUG_KERNEL_SYSFS=y CONFIG_MALI_EXYNOS_SECURE_RENDERING=y +# CONFIG_MALI_JOB_DUMPING is not set +# CONFIG_MALI_2MB_ALLOC is not set +# CONFIG_MALI_PWRSOFT_765 is not set +CONFIG_MALI_SEC_JOB_STATUS_CHECK=y # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y @@ -2764,7 +2769,7 @@ CONFIG_LCD_HMT=y CONFIG_LCD_BURNIN_CORRECTION=y CONFIG_LCD_HBM_INTERPOLATION=y CONFIG_PANEL_AID_DIMMING=y -CONFIG_LCD_DOZE_MODE=y +# CONFIG_LCD_DOZE_MODE is not set # CONFIG_PANEL_S6E3HF2_DYNAMIC is not set CONFIG_PANEL_S6E3HA2_DYNAMIC=y # CONFIG_PANEL_S6E3HA3_DYNAMIC is not set @@ -3108,7 +3113,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # CONFIG_USB_DEFAULT_PERSIST=y # CONFIG_USB_DYNAMIC_MINORS is not set -CONFIG_USB_OTG=y +# CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set # CONFIG_USB_MON is not set @@ -3669,7 +3674,6 @@ CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ASHMEM=y -CONFIG_ANDROID_LOGGER=y CONFIG_ANDROID_TIMED_OUTPUT=y # CONFIG_ANDROID_TIMED_GPIO is not set CONFIG_ANDROID_LOW_MEMORY_KILLER=y @@ -3708,13 +3712,13 @@ CONFIG_SEC_DEBUG=y # # BSP Feature # -# CONFIG_SEC_BSP is not set +CONFIG_SEC_BSP=y # # Samsung TN logging feature # -# CONFIG_SEC_AVC_LOG is not set -# CONFIG_SEC_DEBUG_TSP_LOG is not set +CONFIG_SEC_AVC_LOG=y +CONFIG_SEC_DEBUG_TSP_LOG=y CONFIG_SEC_DEBUG_LAST_KMSG=y # CONFIG_SEC_DEBUG_TIMA_LOG is not set # CONFIG_SEC_DEBUG_MDM_SEPERATE_CRASH is not set @@ -3724,8 +3728,8 @@ CONFIG_SEC_DEBUG_LAST_KMSG=y # Samsung TN Power Management Options # CONFIG_SEC_PM=y -# CONFIG_SEC_PM_DEBUG is not set -# CONFIG_USER_RESET_DEBUG is not set +CONFIG_SEC_PM_DEBUG=y +CONFIG_USER_RESET_DEBUG=y # # PARAM Feature @@ -3735,6 +3739,7 @@ CONFIG_VNSWAP=y CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y +CONFIG_STATE_NOTIFIER=y # # Common Clock Framework @@ -4088,23 +4093,16 @@ CONFIG_EXYNOS_CHIPID=y # # File systems # -CONFIG_INTERRUPTIBLE_SYNC=y -CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -# CONFIG_EXT2_FS_POSIX_ACL is not set -CONFIG_EXT2_FS_SECURITY=y -# CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -CONFIG_EXT3_DEFAULTS_TO_ORDERED=y -CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_INTERRUPTIBLE_SYNC is not set +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT23=y # CONFIG_EXT4_FS_POSIX_ACL is not set CONFIG_EXT4_FS_SECURITY=y # CONFIG_EXT4_DEBUG is not set CONFIG_SDCARD_FS=y -# CONFIG_SDCARD_FS_FADV_NOACTIVE is not set +CONFIG_SDCARD_FS_CI_SEARCH=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_JBD2=y @@ -4137,10 +4135,8 @@ CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y -CONFIG_UDF_FS=y -CONFIG_JOLIET=y -CONFIG_UDF_NLS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems @@ -4167,11 +4163,13 @@ CONFIG_SDFAT_DEBUG=y # CONFIG_SDFAT_DBG_IOCTL is not set CONFIG_SDFAT_DBG_MSG=y # CONFIG_SDFAT_DBG_BUGON is not set +CONFIG_SDFAT_STATISTICS=y CONFIG_EXFAT_FS=y CONFIG_EXFAT_VIRTUAL_XATTR=y CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:sdcard_external:s0" CONFIG_EXFAT_SUPPORT_STLOG=y -CONFIG_NTFS_FS=y +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_RW=y # @@ -4196,12 +4194,12 @@ CONFIG_ECRYPT_FS=y # CONFIG_ECRYPT_FS_MESSAGING is not set CONFIG_WTL_ENCRYPTION_FILTER=y CONFIG_ECRYPT_FS_VIRTUAL_FAT_XATTR=y -# CONFIG_SDP is not set +CONFIG_SDP=y # CONFIG_SDP_KEY_DUMP is not set -# CONFIG_DLP is not set -# CONFIG_SCFS is not set +CONFIG_DLP=y +CONFIG_SCFS=y # CONFIG_SYSTEM_COMPRESSED is not set -# CONFIG_SCFS_LOWER_PAGECACHE_INVALIDATION is not set +CONFIG_SCFS_LOWER_PAGECACHE_INVALIDATION=y # CONFIG_SCFS_USE_CRYPTO is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set @@ -4223,13 +4221,21 @@ CONFIG_PSTORE=y CONFIG_PSTORE_PMSG=y CONFIG_PSTORE_RAM=y # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -# CONFIG_F2FS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FS_ENCRYPTION is not set CONFIG_NETWORK_FILESYSTEMS=y # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set # CONFIG_CEPH_FS is not set -CONFIG_CIFS=y +# CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -4305,10 +4311,19 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set -# CONFIG_LOCKUP_DETECTOR is not set +CONFIG_LOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR_OTHER_CPU=y +CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y +CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 -# CONFIG_DETECT_HUNG_TASK is not set +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 CONFIG_SCHED_DEBUG=y # CONFIG_SCHEDSTATS is not set # CONFIG_TIMER_STATS is not set @@ -4430,6 +4445,8 @@ CONFIG_SECURITY_NETWORK=y # CONFIG_SECURITY_PATH is not set CONFIG_LSM_MMAP_MIN_ADDR=4096 CONFIG_SECURITY_SELINUX=y +# CONFIG_SECURITY_SELINUX_ALWAYS_ENFORCE is not set +CONFIG_SECURITY_SELINUX_NEVER_ENFORCE=y CONFIG_SECURITY_SELINUX_BOOTPARAM=y CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 # CONFIG_SECURITY_SELINUX_DISABLE is not set @@ -4437,11 +4454,6 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y CONFIG_SECURITY_SELINUX_AVC_STATS=y CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -# CONFIG_SECURITY_SELINUX_DEFAULT_ENFORCE is not set -# CONFIG_SECURITY_SELINUX_ALWAYS_ENFORCE is not set -CONFIG_SECURITY_SELINUX_DEFAULT_PERMISSIVE=y -CONFIG_SECURITY_SELINUX_ALWAYS_PERMISSIVE=y -# CONFIG_SECURITY_SELINUX_PRETEND_ENFORCE is not set # CONFIG_SECURITY_SMACK is not set # CONFIG_SECURITY_TOMOYO is not set # CONFIG_SECURITY_APPARMOR is not set @@ -4450,8 +4462,7 @@ CONFIG_MST_LDO=y # CONFIG_IMA is not set # CONFIG_EVM is not set # CONFIG_TZ_ICCC_MOS_SUPPORT is not set -CONFIG_TZ_ICCC_NOS_SUPPORT=y -CONFIG_TZ_ICCC=y +# CONFIG_TZ_ICCC_NOS_SUPPORT is not set CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY="selinux" @@ -4637,4 +4648,3 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y # CONFIG_CORDIC is not set # CONFIG_DDR is not set # CONFIG_QMI_ENCDEC is not set - diff --git a/drivers/video/exynos/decon/Kconfig b/drivers/video/exynos/decon/Kconfig old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/Makefile b/drivers/video/exynos/decon/Makefile old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/cec.h b/drivers/video/exynos/decon/cec.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon-ext_drv.c b/drivers/video/exynos/decon/decon-ext_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon-int_drv.c b/drivers/video/exynos/decon/decon-int_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon-mdnie_table_dmb.h b/drivers/video/exynos/decon/decon-mdnie_table_dmb.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon-mdnie_table_zero.h b/drivers/video/exynos/decon/decon-mdnie_table_zero.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon.h b/drivers/video/exynos/decon/decon.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_common.h b/drivers/video/exynos/decon/decon_common.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_core.c b/drivers/video/exynos/decon/decon_core.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_helper.c b/drivers/video/exynos/decon/decon_helper.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_helper.h b/drivers/video/exynos/decon/decon_helper.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_mdnie.c b/drivers/video/exynos/decon/decon_mdnie.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_reg_7420.c b/drivers/video/exynos/decon/decon_reg_7420.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/decon_reg_7580.c b/drivers/video/exynos/decon/decon_reg_7580.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/dsim.h b/drivers/video/exynos/decon/dsim.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/dsim_common.h b/drivers/video/exynos/decon/dsim_common.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/dsim_drv.c b/drivers/video/exynos/decon/dsim_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/dsim_reg_7420.c b/drivers/video/exynos/decon/dsim_reg_7420.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdcp_drv.c b/drivers/video/exynos/decon/hdcp_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmi.h b/drivers/video/exynos/decon/hdmi.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmi_cec.c b/drivers/video/exynos/decon/hdmi_cec.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmi_cec_ctrl.c b/drivers/video/exynos/decon/hdmi_cec_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmi_drv.c b/drivers/video/exynos/decon/hdmi_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmi_edid.c b/drivers/video/exynos/decon/hdmi_edid.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmi_reg.c b/drivers/video/exynos/decon/hdmi_reg.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/hdmiphy_conf.c b/drivers/video/exynos/decon/hdmiphy_conf.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/mdnie_reg.h b/drivers/video/exynos/decon/mdnie_reg.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/mdnie_reg_7420.c b/drivers/video/exynos/decon/mdnie_reg_7420.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/Kconfig b/drivers/video/exynos/decon/panels/Kconfig old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/Makefile b/drivers/video/exynos/decon/panels/Makefile old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/aid_dimming.h b/drivers/video/exynos/decon/panels/aid_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/decon_lcd.h b/drivers/video/exynos/decon/panels/decon_lcd.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dimming_core.c b/drivers/video/exynos/decon/panels/dimming_core.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dimming_core.h b/drivers/video/exynos/decon/panels/dimming_core.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dsim_backlight.c b/drivers/video/exynos/decon/panels/dsim_backlight.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dsim_backlight.h b/drivers/video/exynos/decon/panels/dsim_backlight.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dsim_backlight_dynamic.c b/drivers/video/exynos/decon/panels/dsim_backlight_dynamic.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dsim_backlight_s6e3fa3_a8xe.c b/drivers/video/exynos/decon/panels/dsim_backlight_s6e3fa3_a8xe.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dsim_panel.c b/drivers/video/exynos/decon/panels/dsim_panel.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/dsim_panel.h b/drivers/video/exynos/decon/panels/dsim_panel.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/lcd_sysfs.c b/drivers/video/exynos/decon/panels/lcd_sysfs.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/mdnie.h b/drivers/video/exynos/decon/panels/mdnie.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/mdnie_lite.c b/drivers/video/exynos/decon/panels/mdnie_lite.c old mode 100644 new mode 100755 index bba1a6dbf40..70de4bfe255 --- a/drivers/video/exynos/decon/panels/mdnie_lite.c +++ b/drivers/video/exynos/decon/panels/mdnie_lite.c @@ -469,8 +469,6 @@ static ssize_t sensorRGB_store(struct device *dev, return ret; if (mdnie->enable) { - dev_info(dev, "%s: %d, %d, %d\n", __func__, white_r, white_g, white_b); - table = mdnie_find_table(mdnie); memcpy(&mdnie->table_buffer, table, sizeof(struct mdnie_table)); diff --git a/drivers/video/exynos/decon/panels/mdnie_lite_table_a8xe.h b/drivers/video/exynos/decon/panels/mdnie_lite_table_a8xe.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/mdnie_lite_table_noble.h b/drivers/video/exynos/decon/panels/mdnie_lite_table_noble.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/mdnie_lite_table_zen.h b/drivers/video/exynos/decon/panels/mdnie_lite_table_zen.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/mdnie_lite_table_zero.h b/drivers/video/exynos/decon/panels/mdnie_lite_table_zero.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/mdnie_lite_table_zerof.h b/drivers/video/exynos/decon/panels/mdnie_lite_table_zerof.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/panel_info.h b/drivers/video/exynos/decon/panels/panel_info.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_aid_dimming.h b/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_aid_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_dimming.h b/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_lcd_ctrl.c b/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_lcd_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_param.h b/drivers/video/exynos/decon/panels/s6e3fa3_a8xe_param.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha2_s6e3ha0_wqhd_lcd_ctrl.c b/drivers/video/exynos/decon/panels/s6e3ha2_s6e3ha0_wqhd_lcd_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha2_s6e3ha0_wqhd_param.h b/drivers/video/exynos/decon/panels/s6e3ha2_s6e3ha0_wqhd_param.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha2_wqhd_aid_dimming.h b/drivers/video/exynos/decon/panels/s6e3ha2_wqhd_aid_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha2_wqhd_dimming.h b/drivers/video/exynos/decon/panels/s6e3ha2_wqhd_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha3_s6e3ha2_wqhd_lcd_ctrl.c b/drivers/video/exynos/decon/panels/s6e3ha3_s6e3ha2_wqhd_lcd_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha3_s6e3ha2_wqhd_param.h b/drivers/video/exynos/decon/panels/s6e3ha3_s6e3ha2_wqhd_param.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha3_wqhd_aid_dimming.h b/drivers/video/exynos/decon/panels/s6e3ha3_wqhd_aid_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3ha3_wqhd_dimming.h b/drivers/video/exynos/decon/panels/s6e3ha3_wqhd_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_aid_dimming.h b/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_aid_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_dimming.h b/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_lcd_ctrl.c b/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_lcd_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_param.h b/drivers/video/exynos/decon/panels/s6e3hf2_wqhd_param.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/regs-cec.h b/drivers/video/exynos/decon/regs-cec.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/regs-decon.h b/drivers/video/exynos/decon/regs-decon.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/regs-dsim.h b/drivers/video/exynos/decon/regs-dsim.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/regs-hdmi.h b/drivers/video/exynos/decon/regs-hdmi.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/Kconfig b/drivers/video/exynos/decon/vpp/Kconfig old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/Makefile b/drivers/video/exynos/decon/vpp/Makefile old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/regs-vpp.h b/drivers/video/exynos/decon/vpp/regs-vpp.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/vpp_coef.c b/drivers/video/exynos/decon/vpp/vpp_coef.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/vpp_core.h b/drivers/video/exynos/decon/vpp/vpp_core.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/vpp_drv.c b/drivers/video/exynos/decon/vpp/vpp_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon/vpp/vpp_regs.c b/drivers/video/exynos/decon/vpp/vpp_regs.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/Kconfig b/drivers/video/exynos/decon_dual_dsi/Kconfig old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/Makefile b/drivers/video/exynos/decon_dual_dsi/Makefile old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/cec.h b/drivers/video/exynos/decon_dual_dsi/cec.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon-ext_drv.c b/drivers/video/exynos/decon_dual_dsi/decon-ext_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon-int_drv.c b/drivers/video/exynos/decon_dual_dsi/decon-int_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon-mdnie_table_dmb.h b/drivers/video/exynos/decon_dual_dsi/decon-mdnie_table_dmb.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon-mdnie_table_zero.h b/drivers/video/exynos/decon_dual_dsi/decon-mdnie_table_zero.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon.h b/drivers/video/exynos/decon_dual_dsi/decon.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_common.h b/drivers/video/exynos/decon_dual_dsi/decon_common.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_core.c b/drivers/video/exynos/decon_dual_dsi/decon_core.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_helper.c b/drivers/video/exynos/decon_dual_dsi/decon_helper.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_helper.h b/drivers/video/exynos/decon_dual_dsi/decon_helper.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_mdnie.c b/drivers/video/exynos/decon_dual_dsi/decon_mdnie.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_reg_7420.c b/drivers/video/exynos/decon_dual_dsi/decon_reg_7420.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/decon_reg_7580.c b/drivers/video/exynos/decon_dual_dsi/decon_reg_7580.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/dsim.h b/drivers/video/exynos/decon_dual_dsi/dsim.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/dsim_common.h b/drivers/video/exynos/decon_dual_dsi/dsim_common.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/dsim_drv.c b/drivers/video/exynos/decon_dual_dsi/dsim_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/dsim_reg_7420.c b/drivers/video/exynos/decon_dual_dsi/dsim_reg_7420.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdcp_drv.c b/drivers/video/exynos/decon_dual_dsi/hdcp_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmi.h b/drivers/video/exynos/decon_dual_dsi/hdmi.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmi_cec.c b/drivers/video/exynos/decon_dual_dsi/hdmi_cec.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmi_cec_ctrl.c b/drivers/video/exynos/decon_dual_dsi/hdmi_cec_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmi_drv.c b/drivers/video/exynos/decon_dual_dsi/hdmi_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmi_edid.c b/drivers/video/exynos/decon_dual_dsi/hdmi_edid.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmi_reg.c b/drivers/video/exynos/decon_dual_dsi/hdmi_reg.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/hdmiphy_conf.c b/drivers/video/exynos/decon_dual_dsi/hdmiphy_conf.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/mdnie_reg.h b/drivers/video/exynos/decon_dual_dsi/mdnie_reg.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/mdnie_reg_7420.c b/drivers/video/exynos/decon_dual_dsi/mdnie_reg_7420.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/Kconfig b/drivers/video/exynos/decon_dual_dsi/panels/Kconfig old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/Makefile b/drivers/video/exynos/decon_dual_dsi/panels/Makefile old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/decon_lcd.h b/drivers/video/exynos/decon_dual_dsi/panels/decon_lcd.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/dsim_panel.c b/drivers/video/exynos/decon_dual_dsi/panels/dsim_panel.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/dsim_panel.h b/drivers/video/exynos/decon_dual_dsi/panels/dsim_panel.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/lcd_ctrl.h b/drivers/video/exynos/decon_dual_dsi/panels/lcd_ctrl.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/lcd_sysfs.c b/drivers/video/exynos/decon_dual_dsi/panels/lcd_sysfs.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/mdnie.h b/drivers/video/exynos/decon_dual_dsi/panels/mdnie.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/mdnie_lite.c b/drivers/video/exynos/decon_dual_dsi/panels/mdnie_lite.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/mdnie_lite_table_v.h b/drivers/video/exynos/decon_dual_dsi/panels/mdnie_lite_table_v.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/oled_backlight.c b/drivers/video/exynos/decon_dual_dsi/panels/oled_backlight.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/oled_backlight.h b/drivers/video/exynos/decon_dual_dsi/panels/oled_backlight.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/panel_info.h b/drivers/video/exynos/decon_dual_dsi/panels/panel_info.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_aid_basic_info.h b/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_aid_basic_info.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_aid_dimming.h b/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_aid_dimming.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_fhd_lcd_ctrl.c b/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_fhd_lcd_ctrl.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_fhd_param.h b/drivers/video/exynos/decon_dual_dsi/panels/s6e3fa3_fhd_param.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/smart_dimming_core.c b/drivers/video/exynos/decon_dual_dsi/panels/smart_dimming_core.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/panels/smart_dimming_core.h b/drivers/video/exynos/decon_dual_dsi/panels/smart_dimming_core.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/regs-cec.h b/drivers/video/exynos/decon_dual_dsi/regs-cec.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/regs-decon.h b/drivers/video/exynos/decon_dual_dsi/regs-decon.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/regs-dsim.h b/drivers/video/exynos/decon_dual_dsi/regs-dsim.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/regs-hdmi.h b/drivers/video/exynos/decon_dual_dsi/regs-hdmi.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/Kconfig b/drivers/video/exynos/decon_dual_dsi/vpp/Kconfig old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/Makefile b/drivers/video/exynos/decon_dual_dsi/vpp/Makefile old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/regs-vpp.h b/drivers/video/exynos/decon_dual_dsi/vpp/regs-vpp.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/vpp_coef.c b/drivers/video/exynos/decon_dual_dsi/vpp/vpp_coef.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/vpp_core.h b/drivers/video/exynos/decon_dual_dsi/vpp/vpp_core.h old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/vpp_drv.c b/drivers/video/exynos/decon_dual_dsi/vpp/vpp_drv.c old mode 100644 new mode 100755 diff --git a/drivers/video/exynos/decon_dual_dsi/vpp/vpp_regs.c b/drivers/video/exynos/decon_dual_dsi/vpp/vpp_regs.c old mode 100644 new mode 100755 diff --git a/fs/sdcardfs/sdcardfs.h b/fs/sdcardfs/sdcardfs.h index 5a37e7ba60b..5c9715c5295 100644 --- a/fs/sdcardfs/sdcardfs.h +++ b/fs/sdcardfs/sdcardfs.h @@ -245,11 +245,8 @@ struct sdcardfs_mount_options { userid_t fs_user_id; bool multiuser; bool gid_derivation; -<<<<<<< HEAD -======= bool default_normal; bool unshared_obb; ->>>>>>> b54a3de... ANDROID: sdcardfs: Add option to not link obb unsigned int reserved_mb; bool nocache; };