Revision - f65013d - Merge branch 'for-linus' of [...] - origin: https://github.com/torvalds/linux

visit type:

https://github.com/torvalds/linux

17 May 2024, 09:02:56 UTC

Revision f65013d655ac9639f37d3b54189f6468f672e60b authored by Linus Torvalds on 24 June 2017, 09:24:53 UTC, committed by Linus Torvalds on 24 June 2017, 09:24:53 UTC

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull timer fix from Eric Biederman:
 "This fixes an issue of confusing injected signals with the signals
  from posix timers that has existed since posix timers have been in the
  kernel.

  This patch is slightly simpler than my earlier version of this patch
  as I discovered in testing that I had misspelled "#ifdef
  CONFIG_POSIX_TIMERS". So I deleted that unnecessary test and made
  setting of resched_timer uncondtional.

  I have tested this and verified that without this patch there is a
  nasty hang that is easy to trigger, and with this patch everything
  works properly"

Thomas Gleixner dixit:
 "It fixes the problem at hand and covers the ptrace case as well, which
  I missed.

  Reviewed-and-tested-by: Thomas Gleixner <tglx@linutronix.de>"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal: Only reschedule timers on signals timers have sent

2 parent s 94a6df2 + 57db7e4

Files
Changes

Permalinks

Tip revision: f65013d655ac9639f37d3b54189f6468f672e60b authored by Linus Torvalds on 24 June 2017, 09:24:53 UTC
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Tip revision: f65013d

File	Mode	Size
Documentation
arch
block
certs
crypto
drivers
firmware
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
tools
usr
virt
.cocciconfig	-rw-r--r--	59 bytes
.get_maintainer.ignore	-rw-r--r--	31 bytes
.gitattributes	-rw-r--r--	30 bytes
.gitignore	-rw-r--r--	1.3 KB
.mailmap	-rw-r--r--	8.1 KB
COPYING	-rw-r--r--	18.3 KB
CREDITS	-rw-r--r--	96.2 KB
Kbuild	-rw-r--r--	2.2 KB
Kconfig	-rw-r--r--	252 bytes
MAINTAINERS	-rw-r--r--	397.7 KB
Makefile	-rw-r--r--	58.6 KB
README	-rw-r--r--	722 bytes

Showing with 0 additions and 0 deletions (0 / 0 diffs computed)

Computing file changes ...

https://github.com/torvalds/linux

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

README