Sorry about that. To fix it I did a "git reset hard" to before any of those commits by Jann Horn, then fast-forwarded to the v5.3-rc2 tag and force pushed that to my origin/master then pushed a new branch up with my MAINTAINERS file changes. Hopefully this is a valid fix.
-- The following changes since commit 609488bc979f99f805f34e9a32c1e3b71179d10b: Linux 5.3-rc2 (2019-07-28 12:47:02 -0700) are available in the Git repository at: https://github.com/micah-morton/linux.git tags/safesetid-maintainers-correction-5.3-rc2 for you to fetch changes up to fc5b34a35458314df1dd00281f6e41f419581aa9: Add entry in MAINTAINERS file for SafeSetID LSM (2019-08-01 10:30:57 -0700) ---------------------------------------------------------------- Add entry in MAINTAINERS file for SafeSetID LSM. Has not had any bake time or testing, since its just changes to a text file. ---------------------------------------------------------------- Micah Morton (1): Add entry in MAINTAINERS file for SafeSetID LSM MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) On Thu, Aug 1, 2019 at 6:25 AM Linus Torvalds <torva...@linux-foundation.org> wrote: > > On Wed, Jul 31, 2019 at 2:30 PM Micah Morton <mort...@chromium.org> wrote: > > > > You mentioned a couple weeks ago it would be good if I added myself to > > the MAINTAINERS file for the SafeSetID LSM. Here's the pull request > > for v5.3. > > There's a lot more than the maintainer ID in there. You've rebased old > patches that I already had etc: > > Jann Horn (10): > LSM: SafeSetID: fix pr_warn() to include newline > LSM: SafeSetID: fix check for setresuid(new1, new2, new3) > LSM: SafeSetID: refactor policy hash table > LSM: SafeSetID: refactor safesetid_security_capable() > LSM: SafeSetID: refactor policy parsing > LSM: SafeSetID: fix userns handling in securityfs > LSM: SafeSetID: rewrite userspace API to atomic updates > LSM: SafeSetID: add read handler > LSM: SafeSetID: verify transitive constrainedness > LSM: SafeSetID: fix use of literal -1 in capable hook > > Micah Morton (2): > Merge commit 'v5.3-rc2^0' > Add entry in MAINTAINERS file for SafeSetID LSM > > Not pulled. > > Linus
