PRs introducing changes also performed later in `geth`. Reverting their commits before merging the upstream branch will avoid conflicts. 1. #110 is 2e8e35f2ada60e8e90aff8f6374ea7cd7da16116 2. #155 3. #156 4. #187 individual commits, as appropriate. 5. #191 (i.e. commit ab5ad25dc3aadfa034c1274e2b8bac16ab3441c5) 6. The cherry-picked commit of #194 (but not the required linter fix in the same PR). 7. #199 8. #214 9. #232 10. #243 11. #270 12. #280
PRs introducing changes also performed later in
geth. Reverting their commits before merging the upstream branch will avoid conflicts.BlockmethodWithBody(Body)signature #110 is 2e8e35fmemsize#155go@1.23#156main#187 individual commits, as appropriate.