Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced the Code of Conduct with the Code of Conflict #599

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

AshtonSnapp
Copy link

Due to the amount of controversy following the installation of the Code of Conduct, I am opening this pull request to replace it with the original Code of Conflict, to, as put by Joey Pabalinas, "Unfuck our Codes of Conduct", and to stop the controversy and drama (two things I never liked).

Removed the Code of Conduct.
Brought back the Code of Conflict.
@KernelPRBot
Copy link

Hi @AshtonSnapp!

Thanks for your contribution to the Linux kernel!

Linux kernel development happens on mailing lists, rather than on GitHub - this GitHub repository is a read-only mirror that isn't used for accepting contributions. So that your change can become part of Linux, please email it to us as a patch.

Sending patches isn't quite as simple as sending a pull request, but fortunately it is a well documented process.

Here's what to do:

  • Format your contribution according to kernel requirements
  • Decide who to send your contribution to
  • Set up your system to send your contribution as an email
  • Send your contribution and wait for feedback

How do I format my contribution?

The Linux kernel community is notoriously picky about how contributions are formatted and sent. Fortunately, they have documented their expectations.

Firstly, all contributions need to be formatted as patches. A patch is a plain text document showing the change you want to make to the code, and documenting why it is a good idea.

You can create patches with git format-patch.

Secondly, patches need 'commit messages', which is the human-friendly documentation explaining what the change is and why it's necessary.

Thirdly, changes have some technical requirements. There is a Linux kernel coding style, and there are licensing requirements you need to comply with.

Both of these are documented in the Submitting Patches documentation that is part of the kernel.

Note that you will almost certainly have to modify your existing git commits to satisfy these requirements. Don't worry: there are many guides on the internet for doing this.

Who do I send my contribution to?

The Linux kernel is composed of a number of subsystems. These subsystems are maintained by different people, and have different mailing lists where they discuss proposed changes.

If you don't already know what subsystem your change belongs to, the get_maintainer.pl script in the kernel source can help you.

get_maintainer.pl will take the patch or patches you created in the previous step, and tell you who is responsible for them, and what mailing lists are used. You can also take a look at the MAINTAINERS file by hand.

Make sure that your list of recipients includes a mailing list. If you can't find a more specific mailing list, then LKML - the Linux Kernel Mailing List - is the place to send your patches.

