h2o64

git cherry-pick a5a9e7c9c19b03b471d3ec148698e90a1958bfcb # Linux 3.4.42
git cherry-pick 8fdeb71b5022b4578e3339b861019c5a00c77700 # Btrfs: make sure nbytes are right after log replay
git cherry-pick b00919cd72ed9753390a9fbb5541cbba12e5e826 # vm: convert mtdchar mmap to vm_iomap_memory() helper
git cherry-pick 5de41ebef9458aa13955c5a3792c2f86d6e4fdda # vm: convert HPET mmap to vm_iomap_memory() helper
git cherry-pick b67bca9e17d63641aceefe5d5b112c065b478206 # vm: convert fb_mmap to vm_iomap_memory() helper
git cherry-pick ada37d85783ec8e314bd9b020b89d8a63a7587f2 # vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper
git cherry-pick c420060e7b21368c21972e8a29e4ff56abb9d219 # vm: add vm_iomap_memory() helper function
git cherry-pick 726cc91ed26521f3e678346e5745203a70edd456 # fbcon: fix locking harder
git cherry-pick 6b48c21afcf0f9f01bb37144a5da3274a3590404 # perf/x86: Fix offcore_rsp valid mask for SNB/IVB
git cherry-pick da307d100cd4979e353e8265d0691263aa2a0086 # perf: Treat attr.config as u64 in per

h2o64

--------- beginning of system
I/Vold    (  226): Vold 2.1 (the revenge) firing up
D/Vold    (  226): Volume usbdisk state changing -1 (Initializing) -> 0 (No-Media)
I/Cryptfs (  226): Check if PFE is activated on Boot
E/Cryptfs (  226): Bad magic for real block device /dev/block/platform/msm_sdcc.1/by-name/userdata
E/Cryptfs (  226): Error getting crypt footer and key
I/InstallerConnection(  774): disconnecting...
I/SystemServer(  774): Entered the Android system server!
I/SystemServiceManager(  774): Starting com.android.server.pm.Installer
I/Installer(  774): Waiting for installd to be ready.

h2o64

diff --git a/arch/arm/configs/falcon_defconfig b/arch/arm/configs/falcon_defconfig
index 1e2e77b..34b84e7 100644
--- a/arch/arm/configs/falcon_defconfig
+++ b/arch/arm/configs/falcon_defconfig
@@ -51,8 +51,8 @@ CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_LZMA is not set
-CONFIG_KERNEL_XZ=y
-# CONFIG_KERNEL_LZO is not set

h2o64

louis@louis-All-Series:~/Dev/AOSP/vendor/motorola$ git diff lucas/cm-12.1..tmp --patch-with-stat 
 falcon/BoardConfigVendor.mk                                                 |   2 +-
 falcon/falcon-vendor-blobs.mk                                               |   2 +-
 falcon/falcon-vendor.mk                                                     |   2 +-
 falcon/proprietary/vendor/lib/liboemcamera.so                               | Bin 0 -> 42092 bytes
 msm8226-common/Android.mk                                                   |   2 +-
 msm8226-common/BoardConfigVendor.mk                                         |   2 +-
 msm8226-common/msm8226-common-vendor-blobs.mk                               |  16 ++++++++--------
 msm8226-common/msm8226-common-vendor.mk                                     |   2 +-
 msm8226-common/proprietary/etc/gps.conf                                     |  14 ++------------

h2o64

[    0.000000,0] Kernel command line: console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 vmalloc=400M utags.blkdev=/dev/block/platform/msm_sdcc.1/by-name/utags androidboot.write_protect=0 androidboot.emmc=true androidboot.serialno=TA883031EV androidboot.baseband=msm androidboot.mode=normal androidboot.device=falcon androidboot.hwrev=0x83C0 androidboot.radio=0x1 androidboot.powerup_reason=0x00100000 bootreason=hardware_reset androidboot.write_protect=0 restart.download_mode=0 androidboot.fsg-id= androidboot.secure_hardware=1 androidboot.cid=0x7 androidboot.bootloader=0x4118 androidboot.carrier= mdss_mdp.panel=1:dsi:0:qcom,mdss_dsi_mot_cmi_720p_video_v2
[    0.654196,1] mdss_dsi_ctrl_probe: DSI Ctrl name = MDSS DSI CTRL->0
[    0.654530,1] mdss_dsi_panel_init: Panel Name = mipi_mot_video_cmi_hd_450 v2
[    0.654932,1] mdss_dsi_parse_roi_alignment: ROI alignment: [2, 2, 2, 2, 0, 0]
[    0.655153,1] mdss_dsi_parse_dcs_cmds: failed, key=qcom,mdss-dsi-panel-status-command
[    0.655310,1] mdss

h2o64

#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 3.4.0 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y

h2o64

diff --git a/include/media/msmb_isp_moto.h b/include/media/msmb_isp_moto.h
index 3ba0abe..b92f8c0 100644
--- a/include/media/msmb_isp_moto.h
+++ b/include/media/msmb_isp_moto.h
@@ -143,6 +143,7 @@ struct msm_vfe_axi_stream_request_cmd {
        uint8_t buf_divert; /* if TRUE no vb2 buf done. */
        /*Return values*/
        uint32_t axi_stream_handle;
+       uint32_t burst_len;
 };

h2o64

louis@louis-All-Series:~/Dev/CM12.1/kernel/motorola/msm8226$ git diff HEAD..anas/cm-12.1-caf drivers/media/platform/msm/camera_v2_moto/
diff --git a/drivers/media/platform/msm/camera_v2_moto/ispif/msm_ispif.c b/drivers/media/platform/msm/camera_v2_moto/ispif/msm_ispif.c
old mode 100755
new mode 100644
diff --git a/drivers/media/platform/msm/camera_v2_moto/jpeg_10/msm_jpeg_platform.c b/drivers/media/platform/msm/camera_v2_moto/jpeg_10/msm_jpeg_platform.c
index f19b223..407b81f 100644
--- a/drivers/media/platform/msm/camera_v2_moto/jpeg_10/msm_jpeg_platform.c
+++ b/drivers/media/platform/msm/camera_v2_moto/jpeg_10/msm_jpeg_platform.c
@@ -18,7 +18,7 @@
 #include <mach/clk.h>

h2o64

 Makefile                                           |   6 +-
 arch/arm/Kconfig                                   |   1 +
 arch/arm/Makefile                                  |   1 +
 arch/arm/boot/compressed/decompress.c              |   3 +
 arch/arm/boot/compressed/head.S                    |  14 +-
 arch/arm/configs/falcon_defconfig                  |  18 +-
 arch/arm/configs/peregrine_defconfig               |  15 +-
 arch/arm/configs/titan_defconfig                   |  15 +-
 arch/arm/include/asm/Kbuild                        |   1 +
 arch/arm/include/asm/mutex.h                       |   9 +-

h2o64

--- a/ramdisk/fstab.qcom
+++ b/ramdisk/fstab.qcom
@@ -1,10 +1,10 @@
-# Android fstab file.
+...# Android fstab file.
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 #<src>                                              <mnt_point>  <type>  <mnt_flags and options>                                                        <fs_mgr_flags>
 /dev/block/platform/msm_sdcc.1/by-name/system       /system      ext4    ro,barrier=1                                                                   wait
 /dev/block/platform/msm_sdcc.1/by-name/userdata     /data        ext4    rw,nosuid,nodev,noatime,nodiratime,noauto_da_alloc,nobarrier                   wait,check,formattable,encryptable=footer,length=-16384