diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-01 08:45:27 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-01 08:45:27 +1000 |
| commit | 52b679f60e2a68af88411f12318675a2424a0e14 (patch) | |
| tree | cde40d897c96b60fced9438df3e441d66ba005d5 /include/net/netns/conntrack.h | |
| parent | edc67410449c668434b183bb0f770b7bf456c750 (diff) | |
| parent | 92c715fca907686f5298220ece53423e38ba3aed (diff) | |
Merge tag 'drm-misc-fixes-2017-01-31' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes
2 patches to fix the oops Dave Hanse reported, plus a double kfree fix
Maarten discovered while backporting the fix for Linus.
For Linus' vma tracking oops the plan is to send you a dedicated pull with
the 2 patches we need, but since it's tricky we're letting CI beat on it a
bit more.
* tag 'drm-misc-fixes-2017-01-31' of git://anongit.freedesktop.org/git/drm-misc:
drm/atomic: Fix double free in drm_atomic_state_default_clear
drm: Don't race connector registration
drm: prevent double-(un)registration for connectors
Diffstat (limited to 'include/net/netns/conntrack.h')
0 files changed, 0 insertions, 0 deletions