There was a bit of a delta in an if-statement here which required manual adjusting to fit this patch in. I took the if statement from the patch.
* "x86: cpufeatures: Sort feature word 7"
This required some manual offset adjustments due to the differences in what the patch context expected (just the stuff around the hunks were in different orders.
The following patches were already applied:
* "block: blk_init_allocated_queue() set q->fq as NULL in the fail case"
* "x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations"
The following patches required some backporting:
* "tcp: be more careful in tcp_fragment()"
There was a bit of a delta in an if-statement here which required manual adjusting to fit this patch in. I took the if statement from the patch.
* "x86: cpufeatures: Sort feature word 7"
This required some manual offset adjustments due to the differences in what the patch context expected (just the stuff around the hunks were in different orders.
The following patches were already applied:
* "block: blk_init_ allocated_ queue() set q->fq as NULL in the fail case"
* "x86/speculation: Prepare entry code for Spectre v1 swapgs mitigations"
* "x86/speculation: Enable Spectre v1 swapgs mitigations"
* "x86/entry/64: Use JMP instead of JMPQ"
* "x86/speculatio n/swapgs: Exclude ATOMs from speculation through SWAPGS"