[PATCH 1/2] docs: add patching process to howto-contribute.txt

[PATCH 1/2] docs: add patching process to howto-contribute.txt

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Documentation/howto-contribute.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt
index f0b64ef..5f4531e 100644
--- a/Documentation/howto-contribute.txt
+++ b/Documentation/howto-contribute.txt
@@ -88,6 +88,29 @@ Coding style
 	  something is not quite right, and you are unwilling to fix the
 	  issue.
 
+Patching process
+
+	* Tell in mail list when you are going to work with some particular
+	  piece of code for long time.  This helps other to avoid massive
+	  merge conflicts.  Small or quick work does not need to be
+	  announced.
+
+	* Submit only changes that you think are ready to merge.  If you only
+	  want change review tell your intention clearly in change cover
+	  letter, and/or in each patch subject to review-only.
+
+	* When getting comments align the changes with them.  Resubmission
+	  without changes is as good as ignoring advice, and is neither
+	  recommended nor polite.
+
+	* Resubmission can be partial or complete.  If only few alterations
+	  are needed here and there resubmit particular patches.  When
+	  comments cause greater effect resubmit everything again.
+
+	* All patch submissions, big or small, are either commented, reject,
+	  or merge.  When maintainer rejects a patch (series) it is pointless
+	  to resubmit.
+
 Various notes
 
 	* The util-linux does not use kernel headers for file system super
-- 
1.8.4.2

[PATCH 2/2] docs: update links to http://git.kernel.org/ web repository views

[Sami Kerola]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Documentation/howto-contribute.txt | 2 +-
 README                             | 2 +-
 include/blkdev.h                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt
index 5f4531e..a638a1d 100644
--- a/Documentation/howto-contribute.txt
+++ b/Documentation/howto-contribute.txt
@@ -82,7 +82,7 @@ Coding style
 	* the preferred coding style is based on the linux kernel
 	  Documentation/CodingStyle. For more details see:
 
-	  http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/CodingStyle
+	  http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/CodingStyle
 
 	* Use `FIXME:' and a good description if want to inform others
 	  something is not quite right, and you are unwilling to fix the
diff --git a/README b/README
index 6dc5199..431c81b 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ DOWNLOAD:
 SOURCE CODE:
 
       Web interface:
-          http://git.kernel.org/?p=utils/util-linux/util-linux.git
+          http://git.kernel.org/cgit/utils/util-linux/util-linux.git
           https://github.com/karelzak/util-linux
       Checkout:
           git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util-linux
diff --git a/include/blkdev.h b/include/blkdev.h
index ade0887..5a5777b 100644
--- a/include/blkdev.h
+++ b/include/blkdev.h
@@ -122,7 +122,7 @@ int blkdev_is_cdrom(int fd);
 int blkdev_get_geometry(int fd, unsigned int *h, unsigned int *s);
 
 /* SCSI device types.  Copied almost as-is from kernel header.
- * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=include/scsi/scsi.h */
+ * http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/scsi/scsi.h */
 #define SCSI_TYPE_DISK			0x00
 #define SCSI_TYPE_TAPE			0x01
 #define SCSI_TYPE_PRINTER		0x02
-- 
1.8.4.2

Re: [PATCH 1/2] docs: add patching process to howto-contribute.txt

[Karel Zak]

On Sun, Nov 10, 2013 at 08:06:09PM +0000, Sami Kerola wrote:
>  Documentation/howto-contribute.txt | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)

 Applied, thanks.

    Karel

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

Re: [PATCH 2/2] docs: update links to http://git.kernel.org/ web repository views

[Karel Zak]

On Sun, Nov 10, 2013 at 08:06:10PM +0000, Sami Kerola wrote:
>  Documentation/howto-contribute.txt | 2 +-
>  README                             | 2 +-
>  include/blkdev.h                   | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com