merge rebased kernel