diff options
| author | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 13:12:58 -0300 |
|---|---|---|
| committer | Daiane Angolini <daiane.angolini@foundries.io> | 2022-10-05 13:12:58 -0300 |
| commit | 647349ddd965581cfe15669eefb09931e6269694 (patch) | |
| tree | 7a97a9005bbb9992ea57e090e1391129ccb83291 /scripts | |
| parent | 8c8464177402c32a21546530426e4995ab21c510 (diff) | |
| parent | 7d8048d4e064d4ef7719e9520f6c123c051fca99 (diff) | |
Merge tag 'v5.15.58' into 5.15-2.1.x-imx
This is the 5.15.58 stable release
Conflicts:
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
Signed-off-by: Daiane Angolini <daiane.angolini@foundries.io>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/sorttable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/sorttable.c b/scripts/sorttable.c index 6ee4fa882919..278bb53b325c 100644 --- a/scripts/sorttable.c +++ b/scripts/sorttable.c @@ -240,7 +240,7 @@ static void x86_sort_relative_table(char *extab_image, int image_size) w(r(loc) + i, loc); w(r(loc + 1) + i + 4, loc + 1); - w(r(loc + 2) + i + 8, loc + 2); + /* Don't touch the fixup type */ i += sizeof(uint32_t) * 3; } @@ -253,7 +253,7 @@ static void x86_sort_relative_table(char *extab_image, int image_size) w(r(loc) - i, loc); w(r(loc + 1) - (i + 4), loc + 1); - w(r(loc + 2) - (i + 8), loc + 2); + /* Don't touch the fixup type */ i += sizeof(uint32_t) * 3; } |