Closed Haxk20 closed 3 years ago
4d3413ba skipped due to https://github.com/sonyxperiadev/kernel/commit/94eae105b1fe983d4da323dbf74a27a7b0fe1ba7 already applying the same change.
Had a small conflict in rmnet_handlers.c which was resolved.
0b364d26 skipped because https://github.com/sonyxperiadev/kernel/commit/2d8e79c2ee59b3dd0254c1246f87e3e261c98b0c already has this commit.
42b7135e skipped. Files do not exist.
974c9391 is just a port of downstream commit we have. Thus skipped.
5681cce4 and 96fd4981skipped. We have similar thing already on downstream. f6e8cb83 skipped. Missing file on downstream.
Tiny conflicts in 3 files. Resolved to have upstream fix in.
1227ffc9 skipped. Files do not exist on downstream.
All references to fscrypt_is_nokey_name() removed as the patch adding this function was skipped.
(Will see if we can port the commits that add those 2 files to downstream and apply this one as well in future PR as it would be too big for this PR)
fc9f57f6 is just a port of https://github.com/sonyxperiadev/kernel/commit/f5f7d65137cf9b99449117a38ab5addf55c0853b to upstream.
Tiny conflicts. All resolved to have upstream fix.
Just a tiny conflict. Resolved to have upstream fix in.
Tested on Xperia 1II. Boots and everything works.
206 still alive too
konradybcio
commented
3 years ago konradybcio
commented
3 years ago
4.19.160:
4d3413ba skipped due to https://github.com/sonyxperiadev/kernel/commit/94eae105b1fe983d4da323dbf74a27a7b0fe1ba7 already applying the same change.
Had a small conflict in rmnet_handlers.c which was resolved.
4.19.161:
0b364d26 skipped because https://github.com/sonyxperiadev/kernel/commit/2d8e79c2ee59b3dd0254c1246f87e3e261c98b0c already has this commit.
4.19.162:
42b7135e skipped. Files do not exist.
4.19.163:
974c9391 is just a port of downstream commit we have. Thus skipped.
4.19.164:
5681cce4 and 96fd4981skipped. We have similar thing already on downstream. f6e8cb83 skipped. Missing file on downstream.
Tiny conflicts in 3 files. Resolved to have upstream fix in.
4.19.165:
1227ffc9 skipped. Files do not exist on downstream.
All references to fscrypt_is_nokey_name() removed as the patch adding this function was skipped.
(Will see if we can port the commits that add those 2 files to downstream and apply this one as well in future PR as it would be too big for this PR)
4.19.167:
fc9f57f6 is just a port of https://github.com/sonyxperiadev/kernel/commit/f5f7d65137cf9b99449117a38ab5addf55c0853b to upstream.
Tiny conflicts. All resolved to have upstream fix.
4.19.168:
Just a tiny conflict. Resolved to have upstream fix in.
Tested on Xperia 1II. Boots and everything works.