Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2018-10-13 07:05:16 +0200
committerKernel Build Daemon <kbuild@suse.de>2018-10-13 07:05:16 +0200
commit09415e8ea30d315b75e765bb89d4b7424f01de64 (patch)
tree94efd7c3c0728644cddac51104538efd6d279bc4
parentea9acd01b795755760c7331bbd7ae95f28931b25 (diff)
parent2624e2e94896a8946b30b29a637780c07cd9acc5 (diff)
Merge branch 'SLE15' into openSUSE-15.0rpm-4.12.14-lp150.12.22
-rw-r--r--README24
-rw-r--r--scripts/patch-tag-template2
2 files changed, 13 insertions, 13 deletions
diff --git a/README b/README
index f252cebc73..d7a29d1739 100644
--- a/README
+++ b/README
@@ -105,13 +105,13 @@ what the patch does, who wrote it, and who inside SUSE/Novell we'll
Patch-mainline: Never, <reason>
- * The patch should include a References: tag that identifies the
+ * The patch should include a References: tag that identifies the
Bugzilla bug number, FATE entry, etc. where the patch is discussed.
Please prefix bugzilla.novell.com bug numbers with bnc# and fate
feature numbers with fate#. Have a look at
http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations
for a full list of abbreviations.
-
+
* The patch header may (and often, should) include a more extensive
description of what the patch does, why, and how. The idea is to
allow others to quickly identify what each patch is about, and to
@@ -136,21 +136,21 @@ Example patch header:
| From: Peter Leckie <pleckie@sgi.com>
| References: SGI:PV986789 bnc#482148
| Subject: Clean up dquot pincount code
- | Patch-mainline: 2.6.28
- |
+ | Patch-mainline: v2.6.28
+ |
| Clean up dquot pincount code.
- |
+ |
| This is a code cleanup and optimization that removes a per mount point
| spinlock from the quota code and cleans up the code.
- |
+ |
| The patch changes the pincount from being an int protected by a spinlock
| to an atomic_t allowing the pincount to be manipulated without holding
| the spinlock.
- |
+ |
| This cleanup also protects against random wakup's of both the aild and
| xfssyncd by reevaluating the pincount after been woken. Two latter patches
| will address the Spurious wakeups.
- |
+ |
| Signed-off-by: Peter Leckie <pleckie@sgi.com>
| Acked-by: Jan Kara <jack@suse.cz>
@@ -167,7 +167,7 @@ required tags described in the section "Patch Headers", run
to insert an entry for a new patch file to the sorted section of series.conf.
-For more information, please read "scripts/git_sort/README.md".
+For more information, please read "scripts/git_sort/README.md".
Before You Commit -- Things To Check
====================================
@@ -235,10 +235,10 @@ example:
| -------------------------------------------------------------------
| Wed Dec 1 18:29:44 CET 2004 - agruen@suse.de
- |
+ |
| - patches.fixes/serialize-dgram-read.diff: Serialize dgram read
| using semaphore just like stream (#48427).
- |
+ |
There is a simple helper script for creating changelog entries in this
format (/work/src/bin/vc).
@@ -296,7 +296,7 @@ During kernel builds, two things related to the kernel ABI happen:
are added, but all previous symbols are still available: in this
case, all modules will continue to load into the new kernel just
fine.
-
+
If a reference symsets file (/boot/symsets-* in kernel-$FLAVOR
packages) for the particular architecture and flavor is available, we
check which of the symbol sets in the reference file can still be
diff --git a/scripts/patch-tag-template b/scripts/patch-tag-template
index 4d6650ca9e..353552327e 100644
--- a/scripts/patch-tag-template
+++ b/scripts/patch-tag-template
@@ -38,7 +38,7 @@ Acked-by:
# examples:
# Patch-mainline: never. fixes bugs in SUSE specific code
# Patch-mainline: submitted 2004-11-01
-# Patch-mainline: 2.6.10-rc1 any free form text is valid after the version
+# Patch-mainline: v2.6.10-rc1 any free form text is valid after the version
#
Patch-mainline: