On 09/23/16 09:23, Sean Paul wrote: > On Thu, Sep 22, 2016 at 2:04 PM, Jyri Sarha <jsarha@xxxxxx> wrote: >> On 09/22/16 09:18, Daniel Vetter wrote: >>> On Wed, Sep 21, 2016 at 06:36:28AM -0700, Sean Paul wrote: >>>> Also reorder alphabetically and fix up drm_flip_work header. >>>> >>>> Signed-off-by: Sean Paul <seanpaul@xxxxxxxxxxxx> >>> >>> Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx> >>> >> >> Picked this up. Thanks! >> > > Hi Jyri, > I already picked this up through drm-misc to preface Daniel's clean-up > patch series. > > Could you drop this from your tree and we'll take it through -misc? > Argh I sent the pull request already. However, Dave has not pulled it yet, so I'll make another and ask him the ignore one with your patch. BR, Jyri > Sean > > >> Best regards, >> Jyri >> >>>> --- >>>> drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 ++++-- >>>> 1 file changed, 4 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c >>>> index 2087689..cb9df10 100644 >>>> --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c >>>> +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c >>>> @@ -15,9 +15,11 @@ >>>> * this program. If not, see <http://www.gnu.org/licenses/>. >>>> */ >>>> >>>> -#include "drm_flip_work.h" >>>> -#include <drm/drm_plane_helper.h> >>>> +#include <drm/drm_atomic.h> >>>> #include <drm/drm_atomic_helper.h> >>>> +#include <drm/drm_crtc.h> >>>> +#include <drm/drm_flip_work.h> >>>> +#include <drm/drm_plane_helper.h> >>>> >>>> #include "tilcdc_drv.h" >>>> #include "tilcdc_regs.h" >>>> -- >>>> 2.8.0.rc3.226.g39d4020 >>>> >>> >> _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
