Difference between revisions of "Oppo Find 7a"

From Omni
Jump to: navigation, search
(Bringup Status)
(Bringup Status)
Line 21: Line 21:
 
|-
 
|-
 
| 489bfaa
 
| 489bfaa
| Find 7 changes: drivers/media/platform/msm/vidc/venus_hfi.c
+
| drivers/media/platform/msm/vidc/venus_hfi.c
|  
+
| Not Merging (already upstream)
 
|
 
|
 
|-
 
|-
 
| d2afff0
 
| d2afff0
 
| Find 7 changes: drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
 
| Find 7 changes: drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
|  
+
| Merged to msm_camera_dt_util.c
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/07558f807a39f6238ce11857b3fee7933c9edc7c
 
|-
 
|-
 
| 3e50407
 
| 3e50407
 
| Find 7 changes: drivers/media/platform (camera)
 
| Find 7 changes: drivers/media/platform (camera)
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/53356789fdd35aad4f3ab9c2504c4048aa5fd841
 
|-
 
|-
 
| 93eeec9
 
| 93eeec9
 
| Find 7 changes: drivers/base/power
 
| Find 7 changes: drivers/base/power
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/330d3e93f51deec02193d97b811ad9ffcfc362b3
 
|-
 
|-
 
| 9a27037
 
| 9a27037
Line 47: Line 47:
 
| 223f930
 
| 223f930
 
| Find 7 changes: drivers/hwmon/qpnp-adc-common.c
 
| Find 7 changes: drivers/hwmon/qpnp-adc-common.c
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/9d04ed984315be1b971cb759fbf189bae234d719
 
|-
 
|-
 
| 1466278
 
| 1466278
Line 62: Line 62:
 
| f7de259
 
| f7de259
 
| Find 7 changes: drivers/power minus qpnp-charger
 
| Find 7 changes: drivers/power minus qpnp-charger
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/06fdb5a5b16f32005e68cfa65729e820520e4c80
 
|-
 
|-
 
| 66e1842
 
| 66e1842
Line 107: Line 107:
 
| cf96ee0
 
| cf96ee0
 
| Find 7 changes: drivers/leds
 
| Find 7 changes: drivers/leds
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/e1cafcee4bdc67c4f05b4bf82dfdf3a16a3f7d32
 
|-
 
|-
 
| 6f25850
 
| 6f25850
 
| Find 7 changes: drivers/platform/msm
 
| Find 7 changes: drivers/platform/msm
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/fa421a2712f306ed91392bb4adef3d514d649d12
 
|-
 
|-
 
| 65e27aa
 
| 65e27aa
 
| Find 7 changes: drivers/misc
 
| Find 7 changes: drivers/misc
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/ed36fc9151b2dc6753706e3164063349ad55a4d1
 
|-
 
|-
 
| bd79839c
 
| bd79839c
 
| Find 7 changes: fs/exfat
 
| Find 7 changes: fs/exfat
|  
+
| Not Merging (we use FUSE)
 
|
 
|
 
|-
 
|-
 
| 82536a2
 
| 82536a2
 
| Find 7 changes: fs/ext4
 
| Find 7 changes: fs/ext4
|  
+
| Not Merging (badhax)
 
|
 
|
 
|-
 
|-
 
| c4de197
 
| c4de197
 
| Find 7 changes: Touchscreen firmware files
 
| Find 7 changes: Touchscreen firmware files
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/d8b9072b10bd5da25ead05d641b9df75c9415b7b
 
|-
 
|-
 
| a13ae99
 
| a13ae99
 
| Find 7 changes: drivers/input/touchscreen
 
| Find 7 changes: drivers/input/touchscreen
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/64d8a61903dd331a0f962650113775f231e7b331
 
|-
 
|-
 
| afcf6bf
 
| afcf6bf
Line 167: Line 167:
 
| 3ac9d2e
 
| 3ac9d2e
 
| Find 7 changes: drivers/nfc
 
| Find 7 changes: drivers/nfc
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/5746a45d0de3646e58b5addf746bdafd4d6da917
 
|-
 
|-
 
| 8367e11
 
| 8367e11
 
| Find 7 changes: arch/arm/mach-msm
 
| Find 7 changes: arch/arm/mach-msm
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/591e835117b8ec961a99976c76ffc7154c66b7eb
 
|-
 
|-
 
| 637a7c5
 
| 637a7c5
 
| Find 7 changes: arch/arm/configs
 
| Find 7 changes: arch/arm/configs
|  
+
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/2db2bf54c33a05058d838ff0b6ebcd178d1ceb30
 
|-
 
|-
 
| 772206b
 
| 772206b
 
| Find 7 changes: arch/arm/boot
 
| Find 7 changes: arch/arm/boot
|  
+
| Merged (warning: many conflicts)
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/7574b787eff3c4437dda176750d7a1642a6f5079
 
|}
 
|}

Revision as of 11:07, 26 April 2014

Bringup Status

Currently merging Oppo's kernel changes.

Oppo's kernel was derived from CAF tag LNX.LA.3.2.5-00210-8x74.0 - Diffs split into small bite-sized chunks are at https://github.com/Entropy512/kernel_find7_reference/commits/oppo_kernel (WARNING: Branch will be periodically rebased!)

We are in the process of rebasing onto AU_LINUX_ANDROID_JB_3.2.1.04.03.00.086.146 - Rebases are currently on https://github.com/Entropy512/kernel_find7_reference/commits/kk_3.5_oppo (WARNING: Branch will be periodically rebased!)

Here's the merge status of each individual chunk, mostly for my own reference:

Hash Commit title Status Merged Commit
3dd0552 Find7: Apply oppo changes on top of LNX.LA.3.2.5-00210-8x74.0
489bfaa drivers/media/platform/msm/vidc/venus_hfi.c Not Merging (already upstream)
d2afff0 Find 7 changes: drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c Merged to msm_camera_dt_util.c https://github.com/Entropy512/kernel_find7_reference/commit/07558f807a39f6238ce11857b3fee7933c9edc7c
3e50407 Find 7 changes: drivers/media/platform (camera) Merged https://github.com/Entropy512/kernel_find7_reference/commit/53356789fdd35aad4f3ab9c2504c4048aa5fd841
93eeec9 Find 7 changes: drivers/base/power Merged https://github.com/Entropy512/kernel_find7_reference/commit/330d3e93f51deec02193d97b811ad9ffcfc362b3
9a27037 Find 7 changes: drivers/char/diag/diagfwd.c
223f930 Find 7 changes: drivers/hwmon/qpnp-adc-common.c Merged https://github.com/Entropy512/kernel_find7_reference/commit/9d04ed984315be1b971cb759fbf189bae234d719
1466278 Find 7 changes: drivers/slimbus
7078b5a Find 7 changes: drivers/power/qpnp-charger.c
f7de259 Find 7 changes: drivers/power minus qpnp-charger Merged https://github.com/Entropy512/kernel_find7_reference/commit/06fdb5a5b16f32005e68cfa65729e820520e4c80
66e1842 Find 7 changes: PIC charger firmware source
4fcd400 Find 7 changes: drivers/mfd/wcd9xxx-core.c
48b74ca Find 7 changes: ramconsole
1daacbf Find 7 changes: drivers/scsi
6e8420e Find 7 changes: kernel/
a7003db Find 7 changes: drivers/video/backlight
b9ad2da Find 7 changes: drivers/video/msm
92f4442 Find 7 changes: drivers/i2c
cf96ee0 Find 7 changes: drivers/leds Merged https://github.com/Entropy512/kernel_find7_reference/commit/e1cafcee4bdc67c4f05b4bf82dfdf3a16a3f7d32
6f25850 Find 7 changes: drivers/platform/msm Merged https://github.com/Entropy512/kernel_find7_reference/commit/fa421a2712f306ed91392bb4adef3d514d649d12
65e27aa Find 7 changes: drivers/misc Merged https://github.com/Entropy512/kernel_find7_reference/commit/ed36fc9151b2dc6753706e3164063349ad55a4d1
bd79839c Find 7 changes: fs/exfat Not Merging (we use FUSE)
82536a2 Find 7 changes: fs/ext4 Not Merging (badhax)
c4de197 Find 7 changes: Touchscreen firmware files Merged https://github.com/Entropy512/kernel_find7_reference/commit/d8b9072b10bd5da25ead05d641b9df75c9415b7b
a13ae99 Find 7 changes: drivers/input/touchscreen Merged https://github.com/Entropy512/kernel_find7_reference/commit/64d8a61903dd331a0f962650113775f231e7b331
afcf6bf Find 7 changes: sound/soc
e466aaa Find 7 changes: drivers/usb
1b22b33 Find 7 changes: drivers/rtc
88b406c Find 7 changes: drivers/net/wireless
f81bc3d Find 7 changes: drivers/mmc
3ac9d2e Find 7 changes: drivers/nfc Merged https://github.com/Entropy512/kernel_find7_reference/commit/5746a45d0de3646e58b5addf746bdafd4d6da917
8367e11 Find 7 changes: arch/arm/mach-msm Merged https://github.com/Entropy512/kernel_find7_reference/commit/591e835117b8ec961a99976c76ffc7154c66b7eb
637a7c5 Find 7 changes: arch/arm/configs Merged https://github.com/Entropy512/kernel_find7_reference/commit/2db2bf54c33a05058d838ff0b6ebcd178d1ceb30
772206b Find 7 changes: arch/arm/boot Merged (warning: many conflicts) https://github.com/Entropy512/kernel_find7_reference/commit/7574b787eff3c4437dda176750d7a1642a6f5079