The conflict in #2 is due to the change 43711a479c1eb38a6c4836e31fddd5599aa95884 "bcache: fix high CPU occupancy during journal" which was applied as part of https://bugs.launchpad.net/bugs/1784665.
The conflict in #2 is due to the change 43711a479c1eb38 a6c4836e31fddd5 599aa95884 "bcache: fix high CPU occupancy during journal" which was applied as part of https:/ /bugs.launchpad .net/bugs/ 1784665.