From: Linus Torvalds Date: Wed, 23 Sep 2009 17:11:26 +0000 (-0700) Subject: Merge branch 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~12437 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d19110baaf20d5183689287bdbcf91e26e40cb79;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86/ptrace-syscall-exit' of git://git./linux/kernel/git/frob/linux-2.6-roland * 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland: x86: ptrace: sysret path should reach syscall_trace_leave --- d19110baaf20d5183689287bdbcf91e26e40cb79