[PATCH AUTOSEL 4.19 136/237] block: fix the DISCARD request merge