block: cfq: merge tweaked tunables.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
kernel/return_address.c: hide warning

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>