path: root/net/ipv4/tcp_timer.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-26 08:59:57 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-26 08:59:57 -0800
commitdb218549e65d1da181b2bfd3c362f58ffc12cf97 (patch)
tree87ab97ee2a8bc9e7c65233431d7165636c47fb4b /net/ipv4/tcp_timer.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff)
parentMerge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes (diff)
Merge tag 'drm-fixes-for-v4.15-rc10-2' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "A fairly urgent nouveau regression fix for broken irqs across suspend/resume came in. This was broken before but a patch in 4.15 has made it much more obviously broken and now s/r fails a lot more often. The fix removes freeing the irq across s/r which never should have been done anyways. Also two vc4 fixes for a NULL deference and some misrendering / flickering on screen" * tag 'drm-fixes-for-v4.15-rc10-2' of git://people.freedesktop.org/~airlied/linux: drm/nouveau: Move irq setup/teardown to pci ctor/dtor drm/vc4: Fix NULL pointer dereference in vc4_save_hang_state() drm/vc4: Flush the caches before the bin jobs, as well.
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions