On Tue, Dec 13, 2022 at 12:44 PM Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Mon, Dec 12, 2022 at 7:05 PM Paul Moore <paul@xxxxxxxxxxxxxx> wrote: > > > > Unfortunately, this pull request does > > conflict with fixes that were merged during the v6.1-rcX cycle so you > > will either need to do some manual fixup or you can pull the tag below > > which has the necessary fixes and has been sanity tested today. > > I did the merge manually, but compared to your version. They were > identical except that you hadn't added the documentation entry for the > gfp_flags parameter. Ah, thanks for catching that. > That said, I'm not super-happy with that merge ... It feels to me like > that thing shouldn't be an allocation at all, but that selinux should > use ref-counted strings instead (and just increase the refcount). It is something worth looking into for the future. I'm in the middle of reworking the audit code, and one of the changes is heavy use of string refcounts to reduce the copies needed. -- paul-moore.com
