[GIT PULL] Block fixes for 4.3-rc2

Hi Linus, This is a bit bigger than it should be, but I could (did) not want to send it off last week due to both wanting extra testing, and expecting a fix for the bounce regression as well. In any case, this pull request contains: - Fix for the blk-merge.c compilation warning on gcc 5.x from

[GIT PULL] Block fixes for 4.3-rc2

Hi Linus, This is a bit bigger than it should be, but I could (did) not want to send it off last week due to both wanting extra testing, and expecting a fix for the bounce regression as well. In any case, this pull request contains: - Fix for the blk-merge.c compilation warning on gcc 5.x from