summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-07-10 14:26:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-07-10 14:26:49 -0700
commit24f4b40ec2184f3698faed3082895fcc1f6be282 (patch)
tree1a6a5839d7c7f3f3930204b46bb4b99ca1df28ee /Makefile
parent952c53cd357c71338a59d444933ed48a879229e1 (diff)
parentfc82bbf4dede758007763867d0282353c06d1121 (diff)
Merge branch 'hot-fixes' (fixes for rc6)
This is a collection of three fixes for small annoyances. Two of these are already pending in other trees, but I really don't want to release another -rc with these issues pending, so I picked up the patches for these things directly. We'll end up with duplicate commits eventually, I prefer that over having these issues pending. The third one is just me getting rid of another BUG_ON() just because it was reported and I dislike those things so much. * merge 'hot-fixes' branch: ida: don't use BUG_ON() for debugging drm/aperture: Run fbdev removal before internal helpers ptrace: fix clearing of JOBCTL_TRACED in ptrace_unfreeze_traced()
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions