Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm docs pointer to freedesktop code of conduct.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJZC9tQAAoJEAx081l5xIa+/U0P/jWyFnnMQME/MIja10rhAIrU
 ThCX/nZY2MxVRJt+Lt1SbWyiBsZ6DJQXMRquup6Zh6GeHfiucFfNl02JrH1A0Xr6
 7NvF4loh8RsSXV71MDjtqMzvarvh+b/ZLIz3PhY/fvGyjH3eNB+pcMXv2sM/V7HN
 xx6/c4xHptue2ale1r2MirdGiZrXbWHTit58X+NOgaDb+21bpEgDoL3tiVtQcchv
 or4hu38JAflUAe1hNe0brtsyWyarrSrUQBNXbPVFe9vlG9MuG45FLNWj6mkDem67
 1rnaIbORcBttUXwkFGEOiomK+tiCMt2TzzVpAVHOM68R4rHhMbfYaxdVEbVqj3UH
 C0s2Ui5trq58C4wiTsQ1s1A7SJZGf7hqSM2M1Uu/jB/BzhAs1GL0Cn+qad7G1mzC
 wEoofLn2KU0KJCDOy+a+d2F989lfYazHmV44eiHffwsD8DSU22M15gILNSuo+1ki
 XfbkoGJw188UgySbHV8pAIoBWo+EaZ77n5b7lUHfBoRG5JzDa2QrNh9SND2DADNO
 DfRizlFFKIqqlfWLPamf6vDQ2ONRjr/OaV9XsACIjO2m0l1iZhngqhf60MldbEb/
 QRNuUXvF8CrV70Djo6wg0xyZcahYXhj/0nPDs+9DR7jNlLEOzrocLF8nzIoQp+WM
 ojHPhO7qokZtAOkYfdbC
 =5ENt
 -----END PGP SIGNATURE-----

Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux

Pull drm CoC pointer from Dave Airlie:
 "Small supplementary pull request. I didn't want anyone saying we snuck
  this in in a the middle of a big pile of changes, so here is a clearly
  separate pull request documenting the code of conduct introduced for
  freedesktop.org and how it relates to dri-devel community"

* tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux:
  drm: Document code of conduct
This commit is contained in:
Linus Torvalds 2017-05-05 17:30:44 -07:00
commit bdc713bf56
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/gpu/introduction.rst
View File

@ -85,3 +85,14 @@ This means that there's a blackout-period of about one month where feature work
can't be merged. The recommended way to deal with that is having a -next tree
that's always open, but making sure to not feed it into linux-next during the
blackout period. As an example, drm-misc works like that.
Code of Conduct
---------------
As a freedesktop.org project, dri-devel, and the DRM community, follows the
Contributor Covenant, found at: https://www.freedesktop.org/wiki/CodeOfConduct
Please conduct yourself in a respectful and civilised manner when
interacting with community members on mailing lists, IRC, or bug
trackers. The community represents the project as a whole, and abusive
or bullying behaviour is not tolerated by the project.