1. 25 May, 2022 1 commit
  2. 21 Apr, 2022 4 commits
  3. 13 Apr, 2022 1 commit
  4. 27 Jan, 2022 3 commits
    • Javier Martinez Canillas's avatar
      dim: Check that patches have git-format-patch default prefixes · 132510ea
      Javier Martinez Canillas authored and Daniel Vetter's avatar Daniel Vetter committed
      
      
      By default the git-format-patch command generates patches with prefixes
      for the source and destination (-p1), and is also what git-am uses as a
      default. The command strips the first leading path component when patch
      is applied (unless a different -p<num> argument is used).
      
      But the patch generating behaviour can be changed with git-format-patch
      --no-prefix argument (or setting 'diff.noprefix = true' in .gitconfig).
      
      Patches with no source and destination prefixes can confuse the git-am
      3-way merge logic, since stripping the first path component will lead
      to wrong paths for newly added files.
      
      To avoid this, check that patches to apply are using git-format-patch's
      defaults prefixes to make sure that git-am defaults are safe to use too.
      
      Since there are developers that generate patches without using git, make
      this an error but allow to still continue when using the dim -f option.
      Signed-off-by: Javier Martinez Canillas's avatarJavier Martinez Canillas <javierm@redhat.com>
      Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      132510ea
    • Daniel Vetter's avatar
      dim: Update drm-misc maintainer list · 0666fb79
      Daniel Vetter authored
      
      
      Way out of date.
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Cc: Lyude Paul <lyude@redhat.com>
      Cc: Thomas Zimmermann <tzimmermann@suse.de>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Maxime Ripard <mripard@kernel.org>
      Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@intel.com>
      0666fb79
    • Daniel Vetter's avatar
      dim: Caution more against topic branches · 74c11c32
      Daniel Vetter authored
      
      
      They're very often just beaurocratic paperwork pushing because
      maintainers refuse to give acks for merging patches through a single
      tree. I guess the snarky intro wasn't clear enough, so elaborate.
      
      Given that we don't even talk about topic branches anywhere else in
      the docs hopefully this makes things a bit clearer.
      
      v2: Fix typo (Maarten)
      Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Cc: Lyude Paul <lyude@redhat.com>
      Cc: Thomas Zimmermann <tzimmermann@suse.de>
      Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Cc: Maxime Ripard <mripard@kernel.org>
      Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@intel.com>
      74c11c32
  5. 14 Jan, 2022 1 commit
  6. 24 Nov, 2021 2 commits
  7. 11 Nov, 2021 1 commit
  8. 27 Oct, 2021 1 commit
  9. 17 Aug, 2021 1 commit
  10. 16 Aug, 2021 1 commit
  11. 13 Jul, 2021 2 commits
  12. 29 Apr, 2021 2 commits
  13. 18 Dec, 2020 1 commit
  14. 17 Dec, 2020 1 commit
  15. 15 Dec, 2020 1 commit
    • Simon Ser's avatar
      dim: fix handling of 8-bit non-UTF-8 messages · d79c5784
      Simon Ser authored and Daniel Vetter's avatar Daniel Vetter committed
      
      
      Python's open() function will return a file object that decodes input
      bytes to an UTF-8 string. Python assumes all files are UTF-8 by default
      (unless an explicit encoding param is passed).
      
      This works fine with 7-bit and UTF-8 messages. However, when a message
      uses a 8-bit Content-Transfer-Encoding and a non-UTF-8 charset (such as
      iso-8859-1), Python will error out.
      
      To prevent this, open the file in binary mode to prevent Python from
      doing any charset conversion under-the-hood.
      Signed-off-by: Simon Ser's avatarSimon Ser <contact@emersion.fr>
      Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      d79c5784
  16. 06 Dec, 2020 1 commit
  17. 25 Nov, 2020 1 commit
  18. 24 Nov, 2020 1 commit
  19. 20 Nov, 2020 1 commit
  20. 10 Nov, 2020 1 commit
    • Jani Nikula's avatar
      dim: change the drm-intel-next and drm-intel-next-queued process · c7b6928a
      Jani Nikula authored
      
      
      Remove the special casing of drm-intel-next/drm-intel-next-queued
      tagging and pull requests. Instead of having a two-step process for
      dinq, follow the same pull request process for all branches. As the
      first step, use drm-intel-next-queued for pull requests, and ignore
      drm-intel-next for now. The change is only relevant for maintainers.
      
      In the future, we'll want to switch from drm-intel-next-queued to
      drm-intel-next completely. This will need a flag day switch for all
      committers and maintainers.
      
      We also decouple driver date update from dinq pull requests. We may want
      to apply the driver date update to drm-intel-gt-next branch instead.
      
      With the change, we also lose the ability to add multiple drm-intel-next
      tags, and create a single pull request for them. In practice, we haven't
      really used this possibility, as it lacks the merging of the annotated
      tag changelogs together, missing information. We may want to resurrect
      the feature in an improved form in the future, generalized for all
      branches.
      
      Cc: Daniel Vetter <daniel@ffwll.ch>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
      Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: Jani Nikula's avatarJani Nikula <jani.nikula@intel.com>
      c7b6928a
  21. 26 Oct, 2020 3 commits
  22. 11 Sep, 2020 3 commits
  23. 10 Sep, 2020 1 commit
  24. 14 May, 2020 1 commit
  25. 31 Mar, 2020 1 commit
  26. 20 Dec, 2019 1 commit
  27. 19 Dec, 2019 1 commit
  28. 17 Dec, 2019 1 commit