diff options
author | 2016-12-15 13:41:55 -0800 | |
---|---|---|
committer | 2016-12-15 13:41:55 -0800 | |
commit | 5e176d6973bdac04d9f298ca384c39f08eb084cb (patch) | |
tree | 3b6b3bce93a3db23eb2925b8b32b69d49561a0b1 /kernel/trace/trace.c | |
parent | Merge tag 'upstream-4.10-rc1' of git://git.infradead.org/linux-ubifs (diff) | |
parent | orangefs: Axe some dead code (diff) | |
download | linux-dev-5e176d6973bdac04d9f298ca384c39f08eb084cb.tar.xz linux-dev-5e176d6973bdac04d9f298ca384c39f08eb084cb.zip |
Merge tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs updates from Mike Marshall:
"Two small fixes sent in by other developers:
- axe some dead code (Christophe Jaillet)
- fix memory leak (Colin Ian King, found by Coverity)"
* tag 'for-linus-4.10-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
orangefs: Axe some dead code
orangefs: fix memory leak of string 'new' on exit path
Diffstat (limited to 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions