linux-kernel - linux-next: duplicate patches in the landlock tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240913180641.4a3152ec@canb.auug.org.au>
Date: Fri, 13 Sep 2024 18:06:41 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Mickaël Salaün <mic@...ikod.net>, Christian
 Brauner <brauner@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: duplicate patches in the landlock tree

Hi all,

The following commits are also in the vfs-brauner tree as different
commits (but the same patches):

  45c6e98705e0 ("fs: remove f_version")
  ce22e70a947f ("pipe: use f_pipe")
  191021d73803 ("fs: add f_pipe")
  a6e2141e0b77 ("ubifs: store cookie in private data")
  3125ec2ef10b ("ufs: store cookie in private data")
  905fcc3a4ec0 ("udf: store cookie in private data")
  f2647a4fbe5e ("proc: store cookie in private data")
  e2f00c032780 ("ocfs2: store cookie in private data")

These are commits

  11068e0b64cb ("fs: remove f_version")
  5a957bbac3ab ("pipe: use f_pipe")
  5e9b50dea970 ("fs: add f_pipe")
  1146e5a69efc ("ubifs: store cookie in private data")
  0bea8287df6c ("ufs: store cookie in private data")
  3dd4624ffcd2 ("udf: store cookie in private data")
  b4dba2efa810 ("proc: store cookie in private data")
  ceaa5e80db7c ("ocfs2: store cookie in private data")

in the vfs-brauner tree.  There is a conflict between commit

  61be440b7cc6 ("input: remove f_version abuse")

from the landlock tree and commit

  7a7ce8b3ba66 ("input: remove f_version abuse")

from the vfs-brauner tree, so I used the latter version.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped