[Intel-xe] [drm-xe:oak/drm-evictable-lru 2911/3055] drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.

Jani Nikula jani.nikula at intel.com
Wed Nov 8 17:37:30 UTC 2023


On Wed, 08 Nov 2023, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
> On Wed, Nov 08, 2023 at 12:02:17PM +0200, Jani Nikula wrote:
>>On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
>>> On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>>>>On Tue, 07 Nov 2023, kernel test robot <yujie.liu at intel.com> wrote:
>>>>> tree:   https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
>>>>
>>>>Why do we have this stale branch? I don't think developers should push
>>>>their branches to xe/kernel.git but their own repos instead.
>>>
>>> agreed. I just blocked branch creation in gitlab so we don't have
>>> those accidents anymore.
>>
>>I was looking for this yesterday. For future reference, which knob is it
>>and where in the gitlab UI?
>
> Settings > Repository > Protected branches
>
> 	- "drm-xe-next" [default] [protected]
> 		- Allowed to merge: Maintainers
> 		- Allowed to push and merge: Developers + Maintainers, Maintainers
>
> 	"*" (12 matching branches)
> 		- Allowed to push and merge: No one 
> 		- Allowed to merge: No one

Right. I was close. I was looking at branch rules, and adding a branch
rule says, "To create a branch rule, you first need to create a
protected branch." but I didn't want to create a branch. Even under
protected branches it says, "Add protected branch", but I didn't want to
*add* branches, just prevent pushing. Oh well.

Thanks for doing this.

> I thought about creating a role to allow branch creation, but to keep it
> simple, I just blocked it. When/if we need it then we can temporarily
> disable the rule, like we do for force pushes when we rebase.

I'm not even sure you can add new roles in the free version.


BR,
Jani.

-- 
Jani Nikula, Intel


More information about the Intel-xe mailing list