android_kernel_sony_msm8x60.repo.md

• jb_2.6_rb1.6: the maybe last commen ancestor branch of 8x60 Sony devices, pulled from: https://www.codeaurora.org/cgit/quic/la/kernel/msm/commit/?h=jb_2.6_rb1.6 Note that the next patch (ie., the one after the last commit in rb1.6 in the branch of eg. 1.10) is not applied to the last open-source code-drop by Sony. There are only 'a few' additional changes applied by Sony next to some commits that were cherry-picked either from kernel-msm or kernel.org source. Some were applied manually as they didn't make it into mainline, incomplete list:
  • http://ftp.dei.uc.pt/pub/linux/kernel/people/tridge/VFAT/FAT-Add-CONFIG_VFAT_FS_NO_DUALNAMES-option.patch
  • some patch I couldn't quite figure out which it was but it messed with the kprobes.c in the mainline kernel (TODO)
• 9.2.A.0.205: imported source-drop atop jb_2.6_rb1.6
• 9.2.A.0.295: imported source-drop atop 9.2.A.0.205
• cherry_mint: An attempt to get even closer to the source used by Sony without their patches, only using available distinct patchsets lurking in the net.
• cherry_mint_9.2.A.0.205: Using the first attempt on the cherry_mint branch to import Sony's source
• cherry_mint_9.2.A.0.295: Continued this with the updated 295 source
• jb_to_CAF: Simply merged LA.AF.1.1.1_rb1.18 into the jb_2.6_rb1.6 branch as this might prove helpful when applying Sony's changes
• jb_to_CAF_to_CM: Cherry-picked all unconflicting commits from CM into jb_to_CAF (list of conflicting commits)
• jb_to_CAF_to_CM_merge: Now merged everything with -Xtheirs from cm-12.0 into jb_to_CAF_to_CM and kept the modified remote files instead of deleted ones (locally)

conflcting.txt

fe1dfddab4baa759bcfab8cd7e5ff2b5fd349cad
be91255aee882901089dc6a3e8c956589ec94cd4
f55439abaa98947a09e8ddc65a0f422368956f24
6291cbc97430eae951ecba125a3d21dd93b72f92
9103e63f601a1671d7094d1268d305de2ec42689
6b74dbc6e3dcc06d03686943596a75d765be1de6
c0a3bc4c02b0d958f7b4398144e934ef7e77fcde
b94da8f84b23eaa9e42143b268b54f08febf080e
79378637603021bbd6c08cf0acd3b3d9b8acdae9
df5ec4675a404d1e19e02fecbd63d52d9eb8ef2c
8e3a8aab292c2bb7bf245e01b3beac55f7d58a4c
6d36c94516a3c0e8ce59f2e40cb1b1616e9c68f2
544fb4f09014af733fbcd213b4bba6c97695d399
71beb8c9cabd749350ba95003b437d9b38ce4f06
67885bfc5293e6fbd7c1bc4d7ac510db579e644e
7ccb6c242a4e5295971514208c96f5369c0aec42
907dadae0a9c470d7c97abd98951b9986c1d9017
e194452bd0f544c856d0c1ed1578886843cabde3
4502026b2984cb84bd5bc95b8428dd6394ce9350
cbfd86222f273b1a46761ca45a48100dce6d1eef
2098c49fb7a2e0c475cc575b59d513beedbd657b
7b2a832c7abac0aa633acab685cebc77d42f1aaa
4c088fb8ec8db9e435a1f8b03a972c47186c257a
35e7f348f1c27b4ba34abc7de3ebb7627c7b94ca
1f7e40d80c24d46429c348c27fc64a4f03f67fee
3bf06986f6102835dddfe5c96914c129f8e9b904
14b01941a44e79c4bea532abe102931129ed5acf
27c16079f29d4b8e8aefc493e4b5670410585b5b
6c7de406aa3894b83d74df0abdc3258fd9fd3a15
c9230f07c540e4bd34480a3b9c2d1da5f874fd72
adaad5e25bcff9f27d26721ca828400e311ce31c
961cb951a820364d973396e5ea8d68dc41da60ae
4960263e6e6bc8cced0fcbd233ed9c59361f1a0a
036eb92aee8022ed2e3fbebf9d603adf41fd98a9
c32fbb5943f566e8dd3d8a828adede4eb499a90a
e219524306c2d254c0bc8f2a59ed68ef44de01f9
5e6305038233dfc8eb222b50631b8e85c55f77a5
db530756987a119ca9e67c7b994eb71ed9048930
6b0a24cf5d4ae86c903f6cc2cd0214a76ccb68a9
cd2c90fb009400bd31cd1efb916b6bb05ad81229
b74512b0fb721875d23e130c61dec578dc19647c
950112881a944f58c0ac1bf80792b90b410bdc07
4829319501880139189c937ad67b62e16ad7f01b
b24e5f3ec7674695566215cfc37615bf3a83ae1f
44284b06ae00cb2f165fe592a79612993dff4cdf
af0590b109ee7d6e3745587eedef164bf1436de2
e28529a9bd988b86a98cb43b31cb022773c5bd12
01e7ce086b7d4c084c746bf7f273959f4770be79
c8e5206c8ab27bb715de01a0b9dc0372ccb9d4eb
16bc7a749f085efba072349add0a3149992abacb
b50a70b55b8f6be178dcd28e102e7097474e03ba
781df2e48ab13d9a1ad55275df4de4b29bf5c864
297c1fee429c9ea67b17e3a001ef494d27f6340a
d8b5e34b2981bbe7588e79a7f0f3454b4d15bf40
86a7e8f226971a2f7d0b8bb63126cd7e7f0dda73
f954b4a96758c3354def0c3ecfc4fc9cd52d95f3
51428392acf0446b1005767f2dea164926cfcc29
3b4330a42a0f4548f2e2cd04d985d4ca6f1a13d1
02810dfdf316e1cf476336afc7298b44b7a7089b
c779f56316a024dde4751b63f7e0cd86a066df58
7653eafcff0d305690b8b011faa09eaa6671cc53
be6da6c42c0ef0cd59276fa879f689b7795a1b4f
fd7a408d9add22e8c83977ac3006fd5d2bd9c34d
e8122e678564893bb6d568ddc597b2c5e914a7ef
743b7c44c6c11e42bf6e25a991ee498dbee2977b
4527754b5b5943ad9e53c32bae58881559dc657e
03c2fa9dc245b0d69075f601df8ebfa62aacc1c6
7793795841a810f969a8e0f20cad8fbe86482e18
69b5ea3ba4252fb7bcd467f277508c1d687bf267
4139d44100c3e4e7ff161d55ca375755d71bbc14
3a1d03e0aa6c9fe1655f1b66ab790ccaa18d6e99
e970904d459954616a40d453e7fbf49b31c4e1e0
52025c537b465ad9e2d6d8382caf1c5204010efb
7471fd4d53af376e3f7fbf9310f2bf470aca3803
91748e57e165dd7ee0a1da206967984d544fbd95
3ea19b0a17164a4dfcfbb43dce8e22a2b74f6a46
3efe0352d1e38ee1fcb61365d2af5fe12d86a3d6
a315f18e2bfae68ec3b3790a1faf00fe24fd79ae
9e4400620de41a1caf55aba9fc2ded083cfbda5e
64047f64da79adfeacc4e7691002fa83198b79ba
13330fab6266e8f75a0ac34fdf9e3c8316cee4ad
f37b8630c362fafce5ac6bc6a8df54e157894e45
d97e03a6719b9a7e83de85aa50b9be8cd6dc2af7
3241a20366eeb11fe2022ce163def9fd2f63eff4
662cc66de70a3137aace5fd752a815cfa8f58c07
3bcbc2953e67187b6c1e70ceeed324ff66617a1d
f9fb2e456ff0322ba50062a5722ac70dbbacac8a
d0b558010d0a73025390a660e3f3d0727317c31a
cd0d15e63d0c38afc874d92e0de760e6d541543d
2ea0a78bc9f8e08ca2ca17f544a82e06e4305d88
d1417805c4b5efcb9953fc5018cb53a72ea83176
c3b32c110ce49a18bedac9d90286546a301cd523
83033f1f9f2dcb75e1f2b063e395ce4c8839a633
b4900e6d1c809bcfefd422106d210daf04437873
806583704a2c36109fced1f4f21eb58db9888c4f
bfeef956d08f45c524b4f131041dc062b531053c
290c7ec3cd6a5032bcfaedd6d8fa0978baa8aff1
27f782c822f5786e57c3eb2a79c8e858bbb48771
12fae320c8ddffee2bf1eab705e5990ce1a60fc8
c6117781d394eb8b35d1035c2fddb047249e8766
8724fbc7d125530ce73eed370a9751d0bfabaf28
989d2ed5368c205495af6ca8d16e5f48e4046e24