diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-09 09:03:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-09 09:03:51 -0700 |
| commit | 5b50be743f495b000891d430ecba7372cc59bb64 (patch) | |
| tree | a6559ebf1669bc76494a9f5722d19868407eb539 /Documentation | |
| parent | 62e1fd08ede3ea2af25b3aa5f81c6c525bac2ce3 (diff) | |
| parent | 27f395b857abee5bced8356d39e1a491ff08748a (diff) | |
Merge tag 'driver-core-4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are 3 small fixes for 4.11-rc6.
One resolves a reported issue with sysfs files that NeilBrown found,
one is a documenatation fix for the stable kernel rules, and the last
is a small MAINTAINERS file update for kernfs"
* tag 'driver-core-4.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
MAINTAINERS: separate out kernfs maintainership
sysfs: be careful of error returns from ops->show()
Documentation: stable-kernel-rules: fix stable-tag format
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/process/stable-kernel-rules.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/process/stable-kernel-rules.rst b/Documentation/process/stable-kernel-rules.rst index 11ec2d93a5e0..61e9c78bd6d1 100644 --- a/Documentation/process/stable-kernel-rules.rst +++ b/Documentation/process/stable-kernel-rules.rst @@ -124,7 +124,7 @@ specified in the following format in the sign-off area: .. code-block:: none - Cc: <stable@vger.kernel.org> # 3.3.x- + Cc: <stable@vger.kernel.org> # 3.3.x The tag has the meaning of: |