QCD phase diagram from lattice

I will discuss recent lattice results on the QCD phase diagram at non-zero temperature and density using Taylor expansion. I will present results on the chiral and deconfinement aspects of the QCD transition as function of the light quark mass. I will clarify the relation of the phase transition at zero quark mass to the crossover and critical point at small densities and physical pion masses.