merged kernel patch