Skip to content
This repository was archived by the owner on Dec 13, 2024. It is now read-only.

hash mismatch for hybiyik-panthor kernel patch #63

Open
jsternberg opened this issue Dec 1, 2024 · 5 comments
Open

hash mismatch for hybiyik-panthor kernel patch #63

jsternberg opened this issue Dec 1, 2024 · 5 comments

Comments

@jsternberg
Copy link
Contributor

jsternberg commented Dec 1, 2024 •
edited
Loading

When building the kernel, I get this error:

error: hash mismatch in fixed-output derivation '/nix/store/akw6mcxmz2dgpwv2rci7byiz7sv0mkdx-aa54fa4e0712616d44f2c2f312ecc35c0827833d...c81ebd8e12b64a42a6efd68cc0ed018b57d14e91.patch.drv':
         specified: sha256-/5SvlGsgHbn1i68+GASOeNZmxoZiIt280L6iUFz3MFU=
            got:    sha256-nSfmgem0CElUHL1wXSL+9aVixeaRjcxMyey4YaNdHfc=
error: 1 dependencies of derivation '/nix/store/p2my0312a0i4i0pmz8q9wwx921h7zs83-cpupower-aarch64-unknown-linux-gnu-6.1.75-jr-noble.drv' failed to build
error: 1 dependencies of derivation '/nix/store/zm49xp4rdgifg7l4czhb6rc6yna1za24-k-aarch64-unknown-linux-gnu.drv' failed to build

It seems the content returned by github for the patch output has changed in some way that has caused the hash to now have a mismatch. The hash either needs to be updated or it might be better to just download the patches directly and commit them to the repository so it doesn't rely on how github outputs patches from URLs.
@gnull
Copy link
Contributor

gnull commented Dec 2, 2024

Is anyone able to retrieve the old version of the patch file from nix store and compare it to what github returns now?

@gnull gnull mentioned this issue Dec 2, 2024
Merged
gnull added a commit to gnull/nixos-rk3588 that referenced this issue Dec 2, 2024
@gnull
Update the hash of hbiyik-panthor.patch
44211b8 
The hash of the data received from Github has changed for some reason. I don't know why (could be something with spaces, encoding that they changed), but this commit fixes it.

ryan4yin#63
@gnull gnull mentioned this issue Dec 2, 2024
Closed
@Naxdy
Copy link
Contributor

Naxdy commented Dec 4, 2024

@gnull I was able to compare the old with the new, a diff old new yielded the following:

49c49
< index 0000000000000..a5b4e00217587
---
> index 00000000000000..a5b4e00217587c
243c243
< index a79fd3549ff8c..a52e6f4117d63 100644
---
> index a79fd3549ff8c2..a52e6f4117d63d 100644
266c266
< index cd641b1bce7b7..0e111ebc3c12e 100644
---
> index cd641b1bce7b79..0e111ebc3c12e4 100644
283c283
< index c611154667c20..93959cea38984 100644
---
> index c611154667c201..93959cea38984a 100644
297c297
< index 0000000000000..ff69cf0fb42aa
---
> index 00000000000000..ff69cf0fb42aab
636c636
< index 0000000000000..73205afec1621
---
> index 00000000000000..73205afec16211
812c812
< index a52e6f4117d63..3d5dc9dc1bfe5 100644
---
> index a52e6f4117d63d..3d5dc9dc1bfe51 100644
859c859
< index 93959cea38984..ad092cd7f2e95 100644
---
> index 93959cea38984a..ad092cd7f2e95f 100644
871c871
< index b87ed4238fc83..fab07f0a46398 100644
---
> index b87ed4238fc836..fab07f0a46398b 100644
886c886
< index 0000000000000..0b80177592a64
---
> index 00000000000000..0b80177592a649
2616c2616
< index f6159acb88569..4ae996ce8d403 100644
---
> index f6159acb885695..4ae996ce8d4037 100644
2633c2633
< index 60b2dda8d964b..f6bb5e8ec3eda 100644
---
> index 60b2dda8d964b3..f6bb5e8ec3eda5 100644
2736c2736
< index 0000000000000..ed8d50200cc3a
---
> index 00000000000000..ed8d50200cc3a9
3465c3465
< index 0b80177592a64..f86bfad74ff8a 100644
---
> index 0b80177592a649..f86bfad74ff8a2 100644
3497c3497
< index f86bfad74ff8a..ad99c9cfedac7 100644
---
> index f86bfad74ff8a2..ad99c9cfedac70 100644
3582c3582
< index ad092cd7f2e95..f718d2c83ed21 100644
---
> index ad092cd7f2e95f..f718d2c83ed215 100644
3598c3598
< index ad99c9cfedac7..89dcc6c34de45 100644
---
> index ad99c9cfedac70..89dcc6c34de45e 100644
4686c4686
< index ed8d50200cc3a..c7ed6bf441d4f 100644
---
> index ed8d50200cc3a9..c7ed6bf441d4f4 100644
5086c5086
< index 0e111ebc3c12e..ddbbe187f0419 100644
---
> index 0e111ebc3c12e4..ddbbe187f04195 100644
5104c5104
< index f718d2c83ed21..1f167b96acfbe 100644
---
> index f718d2c83ed215..1f167b96acfbe2 100644
5124c5124
< index 89dcc6c34de45..02ce6baacdad4 100644
---
> index 89dcc6c34de45e..02ce6baacdad4b 100644
5162c5162
< index 02ce6baacdad4..1aee12c2c825a 100644
---
> index 02ce6baacdad4b..1aee12c2c825ad 100644
5256c5256
< index c7ed6bf441d4f..af8f67ba173ff 100644
---
> index c7ed6bf441d4f4..af8f67ba173ffb 100644
5313c5313
< index 1aee12c2c825a..1cbeb4169f9c0 100644
---
> index 1aee12c2c825ad..1cbeb4169f9c0e 100644
5390c5390
< index 1cbeb4169f9c0..dd46d14fd3e60 100644
---
> index 1cbeb4169f9c0e..dd46d14fd3e605 100644
5422c5422
< index af8f67ba173ff..6d035e4157baf 100644
---
> index af8f67ba173ffb..6d035e4157baf3 100644
5462c5462
< index dd46d14fd3e60..594ebcab5a4b4 100644
---
> index dd46d14fd3e605..594ebcab5a4b4b 100644
5559c5559
< index 6d035e4157baf..efa6f1f464351 100644
---
> index 6d035e4157baf3..efa6f1f4643510 100644
5640c5640
< index 594ebcab5a4b4..0a010b52e33dd 100644
---
> index 594ebcab5a4b4b..0a010b52e33dd0 100644
5668c5668
< index efa6f1f464351..924c1225d19c2 100644
---
> index efa6f1f4643510..924c1225d19c2f 100644
5734c5734
< index 0a010b52e33dd..10bd15822b9b1 100644
---
> index 0a010b52e33dd0..10bd15822b9b1b 100644
5833c5833
< index 924c1225d19c2..8bfa30b9df14d 100644
---
> index 924c1225d19c2f..8bfa30b9df14d2 100644
5937c5937
< index 10bd15822b9b1..02e7cfcb80631 100644
---
> index 10bd15822b9b1b..02e7cfcb80631d 100644
6476c6476
< index f6bb5e8ec3eda..2b27a656b2679 100644
---
> index f6bb5e8ec3eda5..2b27a656b2679d 100644
6533c6533
< index 8bfa30b9df14d..0363c2017da2e 100644
---
> index 8bfa30b9df14d2..0363c2017da2eb 100644
6850c6850
< index 02e7cfcb80631..92815da084ce0 100644
---
> index 02e7cfcb80631d..92815da084ce04 100644
7550c7550
< index 0363c2017da2e..74baa9d5da21d 100644
---
> index 0363c2017da2eb..74baa9d5da21df 100644
7884c7884
< index 92815da084ce0..12ab620a8cdb7 100644
---
> index 92815da084ce04..12ab620a8cdb72 100644
7973c7973
< index 74baa9d5da21d..9aaacd2b21b09 100644
---
> index 74baa9d5da21df..9aaacd2b21b09e 100644
8033c8033
< index 12ab620a8cdb7..383e6ad2791dc 100644
---
> index 12ab620a8cdb72..383e6ad2791dc6 100644
8058c8058
< index 9aaacd2b21b09..7921eb322b83f 100644
---
> index 9aaacd2b21b09e..7921eb322b83fe 100644
8103c8103
< index ff69cf0fb42aa..303013c23f338 100644
---
> index ff69cf0fb42aab..303013c23f3385 100644
8134c8134
< index 383e6ad2791dc..9387823c2dde4 100644
---
> index 383e6ad2791dc6..9387823c2dde4e 100644
8156c8156
< index 73205afec1621..ae52623e43c8a 100644
---
> index 73205afec16211..ae52623e43c8ab 100644
8187c8187
< index fab07f0a46398..4e58e500c2a5f 100644
---
> index fab07f0a46398b..4e58e500c2a5fd 100644
8227c8227
< index e33f06bb66eb4..63715caeea8c5 100644
---
> index e33f06bb66eb43..63715caeea8c53 100644
8243c8243
< index 2b27a656b2679..58b69fa1cf5db 100644
---
> index 2b27a656b2679d..58b69fa1cf5dbf 100644
8273c8273
< index f6901ff97bbb5..2daad6c6bfb28 100644
---
> index f6901ff97bbb5b..2daad6c6bfb280 100644
8288c8288
< index 63715caeea8c5..71231321935e3 100644
---
> index 63715caeea8c53..71231321935e37 100644
8321c8321
< index 71231321935e3..1825779a0289f 100644
---
> index 71231321935e37..1825779a0289fb 100644
8397c8397
< index 1825779a0289f..2c647f4889cda 100644
---
> index 1825779a0289fb..2c647f4889cda9 100644
8428c8428
< index 2c647f4889cda..a822a5fc512b7 100644
---
> index 2c647f4889cda9..a822a5fc512b74 100644
8603c8603
< index a822a5fc512b7..9ce84fa807704 100644
---
> index a822a5fc512b74..9ce84fa8077043 100644
8694c8694
< index 9ce84fa807704..17d08f6e11acd 100644
---
> index 9ce84fa8077043..17d08f6e11acd9 100644
9090c9090
< index 0f1ca0b0db495..5008f0c2428f9 100644
---
> index 0f1ca0b0db495c..5008f0c2428f93 100644
9128c9128
< index 919e6cc049828..b93589f535e08 100644
---
> index 919e6cc0498281..b93589f535e08f 100644
9153c9153
< index bf0170782f258..6a71a2555f85c 100644
---
> index bf0170782f2585..6a71a2555f85ca 100644
9175c9175
< index e961fa27702ce..c0123d09f699c 100644
---
> index e961fa27702ce6..c0123d09f699c7 100644
9260c9260
< index a2201b2488c56..3b055d238584c 100644
---
> index a2201b2488c56c..3b055d238584cb 100644
9325c9325
< index 17d08f6e11acd..accd4d1e27f37 100644
---
> index 17d08f6e11acd9..accd4d1e27f379 100644
9363c9363
< index accd4d1e27f37..1308c534a7ad3 100644
---
> index accd4d1e27f379..1308c534a7ad38 100644
9759c9759
< index 5008f0c2428f9..0f1ca0b0db495 100644
---
> index 5008f0c2428f93..0f1ca0b0db495c 100644
9797c9797
< index b93589f535e08..919e6cc049828 100644
---
> index b93589f535e08f..919e6cc0498281 100644
9822c9822
< index 6a71a2555f85c..bf0170782f258 100644
---
> index 6a71a2555f85ca..bf0170782f2585 100644
9844c9844
< index c0123d09f699c..e961fa27702ce 100644
---
> index c0123d09f699c7..e961fa27702ce6 100644
9929c9929
< index 3b055d238584c..a2201b2488c56 100644
---
> index 3b055d238584cb..a2201b2488c56c 100644
10000c10000
< index 1308c534a7ad3..926e893f65276 100644
---
> index 1308c534a7ad38..926e893f652764 100644
10428c10428
< index 0f1ca0b0db495..5008f0c2428f9 100644
---
> index 0f1ca0b0db495c..5008f0c2428f93 100644
10466c10466
< index 919e6cc049828..b93589f535e08 100644
---
> index 919e6cc0498281..b93589f535e08f 100644
10491c10491
< index bf0170782f258..6a71a2555f85c 100644
---
> index bf0170782f2585..6a71a2555f85ca 100644
10513c10513
< index e961fa27702ce..c0123d09f699c 100644
---
> index e961fa27702ce6..c0123d09f699c7 100644
10598c10598
< index a2201b2488c56..3b055d238584c 100644
---
> index a2201b2488c56c..3b055d238584cb 100644
10677c10677
< index b843fcd365d28..8841c1487f004 100644
---
> index b843fcd365d286..8841c1487f0048 100644
10718c10718
< index 1f068dfdb140c..9e0bffe3fe5f5 100644
---
> index 1f068dfdb140c8..9e0bffe3fe5f52 100644
10822c10822
< index 0ba817e863465..367ac91723952 100644
---
> index 0ba817e863465b..367ac917239529 100644
11060c11060
< index 4b913dbb7d7b6..c97bc1149663b 100644
---
> index 4b913dbb7d7b6b..c97bc1149663b4 100644
11114c11114
< index f138b3be1646f..3c97231a5d948 100644
---
> index f138b3be1646f6..3c97231a5d9483 100644
11274c11274
< index 17e7e3145a058..4d2bab37712cc 100644
---
> index 17e7e3145a0583..4d2bab37712cc6 100644
11428c11428
< index 3c97231a5d948..feb4cf75fea94 100644
---
> index 3c97231a5d9483..feb4cf75fea94d 100644
11468c11468
< index feb4cf75fea94..aea90136a511e 100644
---
> index feb4cf75fea94d..aea90136a511e1 100644
11548c11548
< index 4d2bab37712cc..22066e339acd2 100644
---
> index 4d2bab37712cc6..22066e339acd2e 100644
11590c11590
< index aea90136a511e..0367f200762cb 100644
---
> index aea90136a511e1..0367f200762cb6 100644
11627c11627
< index 22066e339acd2..18a733a715a59 100644
---
> index 22066e339acd2e..18a733a715a590 100644
11662c11662
< index c97bc1149663b..111d68180a0d6 100644
---
> index c97bc1149663b4..111d68180a0d60 100644
11918c11918
< index 3bf0e893c07df..2a4daf64a5853 100644
---
> index 3bf0e893c07dfb..2a4daf64a58534 100644
11941c11941
< index 111d68180a0d6..fe09e5be79bdd 100644
---
> index 111d68180a0d60..fe09e5be79bddc 100644
11956c11956
< index 18a733a715a59..8ca6cd5561819 100644
---
> index 18a733a715a590..8ca6cd55618198 100644
12029c12029
< index a5352e5e2bd47..e357e1632dbf7 100644
---
> index a5352e5e2bd476..e357e1632dbf7f 100644
12171c12171
< index a8e1f2cfe12dc..be4d1aeef47b4 100644
---
> index a8e1f2cfe12dcd..be4d1aeef47b44 100644
12184c12184
< index 0367f200762cb..c79571406d98b 100644
---
> index 0367f200762cb6..c79571406d98bb 100644
12312c12312
< index 8ca6cd5561819..15edfe3ca4586 100644
---
> index 8ca6cd55618198..15edfe3ca45864 100644
12359c12359
< index fe09e5be79bdd..15d04a0ec6234 100644
---
> index fe09e5be79bddc..15d04a0ec62346 100644
12372c12372
< index c79571406d98b..e3bee9b9efab6 100644
---
> index c79571406d98bb..e3bee9b9efab60 100644
12412c12412
< index e3bee9b9efab6..24de860fa0ca3 100644
---
> index e3bee9b9efab60..24de860fa0ca3e 100644
12459c12459
< index 24de860fa0ca3..774f51c1f8a3b 100644
---
> index 24de860fa0ca3e..774f51c1f8a3b4 100644
12476c12476
< index 15edfe3ca4586..0ae1c6f40a5ad 100644
---
> index 15edfe3ca45864..0ae1c6f40a5ad9 100644
12519c12519
< index 774f51c1f8a3b..1dcd9679f3287 100644
---
> index 774f51c1f8a3b4..1dcd9679f32877 100644
12566c12566
< index 0ae1c6f40a5ad..61bf69d6451fb 100644
---
> index 0ae1c6f40a5ad9..61bf69d6451fbf 100644
12614c12614
< index 1dcd9679f3287..c2b01fa8514aa 100644
---
> index 1dcd9679f32877..c2b01fa8514aa6 100644
12651c12651
< index 7fd869520ef2c..fe9c6468e4401 100644
---
> index 7fd869520ef2cd..fe9c6468e44019 100644
12722c12722
< index c2b01fa8514aa..99350aa97c6fa 100644
---
> index c2b01fa8514aa6..99350aa97c6fa6 100644
12735c12735
< index 61bf69d6451fb..baf630a19e42d 100644
---
> index 61bf69d6451fbf..baf630a19e42d6 100644
12794c12794
< index 99350aa97c6fa..c534df9293c8b 100644
---
> index 99350aa97c6fa6..c534df9293c8bc 100644
12811c12811
< index baf630a19e42d..65facabdab950 100644
---
> index baf630a19e42d6..65facabdab9502 100644
12850c12850
< index 15d04a0ec6234..e0a8890a62e23 100644
---
> index 15d04a0ec62346..e0a8890a62e23a 100644
12979c12979
< index c534df9293c8b..989fced0a9784 100644
---
> index c534df9293c8bc..989fced0a97844 100644
13022c13022
< index e0a8890a62e23..3e2a31d8190eb 100644
---
> index e0a8890a62e23a..3e2a31d8190eba 100644
13039c13039
< index 989fced0a9784..1f33cd2b55622 100644
---
> index 989fced0a97844..1f33cd2b556226 100644
13076c13076
< index 3e2a31d8190eb..1795cd7e42ed7 100644
---
> index 3e2a31d8190eba..1795cd7e42ed73 100644
13098c13098
< index fe9c6468e4401..ef120475e7c61 100644
---
> index fe9c6468e44019..ef120475e7c618 100644
13114c13114
< index 1f33cd2b55622..16018d4c7e391 100644
---
> index 1f33cd2b556226..16018d4c7e3911 100644
13179c13179
< index 65facabdab950..43eabb29295b8 100644
---
> index 65facabdab9502..43eabb29295b87 100644
13213c13213
< index 1795cd7e42ed7..cfb433e920058 100644
---
> index 1795cd7e42ed73..cfb433e9200586 100644
13298c13298
< index 43eabb29295b8..098321741b311 100644
---
> index 43eabb29295b87..098321741b311e 100644
13337c13337
< index 16018d4c7e391..11fc1e6da8902 100644
---
> index 16018d4c7e3911..11fc1e6da89026 100644
13403c13403
< index 11fc1e6da8902..ecc76e9512c90 100644
---
> index 11fc1e6da89026..ecc76e9512c908 100644
13436c13436
< index ecc76e9512c90..43f0ff9ea3d40 100644
---
> index ecc76e9512c908..43f0ff9ea3d405 100644
13472c13472
< index 43f0ff9ea3d40..6aec61b1b3e30 100644
---
> index 43f0ff9ea3d405..6aec61b1b3e304 100644
13542c13542
< index cfb433e920058..68e807ae136ad 100644
---
> index cfb433e9200586..68e807ae136ad8 100644
13564c13564
< index 6aec61b1b3e30..65f39f1880a1d 100644
---
> index 6aec61b1b3e304..65f39f1880a1d3 100644
13584c13584
< index 098321741b311..0d3c1736ca8b0 100644
---
> index 098321741b311e..0d3c1736ca8b04 100644
13624c13624
< index 68e807ae136ad..b2bbc8a68b305 100644
---
> index 68e807ae136ad8..b2bbc8a68b3056 100644
13704c13704
< index b2bbc8a68b305..a42763e1429dc 100644
---
> index b2bbc8a68b3056..a42763e1429dc1 100644
13841c13841
< index ef120475e7c61..06cedfe4b4867 100644
---
> index ef120475e7c618..06cedfe4b4867a 100644
13900c13900
< index 65f39f1880a1d..5a3a622fc672f 100644
---
> index 65f39f1880a1d3..5a3a622fc672f3 100644
13916c13916
< index 0d3c1736ca8b0..88b9eca04447d 100644
---
> index 0d3c1736ca8b04..88b9eca04447db 100644
13997c13997
< index e357e1632dbf7..1b9bcc7f3b007 100644
---
> index e357e1632dbf7f..1b9bcc7f3b0077 100644
14009c14009
< index 2a4daf64a5853..580c55131eb59 100644
---
> index 2a4daf64a58534..580c55131eb59a 100644
14024c14024
< index 72e2553fbc984..8dbcf973d518b 100644
---
> index 72e2553fbc9849..8dbcf973d518ba 100644
14036c14036
< index e82931712d8a2..4000f56a4c606 100644
---
> index e82931712d8a2a..4000f56a4c606b 100644
14051c14051
< index 57a8e9564540e..9278b957c701b 100644
---
> index 57a8e9564540ee..9278b957c701b1 100644
14067c14067
< index dbc597ab46fb9..3154b8051c91f 100644
---
> index dbc597ab46fb9f..3154b8051c91fb 100644
14079c14079
< index a42763e1429dc..409e4256f6e7d 100644
---
> index a42763e1429dc1..409e4256f6e7d6 100644
14115c14115
< index 5a3a622fc672f..99797a8c836ac 100644
---
> index 5a3a622fc672f3..99797a8c836ac7 100644
14281c14281
< index 06238e6d7f5cd..038e1ae589c71 100644
---
> index 06238e6d7f5cda..038e1ae589c718 100644
14325c14325
< index 88b9eca04447d..59b456d069a78 100644
---
> index 88b9eca04447db..59b456d069a78e 100644
14386c14386
< index 06ab6066da61a..d68f6f2277223 100644
---
> index 06ab6066da61a8..d68f6f2277223e 100644
14442c14442
< index 1b9bcc7f3b007..98d314707b513 100644
---
> index 1b9bcc7f3b0077..98d314707b513b 100644
14500c14500
< index ed1e0c650bb1a..41e901cdf0762 100644
---
> index ed1e0c650bb1a8..41e901cdf07629 100644
14524c14524
< index 99797a8c836ac..54c1c5fe01ba9 100644
---
> index 99797a8c836ac7..54c1c5fe01ba9f 100644
14585c14585
< index 59b456d069a78..27ae19682b46c 100644
---
> index 59b456d069a78e..27ae19682b46c9 100644
14663c14663
< index 98d314707b513..eb0958dba33f6 100644
---
> index 98d314707b513b..eb0958dba33f6f 100644
14676c14676
< index 8dbcf973d518b..8d8ef85cbad57 100644
---
> index 8dbcf973d518ba..8d8ef85cbad57a 100644
14689c14689
< index 4000f56a4c606..3e74516af9c7b 100644
---
> index 4000f56a4c606b..3e74516af9c7b5 100644
14702c14702
< index 9278b957c701b..546bd6388b2eb 100644
---
> index 9278b957c701b1..546bd6388b2eb5 100644
14715c14715
< index 3154b8051c91f..72629cec1187f 100644
---
> index 3154b8051c91fb..72629cec1187f7 100644
14728c14728
< index 54c1c5fe01ba9..d1ae05bded15c 100644
---
> index 54c1c5fe01ba9f..d1ae05bded15c9 100644
14998c14998
< index 038e1ae589c71..0b6696b0d882f 100644
---
> index 038e1ae589c718..0b6696b0d882fa 100644
15047c15047
< index 27ae19682b46c..1892a8e1c9834 100644
---
> index 27ae19682b46c9..1892a8e1c9834e 100644
15147c15147
< index d1ae05bded15c..3b1b2f8eafe83 100644
---
> index d1ae05bded15c9..3b1b2f8eafe837 100644
15367c15367
< index 1892a8e1c9834..111e2d15965e3 100644
---
> index 1892a8e1c9834e..111e2d15965e35 100644
15408c15408
< index 3b1b2f8eafe83..fc387de5a0c75 100644
---
> index 3b1b2f8eafe837..fc387de5a0c752 100644
15488c15488
< index fc387de5a0c75..98b2ad54fc707 100644
---
> index fc387de5a0c752..98b2ad54fc7071 100644
15524c15524
< index 111e2d15965e3..3bba4a53a8e94 100644
---
> index 111e2d15965e35..3bba4a53a8e94b 100644
15558c15558
< index 98b2ad54fc707..fb64b35451f5a 100644
---
> index 98b2ad54fc7071..fb64b35451f5a9 100644
15642c15642
< index fb64b35451f5a..e1658030613f5 100644
---
> index fb64b35451f5a9..e1658030613f5c 100644
15692c15692
< index e1658030613f5..f9baca20b4383 100644
---
> index e1658030613f5c..f9baca20b43838 100644
15773c15773
< index f9baca20b4383..d5ddbce68fb77 100644
---
> index f9baca20b43838..d5ddbce68fb775 100644
15858c15858
< index 409e4256f6e7d..f1db63cc81981 100644
---
> index 409e4256f6e7d6..f1db63cc819812 100644
15880c15880
< index d5ddbce68fb77..27843e37d9b76 100644
---
> index d5ddbce68fb775..27843e37d9b769 100644
15899c15899
< index 3bba4a53a8e94..d6cd898100c43 100644
---
> index 3bba4a53a8e94b..d6cd898100c432 100644
15949c15949
< index 27843e37d9b76..cd0dc3f81d05f 100644
---
> index 27843e37d9b769..cd0dc3f81d05f0 100644
16013c16013
< index f1db63cc81981..4d42b1e4daa67 100644
---
> index f1db63cc819812..4d42b1e4daa67f 100644
16035c16035
< index cd0dc3f81d05f..8f5e466bd5823 100644
---
> index cd0dc3f81d05f0..8f5e466bd58239 100644
16055c16055
< index d6cd898100c43..562b2232c81ba 100644
---
> index d6cd898100c432..562b2232c81bad 100644
16111c16111
< index 3d5dc9dc1bfe5..709c4f149f6ec 100644
---
> index 3d5dc9dc1bfe51..709c4f149f6ec6 100644
16128c16128
< index 580c55131eb59..d4f3fd4c6aeb8 100644
---
> index 580c55131eb59a..d4f3fd4c6aeb85 100644
16141c16141
< index 1ac916b248917..ceaebf793909b 100644
---
> index 1ac916b248917c..ceaebf793909b3 100644
16154c16154
< index f667e7906d1f4..b08709715abd1 100644
---
> index f667e7906d1f4e..b08709715abd18 100644
16167c16167
< index 02cef0cea6572..0bf7105c8748b 100644
---
> index 02cef0cea6572b..0bf7105c8748b4 100644
16180c16180
< index 3e74516af9c7b..3c3c765de5116 100644
---
> index 3e74516af9c7b5..3c3c765de51169 100644
16193c16193
< index c12a6ac2d3840..3a8b9098b39ae 100644
---
> index c12a6ac2d38407..3a8b9098b39ae9 100644
16206c16206
< index b93589f535e08..5fbdba35472cb 100644
---
> index b93589f535e08f..5fbdba35472cb8 100644
16219c16219
< index 72629cec1187f..045524a7695ba 100644
---
> index 72629cec1187f7..045524a7695ba5 100644
16232c16232
< index 3143ecaaff862..f8ed093b7356e 100644
---
> index 3143ecaaff8628..f8ed093b7356eb 100644
16245c16245
< index 8f5e466bd5823..044a8c4875ba6 100644
---
> index 8f5e466bd58239..044a8c4875ba64 100644
16592c16592
< index b8980440d137f..1ea266f9a4d66 100644
---
> index b8980440d137f2..1ea266f9a4d669 100644
16605c16605
< index 562b2232c81ba..0750bed01acf7 100644
---
> index 562b2232c81bad..0750bed01acf78 100644
16719c16719
< index 4d42b1e4daa67..ee645d38e98d9 100644
---
> index 4d42b1e4daa67f..ee645d38e98d94 100644
16783c16783
< index 1ed2142a6e7bf..76ff7b17b6c1c 100644
---
> index 1ed2142a6e7bf0..76ff7b17b6c1cb 100644
16800c16800
< index d4f3fd4c6aeb8..160e8450a275a 100644
---
> index d4f3fd4c6aeb85..160e8450a275a1 100644
16813c16813
< index b39cd332751dc..de76fd27d2264 100644
---
> index b39cd332751dc8..de76fd27d2264c 100644
16826c16826
< index ee645d38e98d9..dd2b8f777f518 100644
---
> index ee645d38e98d94..dd2b8f777f5186 100644
16839c16839
< index 044a8c4875ba6..b6d7bc49ff6ef 100644
---
> index 044a8c4875ba64..b6d7bc49ff6ef4 100644
16888c16888
< index 0750bed01acf7..46c615b1c3f9b 100644
---
> index 0750bed01acf78..46c615b1c3f9b6 100644
16944c16944
< index 160e8450a275a..8043d9b92fac8 100644
---
> index 160e8450a275a1..8043d9b92fac81 100644
16957c16957
< index de76fd27d2264..175d7fa7954aa 100644
---
> index de76fd27d2264c..175d7fa7954aaa 100644
16970c16970
< index dd2b8f777f518..3c4f5a392b064 100644
---
> index dd2b8f777f5186..3c4f5a392b0646 100644
16991c16991
< index b6d7bc49ff6ef..682aebe96db78 100644
---
> index b6d7bc49ff6ef4..682aebe96db781 100644
17045c17045
< index 46c615b1c3f9b..28cd4a9f4aad8 100644
---
> index 46c615b1c3f9b6..28cd4a9f4aad8a 100644
17089c17089
< index 682aebe96db78..550492a7a031d 100644
---
> index 682aebe96db781..550492a7a031d7 100644
17127c17127
< index 550492a7a031d..b99d4e9ff1094 100644
---
> index 550492a7a031d7..b99d4e9ff10944 100644
17169c17169
< index b99d4e9ff1094..1abbcdf38430e 100644
---
> index b99d4e9ff10944..1abbcdf38430e8 100644
17228c17228
< index 1abbcdf38430e..8acbef7ae53d1 100644
---
> index 1abbcdf38430e8..8acbef7ae53d11 100644
17343c17343
< index 303013c23f338..48ee851b61d90 100644
---
> index 303013c23f3385..48ee851b61d904 100644
17356c17356
< index ae52623e43c8a..8069d57672d72 100644
---
> index ae52623e43c8ab..8069d57672d729 100644
17477c17477
< index 4411e6919a3df..7b6d9006306cf 100644
---
> index 4411e6919a3dfe..7b6d9006306cf9 100644
17492c17492
< index 0000000000000..373df80f41edf
---
> index 00000000000000..373df80f41edf6
18482c18482
< index 0000000000000..b7b3b3add1662
---
> index 00000000000000..b7b3b3add16627
18792c18792
< index 0000000000000..5be34f4821c59
---
> index 00000000000000..5be34f4821c59e
19346c19346
< index 0000000000000..51c9d61b67963
---
> index 00000000000000..51c9d61b67963d
19800c19800
< index 0000000000000..6dbbc4cfbe7e6
---
> index 00000000000000..6dbbc4cfbe7e6a
20288c20288
< index 0000000000000..bba7555dd3c64
---
> index 00000000000000..bba7555dd3c649
20395c20395
< index 0000000000000..d6483266d0c20
---
> index 00000000000000..d6483266d0c202
20631c20631
< index 0000000000000..3bccba394d00a
---
> index 00000000000000..3bccba394d00a4
20826c20826
< index 0000000000000..7ac4fa290f272
---
> index 00000000000000..7ac4fa290f2729
21115c21115
< index 0000000000000..83a5c95224934
---
> index 00000000000000..83a5c952249347
21242c21242
< index 0000000000000..fdd35249169fd
---
> index 00000000000000..fdd35249169fdb
24016c24016
< index 0000000000000..f3c1ed19f973f
---
> index 00000000000000..f3c1ed19f973f6
24183c24183
< index 0000000000000..33c87a59834ec
---
> index 00000000000000..33c87a59834ecf
25551c25551
< index 0000000000000..22448abde9923
---
> index 00000000000000..22448abde99232
26115c26115
< index 0000000000000..143fa35f2e746
---
> index 00000000000000..143fa35f2e746c
26718c26718
< index 0000000000000..25a5f2bba4457
---
> index 00000000000000..25a5f2bba44570
26853c26853
< index 0000000000000..5f7803b6fc48c
---
> index 00000000000000..5f7803b6fc48c7
30361c30361
< index 0000000000000..66438b1f331f6
---
> index 00000000000000..66438b1f331f69
30477c30477
< index 0000000000000..ff484506229fb
---
> index 00000000000000..ff484506229fb4
31996c31996
< index ddbbe187f0419..ad3d8284419ad 100644
---
> index ddbbe187f04195..ad3d8284419ad3 100644
32009c32009
< index 1f167b96acfbe..dbb6173fc10b3 100644
---
> index 1f167b96acfbe2..dbb6173fc10b32 100644
32022c32022
< index 0000000000000..55b40ad07f3b0
---
> index 00000000000000..55b40ad07f3b07
32051c32051
< index 0000000000000..15294719b09cb
---
> index 00000000000000..15294719b09cbe
32128c32128
< index a5b4e00217587..f9e69e86b033a 100644
---
> index a5b4e00217587c..f9e69e86b033ae 100644
32166c32166
< index 13d1078808bb5..38213a4527b16 100644
---
> index 13d1078808bb5f..38213a4527b165 100644
32200c32200
< index ff484506229fb..32fbcba3933b1 100644
---
> index ff484506229fb4..32fbcba3933b18 100644
32236c32236
< index fdd35249169fd..1ca4e6adc99aa 100644
---
> index fdd35249169fdb..1ca4e6adc99aa5 100644
32305c32305
< index f3c1ed19f973f..e6a2198b009b7 100644
---
> index f3c1ed19f973f6..e6a2198b009b76 100644
32353c32353
< index 36a76cbe90954..c010ad76f001a 100644
---
> index 36a76cbe90954f..c010ad76f001a0 100644
32370c32370
< index eef4786aaf862..8aa8f8cb7071e 100644
---
> index eef4786aaf862f..8aa8f8cb7071ef 100644
32440c32440
< index b79097b9070b3..b3772edca2e6e 100644
---
> index b79097b9070b38..b3772edca2e6e0 100644
32514c32514
< index dcbeeb68ca641..11de319ac6d90 100644
---
> index dcbeeb68ca6411..11de319ac6d90e 100644
32536c32536
< index 4e58e500c2a5f..482a7964b851c 100644
---
> index 4e58e500c2a5fd..482a7964b851c7 100644
32585c32585
< index 2daad6c6bfb28..df89fbd2d35cd 100644
---
> index 2daad6c6bfb280..df89fbd2d35cd6 100644
32616c32616
< index 880a4975507fc..e35e224e6303a 100644
---
> index 880a4975507fc1..e35e224e6303a2 100644
32647c32647
< index e5fc875990c4f..d5962a34c01d5 100644
---
> index e5fc875990c4f3..d5962a34c01d5f 100644
32676c32676
< index 3c3c765de5116..b59269db0ffa6 100644
---
> index 3c3c765de51169..b59269db0ffa65 100644
32698c32698
< index 6bd0634e2d580..e7942ac449c68 100644
---
> index 6bd0634e2d5805..e7942ac449c68c 100644
32720c32720
< index bc0df93f7f215..ba9b6e2b26363 100644
---
> index bc0df93f7f2156..ba9b6e2b263637 100644
32751c32751
< index 695d9308d1f08..06a58dad5f5cf 100644
---
> index 695d9308d1f08b..06a58dad5f5cf4 100644
32802c32802
< index 142d01415acb3..9169c26357d36 100644
---
> index 142d01415acb37..9169c26357d366 100644
32822c32822
< index 58b69fa1cf5db..83afab00e11f4 100644
---
> index 58b69fa1cf5dbf..83afab00e11f4d 100644
32857c32857
< index f804618f9bb73..f4c9827afc75e 100644
---
> index f804618f9bb730..f4c9827afc75ec 100644
32918c32918
< index 54f9f7db635ad..9db6e9808995c 100644
---
> index 54f9f7db635ad7..9db6e9808995c8 100644
32950c32950
< index f4c9827afc75e..1c0deb1e08242 100644
---
> index f4c9827afc75ec..1c0deb1e08242a 100644
32999c32999
< index 7921eb322b83f..e37871dcc0894 100644
---
> index 7921eb322b83fe..e37871dcc0894a 100644
33078c33078
< index 4b839f17f315a..4f6895096c704 100644
---
> index 4b839f17f315ab..4f6895096c7048 100644
33092c33092
< index eb09e86044c6d..e6a2a40daf289 100644
---
> index eb09e86044c6d4..e6a2a40daf289c 100644
33136c33136
< index 4ae996ce8d403..f20c7374e4d9e 100644
---
> index 4ae996ce8d4037..f20c7374e4d9ed 100644
33212c33212
< index be4d1aeef47b4..db7c1f8bc95b3 100644
---
> index be4d1aeef47b44..db7c1f8bc95b31 100644
33225c33225
< index 688ba358f5319..147bf1723bffd 100644
---
> index 688ba358f5319b..147bf1723bffdb 100644
33238c33238
< index e6a2a40daf289..c631a20069858 100644
---
> index e6a2a40daf289c..c631a200698582 100644
33262c33262
< index 1d2b4fb4bcf8b..7ebce549fb914 100644
---
> index 1d2b4fb4bcf8b7..7ebce549fb9144 100644
33275c33275
< index 16c539657f730..1b2951edc2607 100644
---
> index 16c539657f730c..1b2951edc26070 100644
33288c33288
< index be0ebed2a360f..449f5b9e6044b 100644
---
> index be0ebed2a360fd..449f5b9e6044bf 100644
33301c33301
< index 39cab4a55f572..51efdc107314f 100644
---
> index 39cab4a55f5728..51efdc107314fc 100644
33315c33315
< index 25639fbfd374a..c7fa26f45780d 100644
---
> index 25639fbfd374af..c7fa26f45780d5 100644
33328c33328
< index f982a827be7ca..73539e6bea94a 100644
---
> index f982a827be7ca0..73539e6bea94af 100644
33341c33341
< index 28062d682f436..3b01e86e71a12 100644
---
> index 28062d682f4367..3b01e86e71a123 100644
33354c33354
< index 5b6d1668f405c..99c4c37bc26b6 100644
---
> index 5b6d1668f405c6..99c4c37bc26b6f 100644
33367c33367
< index 5fbdba35472cb..bdb2c424640bb 100644
---
> index 5fbdba35472cb8..bdb2c424640bb9 100644
33380c33380
< index eb25eedb5ee00..fbc1352eb63a5 100644
---
> index eb25eedb5ee008..fbc1352eb63a56 100644
33393c33393
< index 3044ca948ce22..c259968a5b1ef 100644
---
> index 3044ca948ce22d..c259968a5b1ef3 100644
33406c33406
< index 6cbe1ab81abad..67345bafa3c89 100644
---
> index 6cbe1ab81abad7..67345bafa3c89b 100644
33419c33419
< index bd7003d6e0753..84e474eee5947 100644
---
> index bd7003d6e0753e..84e474eee59472 100644
33432c33432
< index b8d06d221c4a3..a940283870da7 100644
---
> index b8d06d221c4a31..a940283870da75 100644
33445c33445
< index 5fc55b9777cbf..f98c485243202 100644
---
> index 5fc55b9777cbf4..f98c485243202b 100644
33458c33458
< index e8c975b815859..9433a6bf6edf1 100644
---
> index e8c975b8158592..9433a6bf6edf14 100644
33471c33471
< index 0035affc3e590..314dbb5e7fbe6 100644
---
> index 0035affc3e590f..314dbb5e7fbe6f 100644
33484c33484
< index 0d8e6bd1ccbf2..a37224a2da538 100644
---
> index 0d8e6bd1ccbf20..a37224a2da538b 100644
33497c33497
< index 8a043235dad81..f0b4e3d3d57de 100644
---
> index 8a043235dad81f..f0b4e3d3d57ded 100644
33510c33510
< index c083a1d71cf4c..320a99e5a2bc8 100644
---
> index c083a1d71cf4c2..320a99e5a2bc88 100644
33534c33534
< index 6b5a512aace40..b7d5bca2eab63 100644
---
> index 6b5a512aace40d..b7d5bca2eab63f 100644
33851c33851
< index b7d5bca2eab63..dfa8bc88406b5 100644
---
> index b7d5bca2eab63f..dfa8bc88406b5c 100644
33900c33900
< index 2d1fe84f3dbbe..305aa67330961 100644
---
> index 2d1fe84f3dbbe0..305aa67330961b 100644
33916c33916
< index 0000000000000..d1afe81e433eb
---
> index 00000000000000..d1afe81e433eb1
33959c33959
< index a7b6ad12e2477..08e312aa205c3 100644
---
> index a7b6ad12e2477b..08e312aa205c37 100644
33998c33998
< index 5be34f4821c59..b299cdfbd22bd 100644
---
> index 5be34f4821c59e..b299cdfbd22bd9 100644
34040c34040
< index 55b40ad07f3b0..fdce7c1b2310f 100644
---
> index 55b40ad07f3b07..fdce7c1b2310ff 100644
34052c34052
< index b299cdfbd22bd..3326f800eb60c 100644
---
> index b299cdfbd22bd9..3326f800eb60c3 100644
34109c34109
< index fdce7c1b2310f..55b40ad07f3b0 100644
---
> index fdce7c1b2310ff..55b40ad07f3b07 100644
34121c34121
< index 3326f800eb60c..b299cdfbd22bd 100644
---
> index 3326f800eb60c3..b299cdfbd22bd9 100644
34163c34163
< index b299cdfbd22bd..4b336ddeb9050 100644
---
> index b299cdfbd22bd9..4b336ddeb9050b 100644
34205c34205
< index 32fbcba3933b1..b67abe02a3577 100644
---
> index 32fbcba3933b18..b67abe02a3577c 100644
34238c34238
< index 4b336ddeb9050..23953e9cb4f17 100644
---
> index 4b336ddeb9050b..23953e9cb4f17c 100644
34284c34284
< index 51c9d61b67963..c84c27dcc92c7 100644
---
> index 51c9d61b67963d..c84c27dcc92c7e 100644
34314c34314
< index 6dbbc4cfbe7e6..0f7c962440d3e 100644
---
> index 6dbbc4cfbe7e6a..0f7c962440d3e2 100644
34379c34379
< index 23953e9cb4f17..e8a42e74e693c 100644
---
> index 23953e9cb4f17c..e8a42e74e693c2 100644
34413c34413
< index c84c27dcc92c7..b68e8821d219c 100644
---
> index c84c27dcc92c7e..b68e8821d219cc 100644
34448c34448
< index b67abe02a3577..455a3152ce644 100644
---
> index b67abe02a3577c..455a3152ce6440 100644
34512c34512
< index b68e8821d219c..8ced04dad3a8d 100644
---
> index b68e8821d219cc..8ced04dad3a8df 100644
34558c34558
< index 8ced04dad3a8d..dc3e9c666b5bd 100644
---
> index 8ced04dad3a8df..dc3e9c666b5bd4 100644
34621c34621
< index 5f7803b6fc48c..e5a710f190d2a 100644
---
> index 5f7803b6fc48c7..e5a710f190d2a8 100644
34663c34663
< index dc3e9c666b5bd..2fdd671b38fd9 100644
---
> index dc3e9c666b5bd4..2fdd671b38fd9b 100644
34706c34706
< index e5a710f190d2a..a787f2fea33e9 100644
---
> index e5a710f190d2a8..a787f2fea33e98 100644
34763c34763
< index 1ca4e6adc99aa..1dcd271236dbb 100644
---
> index 1ca4e6adc99aa5..1dcd271236dbba 100644
34812c34812
< index 0f7c962440d3e..5251d8764e7d7 100644
---
> index 0f7c962440d3e2..5251d8764e7d7a 100644
34846c34846
< index 33c87a59834ec..181395e2859a9 100644
---
> index 33c87a59834ecf..181395e2859a96 100644
34878c34878
< index 455a3152ce644..9ceef8536e666 100644
---
> index 455a3152ce6440..9ceef8536e6668 100644
34915c34915
< index 9ceef8536e666..929fea7977e25 100644
---
> index 9ceef8536e6668..929fea7977e250 100644
34930c34930
< index 1dcd271236dbb..15be29ff46c39 100644
---
> index 1dcd271236dbba..15be29ff46c391 100644
34943c34943
< index a787f2fea33e9..d4bc652b34d5d 100644
---
> index a787f2fea33e98..d4bc652b34d5df 100644
34981c34981
< index d4bc652b34d5d..b3a51a6de5235 100644
---
> index d4bc652b34d5df..b3a51a6de5235e 100644
35013c35013
< index b3a51a6de5235..8ec66dd47db3d 100644
---
> index b3a51a6de5235e..8ec66dd47db3de 100644
35082c35082
< index 8ec66dd47db3d..7f16a4a14e9af 100644
---
> index 8ec66dd47db3de..7f16a4a14e9af4 100644
35190c35190
< index 181395e2859a9..fedf9627453fb 100644
---
> index 181395e2859a96..fedf9627453fb1 100644
35248c35248
< index 143fa35f2e746..c3c0ba744937d 100644
---
> index 143fa35f2e746c..c3c0ba744937da 100644
35278c35278
< index 7f16a4a14e9af..c126251c5ba7e 100644
---
> index 7f16a4a14e9af4..c126251c5ba7e1 100644
35325c35325
< index c3c0ba744937d..3be86ec383d6b 100644
---
> index c3c0ba744937da..3be86ec383d6b6 100644
35339c35339
< index 373df80f41edf..9d874ace4fc3c 100644
---
> index 373df80f41edf6..9d874ace4fc3c3 100644
35402c35402
< index 3be86ec383d6b..b0fc5b9ee8479 100644
---
> index 3be86ec383d6b6..b0fc5b9ee8479d 100644
35428c35428
< index 9d874ace4fc3c..4e1fd1212454d 100644
---
> index 9d874ace4fc3c3..4e1fd1212454df 100644
35478c35478
< index b0fc5b9ee8479..95a1c6c9f35e0 100644
---
> index b0fc5b9ee8479d..95a1c6c9f35e03 100644
35521c35521
< index e8a42e74e693c..03aa42119c9f8 100644
---
> index e8a42e74e693c2..03aa42119c9f80 100644
35533c35533
< index 2fdd671b38fd9..e388c0472ba78 100644
---
> index 2fdd671b38fd9b..e388c0472ba783 100644
35545c35545
< index c126251c5ba7e..e455e8445582a 100644
---
> index c126251c5ba7e1..e455e8445582a1 100644
35589c35589
< index fedf9627453fb..394e00bd75bb7 100644
---
> index fedf9627453fb1..394e00bd75bb7a 100644
35611c35611
< index d6483266d0c20..38f560864879c 100644
---
> index d6483266d0c202..38f560864879c5 100644
35653c35653
< index 3bccba394d00a..e43021cf6d458 100644
---
> index 3bccba394d00a4..e43021cf6d4587 100644
35678c35678
< index 95a1c6c9f35e0..3796a9eb22af2 100644
---
> index 95a1c6c9f35e03..3796a9eb22af2f 100644
35718c35718
< index e455e8445582a..9308596e08122 100644
---
> index e455e8445582a1..9308596e081226 100644
35769c35769
< index 394e00bd75bb7..857f3f11258aa 100644
---
> index 394e00bd75bb7a..857f3f11258aad 100644
35802c35802
< index 03aa42119c9f8..e142b8388b7bd 100644
---
> index 03aa42119c9f80..e142b8388b7bd1 100644
35821c35821
< index 9308596e08122..79ffcbc41d78e 100644
---
> index 9308596e081226..79ffcbc41d78e5 100644
35865c35865
< index 66438b1f331f6..3a30d2328b308 100644
---
> index 66438b1f331f69..3a30d2328b308d 100644
35900c35900
< index 929fea7977e25..e6c50c97b9c7d 100644
---
> index 929fea7977e250..e6c50c97b9c7d8 100644
35948c35948
< index 79ffcbc41d78e..9a0ff48f7061d 100644
---
> index 79ffcbc41d78e5..9a0ff48f7061d7 100644
36039c36039
< index 4e1fd1212454d..2d84c5920da04 100644
---
> index 4e1fd1212454df..2d84c5920da040 100644
36088c36088
< index 9a0ff48f7061d..463bcd3cf00f3 100644
---
> index 9a0ff48f7061d7..463bcd3cf00f35 100644
36133c36133
< index 8d8ef85cbad57..752fc5a21cb38 100644
---
> index 8d8ef85cbad57a..752fc5a21cb38b 100644
36152c36152
< index b59269db0ffa6..8247abee957e3 100644
---
> index b59269db0ffa65..8247abee957e30 100644
36165c36165
< index 045524a7695ba..b812e0b6f2dad 100644
---
> index 045524a7695ba5..b812e0b6f2dad6 100644
36178c36178
< index 15be29ff46c39..4a1219610c58f 100644
---
> index 15be29ff46c391..4a1219610c58f1 100644
36191c36191
< index 463bcd3cf00f3..c426a392b0811 100644
---
> index 463bcd3cf00f35..c426a392b08117 100644
36204c36204
< index 8acbef7ae53d1..e75ccf6ef9074 100644
---
> index 8acbef7ae53d11..e75ccf6ef90741 100644
36255c36255
< index 0b6696b0d882f..4c7be3a2cf4a3 100644
---
> index 0b6696b0d882fa..4c7be3a2cf4a3e 100644
36268c36268
< index 28cd4a9f4aad8..81e9d1568f2a3 100644
---
> index 28cd4a9f4aad8a..81e9d1568f2a33 100644
36303c36303
< index 4a1219610c58f..4d8b7ab7b06bf 100644
---
> index 4a1219610c58f1..4d8b7ab7b06bf8 100644
36352c36352
< index e6c50c97b9c7d..61f9d6b2348b9 100644
---
> index e6c50c97b9c7d8..61f9d6b2348b9c 100644
36400c36400
< index c426a392b0811..91a31b70c0375 100644
---
> index c426a392b08117..91a31b70c03752 100644
36413c36413
< index 2d84c5920da04..a68c56612e82d 100644
---
> index 2d84c5920da040..a68c56612e82d0 100644
36478c36478
< index 61f9d6b2348b9..fab2cf475fdfa 100644
---
> index 61f9d6b2348b9c..fab2cf475fdfa0 100644
36578c36578
< index 5251d8764e7d7..2d3529a0b156c 100644
---
> index 5251d8764e7d7a..2d3529a0b156c1 100644
36633c36633
< index bba7555dd3c64..7f6133a661274 100644
---
> index bba7555dd3c649..7f6133a6612743 100644
36654c36654
< index a68c56612e82d..5281a0c11ae7a 100644
---
> index a68c56612e82d0..5281a0c11ae7a9 100644
36722c36722
< index 857f3f11258aa..ef232c0c20493 100644
---
> index 857f3f11258aad..ef232c0c204932 100644
36748c36748
< index 4d8b7ab7b06bf..df12c85799035 100644
---
> index 4d8b7ab7b06bf8..df12c857990359 100644
36792c36792
< index e6a2198b009b7..10635cc8a94df 100644
---
> index e6a2198b009b76..10635cc8a94dfa 100644
36873c36873
< index 752fc5a21cb38..25216240899e9 100644
---
> index 752fc5a21cb38b..25216240899e9e 100644
36886c36886
< index 8247abee957e3..849709645af42 100644
---
> index 8247abee957e30..849709645af423 100644
36899c36899
< index b812e0b6f2dad..81ded687fe205 100644
---
> index b812e0b6f2dad6..81ded687fe205d 100644
36912c36912
< index df12c85799035..1eee95abcda72 100644
---
> index df12c857990359..1eee95abcda726 100644
36925c36925
< index 91a31b70c0375..42afdf0ddb7ec 100644
---
> index 91a31b70c03752..42afdf0ddb7ece 100644
36938c36938
< index e75ccf6ef9074..8d96907408643 100644
---
> index e75ccf6ef90741..8d969074086430 100644
36970c36970
< index 4c7be3a2cf4a3..07dfea037cad9 100644
---
> index 4c7be3a2cf4a3e..07dfea037cad91 100644
36983c36983
< index 81e9d1568f2a3..bdd3845e02c5b 100644
---
> index 81e9d1568f2a33..bdd3845e02c5bc 100644
37020c37020
< index ef232c0c20493..631f639b8b865 100644
---
> index ef232c0c204932..631f639b8b865a 100644
37141c37141
< index 42afdf0ddb7ec..0dbeebcf23b4f 100644
---
> index 42afdf0ddb7ece..0dbeebcf23b4f5 100644
37209c37209
< index fab2cf475fdfa..f0a259978c136 100644
---
> index fab2cf475fdfa0..f0a259978c136c 100644
37222c37222
< index 0dbeebcf23b4f..03a1febbb9b94 100644
---
> index 0dbeebcf23b4f5..03a1febbb9b94a 100644
37235c37235
< index 5281a0c11ae7a..2922d0d7f9bb6 100644
---
> index 5281a0c11ae7a9..2922d0d7f9bb60 100644
37285c37285
< index f0a259978c136..10bd86e028d32 100644
---
> index f0a259978c136c..10bd86e028d320 100644
37404c37404
< index 2922d0d7f9bb6..0199e788bb718 100644
---
> index 2922d0d7f9bb60..0199e788bb7184 100644
37465c37465
< index 1eee95abcda72..0b38db5f9fac7 100644
---
> index 1eee95abcda726..0b38db5f9fac73 100644
37512c37512
< index 03a1febbb9b94..42138b69c7042 100644
---
> index 03a1febbb9b94a..42138b69c70422 100644
37556c37556
< index 42138b69c7042..37d8a2d97c477 100644
---
> index 42138b69c70422..37d8a2d97c4773 100644

So, the contents are the same, just the indices have changed. Why? Probably because the repo has changed; the branch the commits are being pulled from is now linux-6.1-stan-rkr3-panthor, when it used to be rk-6.1-rkr3-panthor.

@gnull
Copy link
Contributor

gnull commented Dec 4, 2024 via email

@Naxdy
Copy link
Contributor

Naxdy commented Dec 4, 2024

Ah yes, of course. It definitely pays to be able to actually read 😅

That's weird though, could this be a GitHub change? It happening at the same time as the branch name change has me suspicious however...

@jsternberg
Copy link
Contributor Author

@Naxdy my guess is it's likely just a git change. Most likely a new commit happened that caused one of the two commits to no longer be unique enough so git automatically made the shortened hash longer so it referred to something unique. That would be my guess.

@gnull gnull mentioned this issue Dec 6, 2024
Draft
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Update the hash of hbiyik-panthor.patch gnull/nixos-rk3588
3 participants
@jsternberg @Naxdy @gnull