[linux] 02/04: Drop another patch redundant with upstream changes

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 40f397ca1a5d22c69380bbb93ffa819c65cc591d
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Apr 20 00:16:12 2017 +0100

    Drop another patch redundant with upstream changes
---
 ...eevent-fix-use-of-uninitialized-variables.patch | 50 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch b/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
deleted file mode 100644
index a9f91a3..0000000
--- a/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sun, 20 Mar 2016 21:09:02 +0000
-Subject: tools lib traceevent: Fix use of uninitialized variables
-Forwarded: no
-
-Fix a number of correct warnings from gcc:
-
-> plugin_function.c:133:6: warning: 'index' may be used uninitialized in this function [-Wmaybe-uninitialized]
->   int index;
->       ^
-
-'index' is initialized only if indentation is wanted.  Move the
-printing of indentation using 'index' into the same if-statement.
-
-> kbuffer-parse.c: In function 'kbuffer_read_at_offset':
-> kbuffer-parse.c:632:9: warning: 'data' may be used uninitialized in this function [-Wmaybe-uninitialized]
->   return data;
->          ^
-
-'data' is not initialized if the offset is too small.  Initialize it
-to NULL so that the behaviour is the same as when the offset is too
-large.
-
-Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
----
-@@ -613,7 +614,7 @@ unsigned long long kbuffer_timestamp(str
- void *kbuffer_read_at_offset(struct kbuffer *kbuf, int offset,
- 			     unsigned long long *ts)
- {
--	void *data;
-+	void *data = NULL;
- 
- 	if (offset < kbuf->start)
- 		offset = 0;
---- a/tools/lib/traceevent/plugin_function.c
-+++ b/tools/lib/traceevent/plugin_function.c
-@@ -142,10 +142,10 @@ static int function_handler(struct trace
- 
- 	parent = pevent_find_function(pevent, pfunction);
- 
--	if (parent && ftrace_indent->set)
-+	if (parent && ftrace_indent->set) {
- 		index = add_and_get_index(parent, func, record->cpu);
--
--	trace_seq_printf(s, "%*s", index*3, "");
-+		trace_seq_printf(s, "%*s", index*3, "");
-+	}
- 
- 	if (func)
- 		trace_seq_printf(s, "%s", func);
diff --git a/debian/patches/series b/debian/patches/series
index 212f52f..27a2a8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -119,7 +119,6 @@ bugfix/all/tools-lib-lockdep-use-ldflags.patch
 bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch
 bugfix/alpha/alpha-uapi-add-support-for-__sane_userspace_types__.patch
 bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch
-bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch
 bugfix/all/cpupower-bump-soname-version.patch
 bugfix/all/cpupower-fix-checks-for-cpu-existence.patch
 bugfix/all/liblockdep-fix-undefined-symbol-prandom_u32.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git