diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-17 10:55:02 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-07-17 10:55:02 -0400 |
| commit | 11713ce88bc88801866f15c63a6df881492b5098 (patch) | |
| tree | 5700513bcd04bac4755ac49419f113d67ba5b2fa /kdbus.patch | |
| parent | 1e20bc76b2447316e5d81dc246ef3129c4c048c5 (diff) | |
| download | kernel-11713ce88bc88801866f15c63a6df881492b5098.tar.gz kernel-11713ce88bc88801866f15c63a6df881492b5098.tar.xz kernel-11713ce88bc88801866f15c63a6df881492b5098.zip | |
Update kdbus patch
Latest upstream commit 748cf9547ea30f5a4dfee5e97d1d2ff4b307c392
Diffstat (limited to 'kdbus.patch')
| -rw-r--r-- | kdbus.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/kdbus.patch b/kdbus.patch index a37878c26..c37f76fda 100644 --- a/kdbus.patch +++ b/kdbus.patch @@ -49058,3 +49058,44 @@ index 64763ead693c..3520f45875df 100644 -- 2.4.3 +From 748cf9547ea30f5a4dfee5e97d1d2ff4b307c392 Mon Sep 17 00:00:00 2001 +From: David Herrmann <dh.herrmann@gmail.com> +Date: Thu, 16 Jul 2015 17:37:29 +0200 +Subject: [PATCH] kdbus: fix unused %docs make-targets + +The top-level Makefile re-routes all %docs targets to the Documentation +makefiles. The DocBook makefile supports a lot more targets than the kdbus +makefile, and it seems unreasonable to expect that both will always be in +sync. + +Therefore, add a fallback no-op target %docs: which is used for all +unspecified %docs targets. + +We will, from time to time, add further %docs targets that make sense +(like installdocs). But there is definitely no time pressure on those. +However, we really should add this fallback now, as otherwise "make" will +print errors due to unknown targets. + +Reported-by: Ulf Magnusson <ulfalizer.lkml@gmail.com> +Tested-by: Jim Davis <jim.epost@gmail.com> +Signed-off-by: David Herrmann <dh.herrmann@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + Documentation/kdbus/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Documentation/kdbus/Makefile b/Documentation/kdbus/Makefile +index af87641db416..8caffe565750 100644 +--- a/Documentation/kdbus/Makefile ++++ b/Documentation/kdbus/Makefile +@@ -38,3 +38,7 @@ mandocs: $(MANFILES) + htmldocs: $(HTMLFILES) + + clean-files := $(MANFILES) $(HTMLFILES) ++ ++# we don't support other %docs targets right now ++%docs: ++ @true +-- +2.4.3 + |