We apply a functional renormalization-group technique to study the interplay of superconductivity and magnetism, including incommensurate magnetic order, in the two-dimensional Hubbard model. We first determine the phase diagram as a function of density at zero temperature and discuss how the onset temperature of superconductivity can evolve near half-filling by invoking the Kosterlitz-Thouless transition.