kernel: Add ATM fixes pending upstream merge (queue reduction, race fixes)