Skip to content
Snippets Groups Projects
  1. Mar 28, 2018
  2. Mar 21, 2018
  3. Mar 14, 2018
    • Jani Nikula's avatar
      qf: fix shellcheck warning · e1c07d8d
      Jani Nikula authored
      
      In qf line 411:
      git reset --hard $(git rev-parse --abbrev-ref @{u})
       ^-- SC1083: This { is literal. Check expression (missing ;/\n?) or quote it.
       ^-- SC1083: This } is literal. Check expression (missing ;/\n?) or quote it.
      
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Cc: Lucas De Marchi <lucas.demarchi@intel.com>
      Fixes: 0db98111 ("qf: Make qf_pull -f forcibly clean")
      Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      e1c07d8d
    • Jani Nikula's avatar
      dim: loosen some drm-intel checkpatch rules · d9d3c68f
      Jani Nikula authored
      
      Set max line length to 100. I don't want to silence the LONG_LINE
      warning altogether, and I'd still prefer to keep lines under 80
      characters, but I also don't want to see all the noise, and nor do I
      want to see silly code trying to arbitrarily squeeze under 80 when it
      doesn't make sense. 100 is a nice arbitrary round number... I hope
      review catches silly stuff regardless. Fingers crossed.
      
      BIT_MACRO. We have (1 << N) all over the place. I hope to switch to
      BIT() macro eventually, but this documents current use.
      
      PREFER_KERNEL_TYPES. We also have uint(8|16|32|64)_t all over the
      place. I also hope to move towards kernel types, but this documents
      current use.
      
      SPLIT_STRING, LONG_LINE_STRING. Don't nag about strings split to many
      lines, but also don't nag about strings not split.
      
      There's plenty more that could be tweaked, but let's start with
      something to improve the S/N ratio of the automated CI checkpatch
      reports. Now that we have --show-types included in the output, we can
      more easily discuss the ignores on a case-by-case basis.
      
      Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      d9d3c68f
    • Jani Nikula's avatar
      dim: add checkpatch profiles to allow different checkpatch options · 7044d10f
      Jani Nikula authored
      
      To reduce noise on CI checkpatch reports, we want to silence some
      checkpatch warnings. Different branches may end up having different
      rules, and users may want to get unfiltered results, so introduce
      checkpatch profiles. Add some placeholder profiles to be filled later
      on.
      
      The idea is that CI would run 'dim checkpatch HEAD^ drm-intel' (or some
      other commit range-ish as the case may be).
      
      Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      7044d10f
    • Jani Nikula's avatar
      dim: cleanup checkpatch_commit · 71e64784
      Jani Nikula authored
      
      Remove some old cruft. Pass checkpatch parameters via a variable. No
      functional changes.
      
      Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      71e64784
  4. Mar 13, 2018
    • Rodrigo Vivi's avatar
      qf: Actually allow qf rebase from a clean environment. · bf1cc8fe
      Rodrigo Vivi authored
      
      The intention of commit '663e7293 ("qf: Allow rebase
      function to start from anywhere.")' was to allow the
      qf rebase to start from anywhere, including from a place
      where not patch is yet applied with quilt.
      
      However pop -f was not the right answer for that.
      
      We need to make sure that qf pull provides a really clean
      environment so qf rebase can really work from scratch to
      all (-a) patches.
      
      The goal is that a simple
      qf pull -f && qf rebase drm-tip/drm-tip
      
      Always simply work to rebase from anywhere.
      
      v2: Implement this behavior only on -f is used to avoid losing work in
          progress (Daniel).
      v3: Rebased.
      
      Fixes: 663e7293 ("qf: Allow rebase function to start from anywhere.")
      Cc: Lucas De Marchi <lucas.demarchi@intel.com>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
      bf1cc8fe
    • Rodrigo Vivi's avatar
      qf: Make qf_pull -f forcibly clean · 0db98111
      Rodrigo Vivi authored
      
      qf_checkout implies that you need to have that baseline
      on your local repository, what it is not good for a distributed
      maintenance.
      
      Let's make qf pull -f useful for the case we want to start
      a clean rebase from anywhere.
      
      v2: Remove dubious comments and use -f.
      v3: Avoid git pull --ff-only breaking force so force with fetch
          and hard reset
      v4: Removed duplicated git fetch (Lucas).
      
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Cc: Michel Thierry <michel.thierry@intel.com>
      Cc: James Ausmus <james.ausmus@intel.com>
      Cc: Lucas De Marchi <lucas.demarchi@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
      0db98111
  5. Mar 08, 2018
    • Rodrigo Vivi's avatar
      qf: Add more wiggle helpers. · 9ebe5840
      Rodrigo Vivi authored
      
      When working with wiggle to easily solve rebasing
      conflicts we also need to be able to easily continue,
      easily see the impacted files and easily clean the
      repo to avoid ending up with many .rej and .porig files.
      
      v2: Remove -r from rm. (Lucas)
          Use -z instead of '== ""' comparison. (Lucas)
          Add documentation to the helpers. (Required by make check).
      
      Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
      Cc: Michel Thierry <michel.thierry@intel.com>
      Cc: James Ausmus <james.ausmus@intel.com>
      Cc: Lucas De Marchi <lucas.demarchi@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
      9ebe5840
  6. Mar 06, 2018
  7. Mar 05, 2018
  8. Mar 02, 2018
  9. Feb 27, 2018
  10. Feb 20, 2018
  11. Feb 07, 2018
  12. Feb 05, 2018
  13. Jan 31, 2018
  14. Jan 30, 2018
  15. Jan 29, 2018
  16. Jan 27, 2018
    • Rodrigo Vivi's avatar
      qf: Allow rebase function to start from anywhere. · 663e7293
      Rodrigo Vivi authored
      
      Like we now allow qf checkout to start from an unknown
      baseline we should also allow qf rebase.
      
      But also qf rebase only starts if there are already quilt
      patches applied, what doesn't make sense when you need to
      start a rebase from a clean machine.
      
      In reality what happens is that we are using checkout
      or manual quilt pushes to actually rebase the patches
      and the rebase function to only validate what we have
      done.
      
      By allowing the rebase to perform from anywhere we
      are actually fixing the meaning of rebase and making
      it more useful.
      
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
      663e7293
    • Rodrigo Vivi's avatar
      qf: Fetch all. · cfdec22c
      Rodrigo Vivi authored
      
      Usually when we are at the fetch stage we want to fetch
      all the related branches.
      
      v2: Fetch inside the patches directory only refresh
          the repos seeing from inside that dir what it is
          not what we want, so let's fetch all from the right
          directory.
      
      Cc: Lucas De Marchi <lucas.demarchi@intel.com>
      Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
      cfdec22c
  17. Jan 23, 2018
  18. Jan 17, 2018
  19. Jan 11, 2018
Loading