fs/jbd2/commit.c: net/bluetooth/smp.c: Fix Linux update merge errors