invisiblek

diff --git a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
index 44e18de..c7872f6 100644
--- a/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
+++ b/ril/telephony/java/com/android/internal/telephony/LgeLteRIL.java
@@ -136,7 +136,7 @@ public class LgeLteRIL extends RIL implements CommandsInterface {
                 }
                 // Trigger socket reset if RIL connect is called again
                 SystemProperties.set("ril.socket.reset", "1");
-                setPreferredNetworkType(mPreferredNetworkType, null);
+//                setPreferredNetworkType(mPreferredNetworkType, null);

invisiblek

skip 78919 # Telephony: fix getIccOperatorNumeric
skip 77856 # Telephony: Allow ruim to fetch in CDMA LTE mode
skip 79630 # media_profiles: fix 4k recording profile
skip 79857 # LgeLteRIL: Lollipop fixups for CDMA
skip 80056 # init: cleanup and juggling act
skip 80371 # MSIM: Fix subscription fallback issue
skip 81249 # prima: update to version 3.2.3.418
skip 81250 # staging: prima: add option to read calibration data from HTC NVS
skip 81251 # prima: fix building inline
skip 81240 # wifi: update wcnss and wpa supplicant configs from lollipop

invisiblek

diff --git a/drivers/bluetooth/bluesleep.c b/drivers/bluetooth/bluesleep.c
index 6dc9862..43192d7 100644
--- a/drivers/bluetooth/bluesleep.c
+++ b/drivers/bluetooth/bluesleep.c
@@ -160,7 +160,7 @@ void bluesleep_sleep_wakeup(void)
 		BT_DBG("waking up...");
 		/* Start the timer */
 		mod_timer(&tx_timer, jiffies + (TX_TIMER_INTERVAL * HZ));
-		gpio_set_value(bsi->ext_wake, 0);
+		gpio_set_value(bsi->ext_wake, 0); //

invisiblek

diff --git a/drivers/bluetooth/bluesleep_bcm.c b/drivers/bluetooth/bluesleep_bcm.c
index aa8863e..9880196 100644
--- a/drivers/bluetooth/bluesleep_bcm.c
+++ b/drivers/bluetooth/bluesleep_bcm.c
@@ -187,7 +187,7 @@ void bluesleep_sleep_wakeup(void)
 		/* Start the timer */
 		mod_timer(&tx_timer, jiffies + (TX_TIMER_INTERVAL * HZ));
 		if (bsi->has_ext_wake == 1)
-			gpio_set_value(bsi->ext_wake, 1);
+			gpio_set_value(bsi->ext_wake, 1); //

invisiblek

diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 5e7d15a..f9617f1 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -356,6 +356,7 @@ service insthk /system/bin/insthk
     user root
     disabled
     oneshot
+    seclabel u:r:insthk_exec:s0
 

invisiblek

(this patch is for vendor/cm)

diff --git a/sepolicy/recovery.te b/sepolicy/recovery.te
index 6110f9a..edb1ce8 100644
--- a/sepolicy/recovery.te
+++ b/sepolicy/recovery.te
@@ -15,12 +15,15 @@ allow recovery system_data_file:file r_file_perms;
 
 # Manage fstab and /adb_keys
 allow recovery rootfs:file create_file_perms;

invisiblek

diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 98b6c67..955413c 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -134,7 +134,7 @@ obj-$(CONFIG_MSM_ONCRPCROUTER) += smd_rpcrouter_device.o
 obj-$(CONFIG_MSM_IPC_ROUTER) += ipc_router.o
 obj-$(CONFIG_MSM_IPC_ROUTER)+= ipc_socket.o
 obj-$(CONFIG_MSM_IPC_ROUTER_SECURITY)+= msm_ipc_router_security.o
-obj-$(CONFIG_DEBUG_FS) += smd_rpc_sym.o
+obj-$(CONFIG_DEBUG_FS) += ./smd_rpc_sym.o

invisiblek

diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
index d507577..e721766 100644
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
@@ -348,7 +348,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
 	 * hasn't changed since we received the original syn, but I see
 	 * no easy way to do this.
 	 */
-	flowi4_init_output(&fl4, sk->sk_bound_dev_if, sk->sk_mark,
+	flowi4_init_output(&fl4, sk->sk_bound_dev_if, ireq->ir_mark,

invisiblek

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 2d44cde..ea63a57 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -588,8 +588,6 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info)
 					  iph->tos;
 	mark = IP4_REPLY_MARK(net, skb_in->mark);
 
-	mark = IP4_REPLY_MARK(net, skb_in->mark);
-

invisiblek

HEAD detached from 7e3fe00
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   arch/arm/boot/compressed/libfdt_env.h
	modified:   arch/arm/configs/full_msm8960-perf_defconfig
	modified:   arch/arm/configs/mako_defconfig
	modified:   arch/arm/configs/msm8960-perf_defconfig
	modified:   arch/arm/configs/msm8960_defconfig