Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aeabc6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '4.4-additional' of git://git.lwn.net/linux 

Pull more documentation updates from Jon Corbet:
 "A few more documentation patches that wandered in and have no reason
  to wait; these include some improvements to the suggestions for email
  clients and patch submission"

* tag '4.4-additional' of git://git.lwn.net/linux:
  Documentation: Add minimal Mutt config for using Gmail
  Documentation: Add note on sending files directly with Mutt
  Documentation: dontdiff: remove media from dontdiff
  Documentation/SubmittingPatches: discuss In-Reply-To
  Remove email address from Documentation/filesystems/overlayfs.txt
  can-doc: Add missing semicolon to example
parents be4773e6 91633a6d

Documentation/SubmittingPatches

+14 −1
Original line number Diff line number Diff line
@@ -718,8 +718,21 @@ generates appropriate diffstats by default.) 
See more details on the proper patch format in the following

references.



15) Explicit In-Reply-To headers

--------------------------------



It can be helpful to manually add In-Reply-To: headers to a patch

(e.g., when using "git send email") to associate the patch with

previous relevant discussion, e.g. to link a bug fix to the email with

the bug report.  However, for a multi-patch series, it is generally

best to avoid using In-Reply-To: to link to older versions of the

series.  This way multiple versions of the patch don't become an

unmanageable forest of references in email clients.  If a link is

helpful, you can use the https://lkml.kernel.org/ redirector (e.g., in

the cover email text) to link to an earlier version of the patch series.





15) Sending "git pull" requests

16) Sending "git pull" requests

-------------------------------



If you have a series of patches, it may be most convenient to have the

Documentation/dontdiff

+0 −1
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ mach-types.h 
machtypes.h

map

map_hugetlb

media

mconf

miboot*

mk_elfconfig

Documentation/email-clients.txt

+36 −0
Original line number Diff line number Diff line
@@ -176,11 +176,47 @@ To use 'vim' with mutt: 
if you want to include the patch inline.

(a)ttach works fine without "set paste".



You can also generate patches with 'git format-patch' and then use Mutt

to send them:

    $ mutt -H 0001-some-bug-fix.patch



Config options:

It should work with default settings.

However, it's a good idea to set the "send_charset" to:

  set send_charset="us-ascii:utf-8"



Mutt is highly customizable. Here is a minimum configuration to start

using Mutt to send patches through Gmail:



# .muttrc

# ================  IMAP ====================

set imap_user = 'yourusername@gmail.com'

set imap_pass = 'yourpassword'

set spoolfile = imaps://imap.gmail.com/INBOX

set folder = imaps://imap.gmail.com/

set record="imaps://imap.gmail.com/[Gmail]/Sent Mail"

set postponed="imaps://imap.gmail.com/[Gmail]/Drafts"

set mbox="imaps://imap.gmail.com/[Gmail]/All Mail"



# ================  SMTP  ====================

set smtp_url = "smtp://username@smtp.gmail.com:587/"

set smtp_pass = $imap_pass

set ssl_force_tls = yes # Require encrypted connection



# ================  Composition  ====================

set editor = `echo \$EDITOR`

set edit_headers = yes  # See the headers when editing

set charset = UTF-8     # value of $LANG; also fallback for send_charset

# Sender, email address, and sign-off line must match

unset use_domain        # because joe@localhost is just embarrassing

set realname = "YOUR NAME"

set from = "username@gmail.com"

set use_from = yes



The Mutt docs have lots more information:

    http://dev.mutt.org/trac/wiki/UseCases/Gmail

    http://dev.mutt.org/doc/manual.html



~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Pine (TUI)

Documentation/filesystems/overlayfs.txt

+2 −1
Original line number Diff line number Diff line 
Written by: Neil Brown <neilb@suse.de>

Written by: Neil Brown

Please see MAINTAINERS file for where to send questions.



Overlay Filesystem

==================

Documentation/networking/can.txt

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ solution for a couple of reasons: 
    addr.can_family = AF_CAN;

    addr.can_ifindex = ifr.ifr_ifindex;



    connect(s, (struct sockaddr *)&addr, sizeof(addr))

    connect(s, (struct sockaddr *)&addr, sizeof(addr));



    (..)