Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae76294 authored by Raghavendra Rao Ananta's avatar Raghavendra Rao Ananta
Browse files

Merge remote-tracking branch 'remotes/origin/tmp-cf045d88' into msm-lahaina 



* remotes/origin/tmp-cf045d88:
  ANDROID: build configs: switch prebuilt path location
  ANDROID: mnt: Fix null pointer dereference
  ANDROID: {cuttlefish,gki}_defconfig: Enable CONFIG_SDCARD_FS
  ANDROID: sdcardfs: Add sdcardfs filesystem
  ANDROID: sdcardfs: Define magic value
  ANDROID: mnt: Add filesystem private data to mount points
  ANDROID: fs: Restore vfs_path_lookup() export
  ANDROID: vfs: add d_canonical_path for stacked filesystem support
  ANDROID: Add show_options2 to view private mount data
  ANDROID: vfs: Add permission2 for filesystems with per mount permissions
  ANDROID: vfs: Add setattr2 for filesystems with per mount permissions
  ANDROID: sdcardfs: Enable modular sdcardfs
  ANDROID: gki_defconfig: disable BRIDGE_NETFILTER
  ANDROID: gki_defconfig: enable more configs
  ANDROID: Updating abi for aarch64 gki to reflect HCD_DUMMY addition
  ANDROID: adding usb HCD dummy config to permit usb write ops on init

Change-Id: Iee24e3d0ca3637e295682bbb37287c11aa264fcd
Signed-off-by: default avatarRaghavendra Rao Ananta <rananta@codeaurora.org>
parents bcd522a5 cf045d88

abi_gki_aarch64.xml

+211762 −193629

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/configs/cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ CONFIG_MSDOS_FS=y 
CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

arch/arm64/configs/gki_defconfig

+10 −1
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_VTI=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETFILTER=y

# CONFIG_BRIDGE_NETFILTER is not set

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -274,14 +275,17 @@ CONFIG_HW_RANDOM_VIRTIO=y 
# CONFIG_DEVPORT is not set

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_SPI=y

CONFIG_SPMI=y

CONFIG_PINCTRL=y

CONFIG_PINCTRL_AMD=y

CONFIG_POWER_AVS=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_THERMAL_GOV_USER_SPACE=y

CONFIG_CPU_THERMAL=y

CONFIG_DEVFREQ_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_MFD_ACT8945A=y

CONFIG_MFD_SYSCON=y

CONFIG_REGULATOR=y
@@ -313,7 +317,9 @@ CONFIG_HID_MICROSOFT=y 
CONFIG_HID_MULTITOUCH=y

CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_OTG=y

CONFIG_USB_GADGET=y

CONFIG_USB_DUMMY_HCD=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_FS=y
@@ -323,16 +329,17 @@ CONFIG_USB_CONFIGFS_F_MIDI=y 
CONFIG_MMC=y

# CONFIG_PWRSEQ_EMMC is not set

# CONFIG_PWRSEQ_SIMPLE is not set

# CONFIG_MMC_BLOCK is not set

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

# CONFIG_RTC_SYSTOHC is not set

CONFIG_RTC_DRV_PL030=y

CONFIG_RTC_DRV_PL031=y

CONFIG_DMADEVICES=y

CONFIG_VIRTIO_PCI=y

# CONFIG_VIRTIO_PCI_LEGACY is not set

CONFIG_VIRTIO_INPUT=y
@@ -354,6 +361,7 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y 
CONFIG_EXTCON=y

CONFIG_PWM=y

CONFIG_GENERIC_PHY=y

CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_INTERCONNECT=y
@@ -372,6 +380,7 @@ CONFIG_VFAT_FS=y 
CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

arch/x86/configs/gki_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ CONFIG_HID_MULTITOUCH=y 
CONFIG_USB_HIDDEV=y

CONFIG_USB=y

CONFIG_USB_GADGET=y

CONFIG_USB_DUMMY_HCD=y

CONFIG_USB_CONFIGFS=y

CONFIG_USB_CONFIGFS_UEVENT=y

CONFIG_USB_CONFIGFS_F_FS=y
@@ -303,6 +304,7 @@ CONFIG_MSDOS_FS=y 
CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y

arch/x86/configs/x86_64_cuttlefish_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ CONFIG_PROC_KCORE=y 
CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_HUGETLBFS=y

CONFIG_SDCARD_FS=y

CONFIG_PSTORE=y

CONFIG_PSTORE_CONSOLE=y

CONFIG_PSTORE_RAM=y