invisiblek

diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index e9d13aa..82c4e99 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -270,6 +270,10 @@ char *get_fstype_from_devname(const char *device)
 {
 #if ENABLE_FEATURE_BLKID_TYPE
 	struct uuidCache_s *uc;
+	struct stat *statbuf;
+

invisiblek

On branch merge
Your branch is up-to-date with 'github/cm-12.0'.

You have unmerged paths.
  (fix conflicts and run "git commit")

Changes to be committed:

	modified:   AndroidKernel.mk
	modified:   Documentation/DMA-attributes.txt

invisiblek

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 5b736db..b9cdb6df 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1156,19 +1156,6 @@ struct ext4_sb_info {
 	ext4_fsblk_t s_sb_block;
 	uid_t s_resuid;
 	gid_t s_resgid;
-#ifdef VENDOR_EDIT
-//[email protected], 2014/1/23, Add for support to set uid, gid, fmask, dmask

invisiblek

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 5b736db..b9cdb6df 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -1156,19 +1156,6 @@ struct ext4_sb_info {
 	ext4_fsblk_t s_sb_block;
 	uid_t s_resuid;
 	gid_t s_resgid;
-#ifdef VENDOR_EDIT
-//[email protected], 2014/1/23, Add for support to set uid, gid, fmask, dmask

invisiblek

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 410d028..2249d61 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1790,7 +1790,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
 		// Treat fstype "auto" as unspecified
 		if (mp->mnt_type && !strcmp(mp->mnt_type, "auto"))
 			mp->mnt_type = NULL;
-	} else {
+	} else if (strstr(mp->mnt_fsname, "mtd")) {

invisiblek

diff --git a/configs/gps.conf b/configs/gps.conf
index 83362f2..f1aaea9 100644
--- a/configs/gps.conf
+++ b/configs/gps.conf
@@ -54,8 +54,8 @@ CAPABILITIES=0x31
 ################################
 
 # FOR SUPL SUPPORT, set the following
-# SUPL_HOST=supl.host.com or IP
-# SUPL_PORT=1234

invisiblek

vendor/lge				52469ce40e8da760e0af3e128ab638fae2c572e4		# vs980: update adreno
vendor/lge				922bbb6d08c4d3eb4ae7e2de1fdb754544b4c6ad		# vs980: Updated WV DRM libraries
vendor/lge				99e21d2dccde851895d5fd5b0bd94694f0acd348		# v4xx: initial commit
vendor/samsung				4844022a8467dc568bc539d0d49d4f3cec9b5e36		# msm8960-common: update adreno blobs and d2 camera
skip vendor/htc					9ce430dd3377cec564b26032a5f49670de87f4ab		# m8vzw rilblobs
skip device/htc/m8				4aefb6c11e20e7a3e0064e3c2d72808d3037bb36		# revert disable libaudioamp
skip device/htc/m8				5873a7c7f7818672ec98eb9e55b38b8bd677a432		# amps
skip vendor/lge					8d48706cc119cd02e9ed7a39698cd1bb68f3feaa		# vs985 lollipop blobs

# nevermerge

invisiblek

skip 81797 # install: disable signature checking on eng and userdebug builds
skip 88258 # build: use the systems ccache by default
skip 90536 # cm: build: Implement shared library caching

# otg
skip 88912 # Use actual storage type of sdcard usb
skip 88913 # frameworks: add persistent notification when USB OTG is connected

# bash
89345 # bash patch 31

invisiblek

#!/bin/bash

version=12.0

while [ $# -gt 0 ]; do
  case $1 in
    careful)    set -e;;
    twrp)       twrp=true;;
    *)          ;;
  esac

invisiblek

#!/bin/bash

# Set some personalized parameters
destemail="[email protected]"
sourcedir=$HOME/cm
tempdir=$sourcedir/tempdir
export USE_CCACHE=1
export USE_PREBUILT_CACHE=1
export PREBUILT_CACHE_DIR=/opt/buildcache
export CCACHE_DIR=/opt/ccache