From: "Mickaël Salaün" <mic@digikod•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Christian Brauner <brauner@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patches in the landlock tree
Date: Fri, 13 Sep 2024 19:33:02 +0200 [thread overview]
Message-ID: <20240913.sohShem6yoh9@digikod.net> (raw)
In-Reply-To: <20240913180641.4a3152ec@canb.auug.org.au>
Hi,
I minimized the commits required for my -next branch, I hope it will be
good enough now:
https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git/commit/?h=next&id=24dfe95e493086a99acf7df1ef23d9f21f8cdec7
Regards,
Mickaël
On Fri, Sep 13, 2024 at 06:06:41PM +1000, Stephen Rothwell wrote:
> 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
prev parent reply other threads:[~2024-09-13 17:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-13 8:06 linux-next: duplicate patches in the landlock tree Stephen Rothwell
2024-09-13 17:33 ` Mickaël Salaün [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240913.sohShem6yoh9@digikod.net \
--to=mic@digikod$(echo .)net \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox