* [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.
@ 2023-11-07 2:39 ` kernel test robot
0 siblings, 0 replies; 15+ messages in thread
From: kernel test robot @ 2023-11-06 20:48 UTC (permalink / raw)
To: oe-kbuild; +Cc: lkp
::::::
:::::: Manual check reason: "low confidence bisect report"
::::::
BCC: lkp@intel.com
CC: oe-kbuild-all@lists.linux.dev
CC: intel-xe@lists.freedesktop.org
TO: Jani Nikula <jani.nikula@intel.com>
CC: Rodrigo Vivi <rodrigo.vivi@intel.com>
tree: https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
:::::: branch date: 5 days ago
:::::: commit date: 8 weeks ago
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20231107/202311070416.8nPv4n6G-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
includecheck warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.
vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
8
> 9 #include <linux/mutex.h>
10 #include <linux/workqueue.h>
11
12 #include "intel_wakeref.h"
13 #include <linux/types.h>
14 #include <linux/bitops.h>
> 15 #include <linux/mutex.h>
16 #include <linux/workqueue.h>
17 #include "intel_runtime_pm.h"
18
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 15+ messages in thread
* [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.
@ 2023-11-07 2:39 ` kernel test robot
0 siblings, 0 replies; 15+ messages in thread
From: kernel test robot @ 2023-11-07 2:39 UTC (permalink / raw)
To: Jani Nikula; +Cc: Rodrigo Vivi, intel-xe, oe-kbuild-all
tree: https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <yujie.liu@intel.com>
| Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
includecheck warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.
vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
8
> 9 #include <linux/mutex.h>
10 #include <linux/workqueue.h>
11
12 #include "intel_wakeref.h"
13 #include <linux/types.h>
14 #include <linux/bitops.h>
> 15 #include <linux/mutex.h>
16 #include <linux/workqueue.h>
17 #include "intel_runtime_pm.h"
18
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 15+ messages in thread
* [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.
@ 2023-11-07 2:39 ` kernel test robot
0 siblings, 0 replies; 15+ messages in thread
From: kernel test robot @ 2023-11-07 2:39 UTC (permalink / raw)
To: Jani Nikula; +Cc: oe-kbuild-all, intel-xe, Rodrigo Vivi
tree: https://gitlab.freedesktop.org/drm/xe/kernel.git oak/drm-evictable-lru
head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <yujie.liu@intel.com>
| Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
includecheck warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.
vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
8
> 9 #include <linux/mutex.h>
10 #include <linux/workqueue.h>
11
12 #include "intel_wakeref.h"
13 #include <linux/types.h>
14 #include <linux/bitops.h>
> 15 #include <linux/mutex.h>
16 #include <linux/workqueue.h>
17 #include "intel_runtime_pm.h"
18
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
2023-11-07 2:39 ` [Intel-xe] " kernel test robot
@ 2023-11-07 8:41 ` Jani Nikula
-1 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2023-11-07 8:41 UTC (permalink / raw)
To: kernel test robot, Oak Zeng; +Cc: Rodrigo Vivi, intel-xe, oe-kbuild-all
On Tue, 07 Nov 2023, kernel test robot <yujie.liu@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.
BR,
Jani.
> head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
> commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
> compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <yujie.liu@intel.com>
> | Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
>
> includecheck warnings: (new ones prefixed by >>)
>>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.
>
> vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
>
> 8
> > 9 #include <linux/mutex.h>
> 10 #include <linux/workqueue.h>
> 11
> 12 #include "intel_wakeref.h"
> 13 #include <linux/types.h>
> 14 #include <linux/bitops.h>
> > 15 #include <linux/mutex.h>
> 16 #include <linux/workqueue.h>
> 17 #include "intel_runtime_pm.h"
> 18
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
@ 2023-11-07 8:41 ` Jani Nikula
0 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2023-11-07 8:41 UTC (permalink / raw)
To: kernel test robot, Oak Zeng; +Cc: oe-kbuild-all, intel-xe, Rodrigo Vivi
On Tue, 07 Nov 2023, kernel test robot <yujie.liu@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.
BR,
Jani.
> head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
> commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME: drm/i915: add a lot of includes in intel_display_power.h
> compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <yujie.liu@intel.com>
> | Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
>
> includecheck warnings: (new ones prefixed by >>)
>>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is included more than once.
>>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is included more than once.
>
> vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
>
> 8
> > 9 #include <linux/mutex.h>
> 10 #include <linux/workqueue.h>
> 11
> 12 #include "intel_wakeref.h"
> 13 #include <linux/types.h>
> 14 #include <linux/bitops.h>
> > 15 #include <linux/mutex.h>
> 16 #include <linux/workqueue.h>
> 17 #include "intel_runtime_pm.h"
> 18
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
2023-11-07 8:41 ` Jani Nikula
@ 2023-11-07 14:53 ` Zeng, Oak
-1 siblings, 0 replies; 15+ messages in thread
From: Zeng, Oak @ 2023-11-07 14:53 UTC (permalink / raw)
To: Nikula, Jani, Liu, Yujie
Cc: Vivi, Rodrigo, intel-xe@lists.freedesktop.org,
oe-kbuild-all@lists.linux.dev
> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Tuesday, November 7, 2023 3:42 AM
> To: Liu, Yujie <yujie.liu@intel.com>; Zeng, Oak <oak.zeng@intel.com>
> Cc: oe-kbuild-all@lists.linux.dev; intel-xe@lists.freedesktop.org; Vivi, Rodrigo
> <rodrigo.vivi@intel.com>
> Subject: Re: [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.
>
> On Tue, 07 Nov 2023, kernel test robot <yujie.liu@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.
Jani, I didn't know we are not allowed so. Branch deleted.
Oak
>
> BR,
> Jani.
>
>
> > head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
> > commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME:
> drm/i915: add a lot of includes in intel_display_power.h
> > compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
> >
> > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > the same patch/commit), kindly add following tags
> > | Reported-by: kernel test robot <yujie.liu@intel.com>
> > | Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
> >
> > includecheck warnings: (new ones prefixed by >>)
> >>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is
> included more than once.
> >>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is
> included more than once.
> >
> > vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
> >
> > 8
> > > 9 #include <linux/mutex.h>
> > 10 #include <linux/workqueue.h>
> > 11
> > 12 #include "intel_wakeref.h"
> > 13 #include <linux/types.h>
> > 14 #include <linux/bitops.h>
> > > 15 #include <linux/mutex.h>
> > 16 #include <linux/workqueue.h>
> > 17 #include "intel_runtime_pm.h"
> > 18
>
> --
> Jani Nikula, Intel
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [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.
@ 2023-11-07 14:53 ` Zeng, Oak
0 siblings, 0 replies; 15+ messages in thread
From: Zeng, Oak @ 2023-11-07 14:53 UTC (permalink / raw)
To: Nikula, Jani, Liu, Yujie
Cc: oe-kbuild-all@lists.linux.dev, intel-xe@lists.freedesktop.org,
Vivi, Rodrigo
> -----Original Message-----
> From: Nikula, Jani <jani.nikula@intel.com>
> Sent: Tuesday, November 7, 2023 3:42 AM
> To: Liu, Yujie <yujie.liu@intel.com>; Zeng, Oak <oak.zeng@intel.com>
> Cc: oe-kbuild-all@lists.linux.dev; intel-xe@lists.freedesktop.org; Vivi, Rodrigo
> <rodrigo.vivi@intel.com>
> Subject: Re: [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.
>
> On Tue, 07 Nov 2023, kernel test robot <yujie.liu@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.
Jani, I didn't know we are not allowed so. Branch deleted.
Oak
>
> BR,
> Jani.
>
>
> > head: d1f59526925ae851c6abf77af8ae6f8c3cffeebd
> > commit: 304baa8c20cfad330a6c7cad47d86043e968642c [2911/3055] FIXME:
> drm/i915: add a lot of includes in intel_display_power.h
> > compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
> >
> > If you fix the issue in a separate patch/commit (i.e. not just a new version of
> > the same patch/commit), kindly add following tags
> > | Reported-by: kernel test robot <yujie.liu@intel.com>
> > | Closes: https://lore.kernel.org/r/202311070416.8nPv4n6G-lkp@intel.com/
> >
> > includecheck warnings: (new ones prefixed by >>)
> >>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/mutex.h is
> included more than once.
> >>> drivers/gpu/drm/i915/display/intel_display_power.h: linux/workqueue.h is
> included more than once.
> >
> > vim +9 drivers/gpu/drm/i915/display/intel_display_power.h
> >
> > 8
> > > 9 #include <linux/mutex.h>
> > 10 #include <linux/workqueue.h>
> > 11
> > 12 #include "intel_wakeref.h"
> > 13 #include <linux/types.h>
> > 14 #include <linux/bitops.h>
> > > 15 #include <linux/mutex.h>
> > 16 #include <linux/workqueue.h>
> > 17 #include "intel_runtime_pm.h"
> > 18
>
> --
> Jani Nikula, Intel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
2023-11-07 8:41 ` Jani Nikula
@ 2023-11-07 16:24 ` Lucas De Marchi
-1 siblings, 0 replies; 15+ messages in thread
From: Lucas De Marchi @ 2023-11-07 16:24 UTC (permalink / raw)
To: Jani Nikula; +Cc: oe-kbuild-all, kernel test robot, intel-xe, Rodrigo Vivi
On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>On Tue, 07 Nov 2023, kernel test robot <yujie.liu@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.
Lucas De Marchi
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
@ 2023-11-07 16:24 ` Lucas De Marchi
0 siblings, 0 replies; 15+ messages in thread
From: Lucas De Marchi @ 2023-11-07 16:24 UTC (permalink / raw)
To: Jani Nikula
Cc: kernel test robot, Oak Zeng, Rodrigo Vivi, intel-xe,
oe-kbuild-all
On Tue, Nov 07, 2023 at 10:41:51AM +0200, Jani Nikula wrote:
>On Tue, 07 Nov 2023, kernel test robot <yujie.liu@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.
Lucas De Marchi
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
2023-11-07 16:24 ` Lucas De Marchi
@ 2023-11-08 10:02 ` Jani Nikula
-1 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2023-11-08 10:02 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: oe-kbuild-all, kernel test robot, intel-xe, Rodrigo Vivi
On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@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@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?
TIA,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
@ 2023-11-08 10:02 ` Jani Nikula
0 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2023-11-08 10:02 UTC (permalink / raw)
To: Lucas De Marchi
Cc: kernel test robot, Oak Zeng, Rodrigo Vivi, intel-xe,
oe-kbuild-all
On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@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@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?
TIA,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
2023-11-08 10:02 ` Jani Nikula
@ 2023-11-08 15:43 ` Lucas De Marchi
-1 siblings, 0 replies; 15+ messages in thread
From: Lucas De Marchi @ 2023-11-08 15:43 UTC (permalink / raw)
To: Jani Nikula; +Cc: Rodrigo Vivi, kernel test robot, intel-xe, oe-kbuild-all
On Wed, Nov 08, 2023 at 12:02:17PM +0200, Jani Nikula wrote:
>On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@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@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
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.
Lucas De Marchi
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
@ 2023-11-08 15:43 ` Lucas De Marchi
0 siblings, 0 replies; 15+ messages in thread
From: Lucas De Marchi @ 2023-11-08 15:43 UTC (permalink / raw)
To: Jani Nikula; +Cc: oe-kbuild-all, kernel test robot, intel-xe, Rodrigo Vivi
On Wed, Nov 08, 2023 at 12:02:17PM +0200, Jani Nikula wrote:
>On Tue, 07 Nov 2023, Lucas De Marchi <lucas.demarchi@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@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
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.
Lucas De Marchi
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
2023-11-08 15:43 ` Lucas De Marchi
@ 2023-11-08 17:37 ` Jani Nikula
-1 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2023-11-08 17:37 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: Rodrigo Vivi, kernel test robot, intel-xe, oe-kbuild-all
On Wed, 08 Nov 2023, Lucas De Marchi <lucas.demarchi@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@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@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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [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.
@ 2023-11-08 17:37 ` Jani Nikula
0 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2023-11-08 17:37 UTC (permalink / raw)
To: Lucas De Marchi; +Cc: oe-kbuild-all, kernel test robot, intel-xe, Rodrigo Vivi
On Wed, 08 Nov 2023, Lucas De Marchi <lucas.demarchi@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@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@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
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2023-11-08 17:37 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-06 20:48 [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 kernel test robot
2023-11-07 2:39 ` kernel test robot
2023-11-07 2:39 ` [Intel-xe] " kernel test robot
2023-11-07 8:41 ` Jani Nikula
2023-11-07 8:41 ` Jani Nikula
2023-11-07 14:53 ` [Intel-xe] " Zeng, Oak
2023-11-07 14:53 ` Zeng, Oak
2023-11-07 16:24 ` [Intel-xe] " Lucas De Marchi
2023-11-07 16:24 ` Lucas De Marchi
2023-11-08 10:02 ` Jani Nikula
2023-11-08 10:02 ` Jani Nikula
2023-11-08 15:43 ` Lucas De Marchi
2023-11-08 15:43 ` Lucas De Marchi
2023-11-08 17:37 ` Jani Nikula
2023-11-08 17:37 ` Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.