It's not usually necessary to subscribe to the mailing list before you send the patches, but if you're interested in kernel development, subscribing to a subsystem mailing list is a good idea. (At this point, you probably don't need to subscribe to LKML - it is a very high traffic list with about a thousand messages per day, which is often not useful for beginners.)

How do I send my contribution?

Use git send-email, which will ensure that your patches are formatted in the standard manner. In order to use git send-email, you'll need to configure git to use your SMTP email server.

For more information about using git send-email, look at the Git documentation or type git help send-email. There are a number of useful guides and tutorials about git send-email that can be found on the internet.

How do I get help if I'm stuck?

Firstly, don't get discouraged! There are an enormous number of resources on the internet, and many kernel developers who would like to see you succeed.

Many issues - especially about how to use certain tools - can be resolved by using your favourite internet search engine.

If you can't find an answer, there are a few places you can turn:

If you get really, really stuck, you could try the owners of this bot, @daxtens and @ajdlinux. Please be aware that we do have full-time jobs, so we are almost certainly the slowest way to get answers!

I sent my patch - now what?

You wait.

You can check that your email has been received by checking the mailing list archives for the mailing list you sent your patch to. Messages may not be received instantly, so be patient. Kernel developers are generally very busy people, so it may take a few weeks before your patch is looked at.

Then, you keep waiting. Three things may happen:

  • You might get a response to your email. Often these will be comments, which may require you to make changes to your patch, or explain why your way is the best way. You should respond to these comments, and you may need to submit another revision of your patch to address the issues raised.
  • Your patch might be merged into the subsystem tree. Code that becomes part of Linux isn't merged into the main repository straight away - it first goes into the subsystem tree, which is managed by the subsystem maintainer. It is then batched up with a number of other changes sent to Linus for inclusion. (This process is described in some detail in the kernel development process guide).
  • Your patch might be ignored completely. This happens sometimes - don't take it personally. Here's what to do:
    • Wait a bit more - patches often take several weeks to get a response; more if they were sent at a busy time.
    • Kernel developers often silently ignore patches that break the rules. Check for obvious violations of the Submitting Patches guidelines, the style guidelines, and any other documentation you can find about your subsystem. Check that you're sending your patch to the right place.
    • Try again later. When you resend it, don't add angry commentary, as that will get your patch ignored. It might also get you silently blacklisted.

Further information

Happy hacking!

This message was posted by a bot - if you have any questions or suggestions, please talk to my owners, @ajdlinux and @daxtens, or raise an issue at https://github.com/ajdlinux/KernelPRBot.

@SteveHeist
Copy link

I'd vote in favor of #594 - does the same thing

@0x0000F1
Copy link

@SteveHeist I would vote for anything that gets us back on track

@felipemullen
Copy link

yes, and #593

@ghost
Copy link

ghost commented Sep 27, 2018

I agree.
We have many people committing from different backgrounds all over the world, because of this people hold their own ideals. This could prevent a patch being made just because the committer holds ideals that conflicts with the CoC. Not to mention some people that make commits might not have a lot of social experience or may interpret things differently than others. Some people have a hard time distinguishing right from wrong, but should we be exiling or denying them just because we think something is right? If you want to be inclusive you want free flow of thought. The CoC imposes that gender, sex, race is relevant to committing to a open source project, but this counterproductive. If we just ignore the fact that we are different then people will treat each other the same not the other way around because by identifying with a group you create exclusiveness.

@felipemullen
Copy link

felipemullen commented Sep 27, 2018

@SilicaAndPina thanks for sharing that, it really opened my eyes...

Have the rest of you read the things CoralineAda say? I'm seriously at a loss for words. It's just pure hate and malice.

Is this what we are supposed to stand by? Because I won't. I choose to respect ALL people. Not a chosen inside group that aligns with my own world views.

fengguang pushed a commit to 0day-ci/linux that referenced this pull request Mar 15, 2021
This commit fixes the following checkpatch.pl errors:

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#307: FILE: ./include/rtw_mlme_ext.h:307:
    +	char* str;

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#313: FILE: ./include/rtw_mlme_ext.h:313:
    +	char* str;

    ERROR:POINTER_LOCATION: "foo *	bar" should be "foo *bar"
    torvalds#592: FILE: ./include/rtw_mlme_ext.h:592:
    +int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *	pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#595: FILE: ./include/rtw_mlme_ext.h:595:
    +void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie * pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#596: FILE: ./include/rtw_mlme_ext.h:596:
    +void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie * pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#599: FILE: ./include/rtw_mlme_ext.h:599:
    +void ERP_IE_handler(struct adapter *padapter, struct ndis_80211_var_ie * pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#606: FILE: ./include/rtw_mlme_ext.h:606:
    +void update_capinfo(struct adapter * Adapter, u16 updateCap);

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#633: FILE: ./include/rtw_mlme_ext.h:633:
    +void report_del_sta_event(struct adapter *padapter, unsigned char* MacAddr, unsigned short reason);

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#634: FILE: ./include/rtw_mlme_ext.h:634:
    +void report_add_sta_event(struct adapter *padapter, unsigned char* MacAddr, int cam_idx);

Signed-off-by: Marco Cesati <marcocesati@gmail.com>
fengguang pushed a commit to 0day-ci/linux that referenced this pull request Mar 16, 2021
This commit fixes the following checkpatch.pl errors:

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#307: FILE: ./include/rtw_mlme_ext.h:307:
    +	char* str;

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#313: FILE: ./include/rtw_mlme_ext.h:313:
    +	char* str;

    ERROR:POINTER_LOCATION: "foo *	bar" should be "foo *bar"
    torvalds#592: FILE: ./include/rtw_mlme_ext.h:592:
    +int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *	pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#595: FILE: ./include/rtw_mlme_ext.h:595:
    +void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie * pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#596: FILE: ./include/rtw_mlme_ext.h:596:
    +void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie * pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#599: FILE: ./include/rtw_mlme_ext.h:599:
    +void ERP_IE_handler(struct adapter *padapter, struct ndis_80211_var_ie * pIE);

    ERROR:POINTER_LOCATION: "foo * bar" should be "foo *bar"
    torvalds#606: FILE: ./include/rtw_mlme_ext.h:606:
    +void update_capinfo(struct adapter * Adapter, u16 updateCap);

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#633: FILE: ./include/rtw_mlme_ext.h:633:
    +void report_del_sta_event(struct adapter *padapter, unsigned char* MacAddr, unsigned short reason);

    ERROR:POINTER_LOCATION: "foo* bar" should be "foo *bar"
    torvalds#634: FILE: ./include/rtw_mlme_ext.h:634:
    +void report_add_sta_event(struct adapter *padapter, unsigned char* MacAddr, int cam_idx);

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marco Cesati <marcocesati@gmail.com>
Link: https://lore.kernel.org/r/20210315170618.2566-54-marcocesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Nov 1, 2022
Fixs two error:

"ERROR: do not use assignment in if condition
torvalds#130: FILE: io_uring/net.c:130:
+       if (!(issue_flags & IO_URING_F_UNLOCKED) &&

ERROR: do not use assignment in if condition
torvalds#599: FILE: io_uring/poll.c:599:
+       } else if (!(issue_flags & IO_URING_F_UNLOCKED) &&"
reported by checkpatch.pl in net.c and poll.c .

Signed-off-by: Xinghui Li <korantli@tencent.com>
akiernan pushed a commit to zuma-array/linux that referenced this pull request Nov 3, 2022
PD#151225: driver defect clean up:
torvalds#228
torvalds#262
torvalds#354
torvalds#407
torvalds#442
torvalds#445
torvalds#461
torvalds#576
torvalds#580
torvalds#598
torvalds#599
torvalds#615
torvalds#616
torvalds#671
torvalds#756
torvalds#760
torvalds#874

Change-Id: I1bc47c3e30ecfa1ca44e53f91201aa4e09ff19f5
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
akiernan pushed a commit to zuma-array/linux that referenced this pull request Nov 4, 2022
PD#151225: driver defect clean up:
torvalds#228
torvalds#262
torvalds#354
torvalds#407
torvalds#442
torvalds#445
torvalds#461
torvalds#576
torvalds#580
torvalds#598
torvalds#599
torvalds#615
torvalds#616
torvalds#671
torvalds#756
torvalds#760
torvalds#874

Change-Id: I1bc47c3e30ecfa1ca44e53f91201aa4e09ff19f5
Signed-off-by: Bencheng Jing <bencheng.jing@amlogic.com>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Jan 10, 2023
The hwnoise tool is a special mode for the osnoise top tool.

hwnoise dispatches the osnoise tracer and displays a summary of the noise.
The difference is that it runs the tracer with the OSNOISE_IRQ_DISABLE
option set, thus only allowing only hardware-related noise, resulting in
a simplified output. hwnoise has the same features of osnoise.

An example of the tool's output:

 # rtla hwnoise -c 1-11 -T 1 -d 10m -q
                                           Hardware-related Noise
 duration:   0 00:10:00 | time is in us
 CPU Period       Runtime        Noise  % CPU Aval   Max Noise   Max Single          HW          NMI
   1 torvalds#599       599000000          138    99.99997           3            3           4           74
   2 torvalds#599       599000000           85    99.99998           3            3           4           75
   3 torvalds#599       599000000           86    99.99998           4            3           6           75
   4 torvalds#599       599000000           81    99.99998           4            4           2           75
   5 torvalds#599       599000000           85    99.99998           2            2           2           75

Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jonathan Corbet <corbet@lwn.net>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Jan 31, 2023
The hwnoise tool is a special mode for the osnoise top tool.

hwnoise dispatches the osnoise tracer and displays a summary of the noise.
The difference is that it runs the tracer with the OSNOISE_IRQ_DISABLE
option set, thus only allowing only hardware-related noise, resulting in
a simplified output. hwnoise has the same features of osnoise.

An example of the tool's output:

 # rtla hwnoise -c 1-5 -T 1 -d 10m -q
                                           Hardware-related Noise
 duration:   0 00:10:00 | time is in us
 CPU Period       Runtime        Noise  % CPU Aval   Max Noise   Max Single          HW          NMI
   1 torvalds#599       599000000          138    99.99997           3            3           4           74
   2 torvalds#599       599000000           85    99.99998           3            3           4           75
   3 torvalds#599       599000000           86    99.99998           4            3           6           75
   4 torvalds#599       599000000           81    99.99998           4            4           2           75
   5 torvalds#599       599000000           85    99.99998           2            2           2           75

Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jonathan Corbet <corbet@lwn.net>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Feb 7, 2023
The hwnoise tool is a special mode for the osnoise top tool.

hwnoise dispatches the osnoise tracer and displays a summary of the noise.
The difference is that it runs the tracer with the OSNOISE_IRQ_DISABLE
option set, thus only allowing only hardware-related noise, resulting in
a simplified output. hwnoise has the same features of osnoise.

An example of the tool's output:

 # rtla hwnoise -c 1-11 -T 1 -d 10m -q
                                           Hardware-related Noise
 duration:   0 00:10:00 | time is in us
 CPU Period       Runtime        Noise  % CPU Aval   Max Noise   Max Single          HW          NMI
   1 torvalds#599       599000000          138    99.99997           3            3           4           74
   2 torvalds#599       599000000           85    99.99998           3            3           4           75
   3 torvalds#599       599000000           86    99.99998           4            3           6           75
   4 torvalds#599       599000000           81    99.99998           4            4           2           75
   5 torvalds#599       599000000           85    99.99998           2            2           2           75

Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jonathan Corbet <corbet@lwn.net>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Feb 15, 2023
The hwnoise tool is a special mode for the osnoise top tool.

hwnoise dispatches the osnoise tracer and displays a summary of the noise.
The difference is that it runs the tracer with the OSNOISE_IRQ_DISABLE
option set, thus only allowing only hardware-related noise, resulting in
a simplified output. hwnoise has the same features of osnoise.

An example of the tool's output:

 # rtla hwnoise -c 1-11 -T 1 -d 10m -q
                                           Hardware-related Noise
 duration:   0 00:10:00 | time is in us
 CPU Period       Runtime        Noise  % CPU Aval   Max Noise   Max Single          HW          NMI
   1 torvalds#599       599000000          138    99.99997           3            3           4           74
   2 torvalds#599       599000000           85    99.99998           3            3           4           75
   3 torvalds#599       599000000           86    99.99998           4            3           6           75
   4 torvalds#599       599000000           81    99.99998           4            4           2           75
   5 torvalds#599       599000000           85    99.99998           2            2           2           75

Link: https://lkml.kernel.org/r/2d6f49a6f3a4f8b51b2c806458b1cff71ad4d014.1675805361.git.bristot@kernel.org

Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Bagas Sanjaya <bagasdotme@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants