From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Jul 2022 21:26:49 +0000 (-0700)
Subject: Merge branch 'hot-fixes' (fixes for rc6)
X-Git-Tag: microblaze-v6.1~336
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=24f4b40ec2184f3698faed3082895fcc1f6be282;p=linux-2.6-microblaze.git

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()
---

24f4b40ec2184f3698faed3082895fcc1f6be282