Difference between revisions of "Oppo Find 7a"

From Omni
Jump to: navigation, search
(Bringup Status)
(Add more merge commits)
Line 43: Line 43:
 
| drivers/char/diag/diagfwd.c
 
| drivers/char/diag/diagfwd.c
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/3bd84a3881fb61dc75a9185b026d2ea8ba84a101
 
|-
 
|-
 
| 223f930
 
| 223f930
Line 53: Line 53:
 
| drivers/slimbus
 
| drivers/slimbus
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/4c192e5142260f07e3ac597395e750f94fae558f
 
|-
 
|-
 
| 7078b5a
 
| 7078b5a
 
| drivers/power/qpnp-charger.c
 
| drivers/power/qpnp-charger.c
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/7fb4e6fd4523ba6c4e86b905716eb4ecae9d4600
 
|-
 
|-
 
| f7de259
 
| f7de259
Line 68: Line 68:
 
| PIC charger firmware source
 
| PIC charger firmware source
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/746dd84b937ffdeb523559f72a2d618b20118765
 
|-
 
|-
 
| 4fcd400
 
| 4fcd400
 
| drivers/mfd/wcd9xxx-core.c
 
| drivers/mfd/wcd9xxx-core.c
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/450f418b83c14dabece09c011ff6c38d00d529e2
 
|-
 
|-
 
| 48b74ca
 
| 48b74ca
 
| ramconsole
 
| ramconsole
 
| Merged (not sure if needed)
 
| Merged (not sure if needed)
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/7c40b0eb62ef50fda5fd373abf746e4197d31fad
 
|-
 
|-
 
| 1daacbf
 
| 1daacbf
 
| drivers/scsi
 
| drivers/scsi
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/7081c8b4f12bcaeb38bc63541a26f3ed7a56dd8c
 
|-
 
|-
 
| 6e8420e
 
| 6e8420e
 
| kernel/
 
| kernel/
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/e7e0c86cfde04c71761d21eabccab7377470158c
 
|-
 
|-
 
| a7003db
 
| a7003db
 
| drivers/video/backlight
 
| drivers/video/backlight
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/252d034e31d42a47dcd58be846f85108ad535767
 
|-
 
|-
 
| b9ad2da
 
| b9ad2da
Line 103: Line 103:
 
| drivers/i2c
 
| drivers/i2c
 
| Merged (candidate for reverting back out)
 
| Merged (candidate for reverting back out)
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/eb1ac2e2cda5a4019373c75e36a9143b8a2dc92d
 
|-
 
|-
 
| cf96ee0
 
| cf96ee0
Line 143: Line 143:
 
| sound/soc
 
| sound/soc
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/4c83a3706b749333c6db4efbd2fb09ba97a0aabb
 
|-
 
|-
 
| e466aaa
 
| e466aaa
 
| drivers/usb
 
| drivers/usb
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/fc7ccbee9fabf0437bb2b6472aa914587d9a53b5
 
|-
 
|-
 
| 1b22b33
 
| 1b22b33
 
| drivers/rtc
 
| drivers/rtc
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/133f2aee190c336a3ad9a1436dfd5508006ce6d5
 
|-
 
|-
 
| 88b406c
 
| 88b406c
| Fdrivers/net/wireless
+
| drivers/net/wireless
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/00267560259c55a323dd996da2c66860b3eb3899
 
|-
 
|-
 
| f81bc3d
 
| f81bc3d
 
| drivers/mmc
 
| drivers/mmc
 
| Merged
 
| Merged
|
+
| https://github.com/Entropy512/kernel_find7_reference/commit/790df60696e900eab9f88ab9b017c40c7fedfcbd
 
|-
 
|-
 
| 3ac9d2e
 
| 3ac9d2e

Revision as of 15:02, 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 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 drivers/media/platform (camera) Merged https://github.com/Entropy512/kernel_find7_reference/commit/53356789fdd35aad4f3ab9c2504c4048aa5fd841
93eeec9 drivers/base/power Merged https://github.com/Entropy512/kernel_find7_reference/commit/330d3e93f51deec02193d97b811ad9ffcfc362b3
9a27037 drivers/char/diag/diagfwd.c Merged https://github.com/Entropy512/kernel_find7_reference/commit/3bd84a3881fb61dc75a9185b026d2ea8ba84a101
223f930 drivers/hwmon/qpnp-adc-common.c Merged https://github.com/Entropy512/kernel_find7_reference/commit/9d04ed984315be1b971cb759fbf189bae234d719
1466278 drivers/slimbus Merged https://github.com/Entropy512/kernel_find7_reference/commit/4c192e5142260f07e3ac597395e750f94fae558f
7078b5a drivers/power/qpnp-charger.c Merged https://github.com/Entropy512/kernel_find7_reference/commit/7fb4e6fd4523ba6c4e86b905716eb4ecae9d4600
f7de259 drivers/power minus qpnp-charger Merged https://github.com/Entropy512/kernel_find7_reference/commit/06fdb5a5b16f32005e68cfa65729e820520e4c80
66e1842 PIC charger firmware source Merged https://github.com/Entropy512/kernel_find7_reference/commit/746dd84b937ffdeb523559f72a2d618b20118765
4fcd400 drivers/mfd/wcd9xxx-core.c Merged https://github.com/Entropy512/kernel_find7_reference/commit/450f418b83c14dabece09c011ff6c38d00d529e2
48b74ca ramconsole Merged (not sure if needed) https://github.com/Entropy512/kernel_find7_reference/commit/7c40b0eb62ef50fda5fd373abf746e4197d31fad
1daacbf drivers/scsi Merged https://github.com/Entropy512/kernel_find7_reference/commit/7081c8b4f12bcaeb38bc63541a26f3ed7a56dd8c
6e8420e kernel/ Merged https://github.com/Entropy512/kernel_find7_reference/commit/e7e0c86cfde04c71761d21eabccab7377470158c
a7003db drivers/video/backlight Merged https://github.com/Entropy512/kernel_find7_reference/commit/252d034e31d42a47dcd58be846f85108ad535767
b9ad2da drivers/video/msm Major Merge Needed
92f4442 drivers/i2c Merged (candidate for reverting back out) https://github.com/Entropy512/kernel_find7_reference/commit/eb1ac2e2cda5a4019373c75e36a9143b8a2dc92d
cf96ee0 drivers/leds Merged https://github.com/Entropy512/kernel_find7_reference/commit/e1cafcee4bdc67c4f05b4bf82dfdf3a16a3f7d32
6f25850 drivers/platform/msm Merged https://github.com/Entropy512/kernel_find7_reference/commit/fa421a2712f306ed91392bb4adef3d514d649d12
65e27aa drivers/misc Merged https://github.com/Entropy512/kernel_find7_reference/commit/ed36fc9151b2dc6753706e3164063349ad55a4d1
bd79839c fs/exfat Not Merging (we use FUSE)
82536a2 fs/ext4 Not Merging (badhax)
c4de197 FTouchscreen firmware files Merged https://github.com/Entropy512/kernel_find7_reference/commit/d8b9072b10bd5da25ead05d641b9df75c9415b7b
a13ae99 Fdrivers/input/touchscreen Merged https://github.com/Entropy512/kernel_find7_reference/commit/64d8a61903dd331a0f962650113775f231e7b331
afcf6bf sound/soc Merged https://github.com/Entropy512/kernel_find7_reference/commit/4c83a3706b749333c6db4efbd2fb09ba97a0aabb
e466aaa drivers/usb Merged https://github.com/Entropy512/kernel_find7_reference/commit/fc7ccbee9fabf0437bb2b6472aa914587d9a53b5
1b22b33 drivers/rtc Merged https://github.com/Entropy512/kernel_find7_reference/commit/133f2aee190c336a3ad9a1436dfd5508006ce6d5
88b406c drivers/net/wireless Merged https://github.com/Entropy512/kernel_find7_reference/commit/00267560259c55a323dd996da2c66860b3eb3899
f81bc3d drivers/mmc Merged https://github.com/Entropy512/kernel_find7_reference/commit/790df60696e900eab9f88ab9b017c40c7fedfcbd
3ac9d2e drivers/nfc Merged https://github.com/Entropy512/kernel_find7_reference/commit/5746a45d0de3646e58b5addf746bdafd4d6da917
8367e11 arch/arm/mach-msm Merged https://github.com/Entropy512/kernel_find7_reference/commit/591e835117b8ec961a99976c76ffc7154c66b7eb
637a7c5 arch/arm/configs Merged https://github.com/Entropy512/kernel_find7_reference/commit/2db2bf54c33a05058d838ff0b6ebcd178d1ceb30
772206b arch/arm/boot Merged (warning: many conflicts) https://github.com/Entropy512/kernel_find7_reference/commit/7574b787eff3c4437dda176750d7a1642a6f5079