Rebase on the latest stable kernel. No changes were needed in the
downstream patches.

Signed-off-by: Sergio Lopez <slp@redhat.com>