| Message ID | 87r0cpw104.fsf@debian-BULLSEYE-live-builder-AMD64 (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [GIT,PULL] xfs: bug fix for 6.10 | expand |
On Sat, Jun 22, 2024 at 07:05:49PM +0530, Chandan Babu R wrote: > Hi Linus, Drat, I ran the wrong script, please ignore this email, Linus. I guess I now have weekend work to go figure out why this happened. > Please pull this branch which contains an XFS bug fix for 6.10-rc5. A brief > description of the bug fix is provided below. Chandan: Would _you_ mind pulling this branch with 6.10 fixes and sending them on to Linus? --D > > I did a test-merge with the main upstream branch as of a few minutes ago and > didn't see any conflicts. Please let me know if you encounter any problems. > > The following changes since commit 6ba59ff4227927d3a8530fc2973b80e94b54d58f: > > Linux 6.10-rc4 (2024-06-16 13:40:16 -0700) > > are available in the Git repository at: > > https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-6.10-fixes-4 > > for you to fetch changes up to 348a1983cf4cf5099fc398438a968443af4c9f65: > > xfs: fix unlink vs cluster buffer instantiation race (2024-06-17 11:17:09 +0530) > > ---------------------------------------------------------------- > Bug fixes for 6.10-rc5: > > * Fix assertion failure due to a race between unlink and cluster buffer > instantiation. > > Signed-off-by: Chandan Babu R <chandanbabu@kernel.org> > > ---------------------------------------------------------------- > Dave Chinner (1): > xfs: fix unlink vs cluster buffer instantiation race > > fs/xfs/xfs_inode.c | 23 +++++++++++++++++++---- > 1 file changed, 19 insertions(+), 4 deletions(-) >
On Sat, 22 Jun 2024 at 09:01, Darrick J. Wong <djwong@kernel.org> wrote: > > On Sat, Jun 22, 2024 at 07:05:49PM +0530, Chandan Babu R wrote: > > Hi Linus, > > Drat, I ran the wrong script, please ignore this email, Linus. > I guess I now have weekend work to go figure out why this happened. > > > Please pull this branch which contains an XFS bug fix for 6.10-rc5. A brief > > description of the bug fix is provided below. > > Chandan: Would _you_ mind pulling this branch with 6.10 fixes and > sending them on to Linus? Ok, I'm confused about what just happened, and I had pulled Chandan's PR already. However, I hadn't pushed out, so I reset things (and had to re-do the bcachefs pull on top, no big deal), so it's gone from my tree again until clarification... Linus
On Sat, Jun 22, 2024 at 09:00:58AM -0700, Darrick J. Wong wrote: > On Sat, Jun 22, 2024 at 07:05:49PM +0530, Chandan Babu R wrote: > > Hi Linus, > > Drat, I ran the wrong script, please ignore this email, Linus. > I guess I now have weekend work to go figure out why this happened. Wait, no this is Chandan's PR to Linus, not the one I just tried to send to Chandan. Sigh. EVERYONE: ignore this email please. --D > > > Please pull this branch which contains an XFS bug fix for 6.10-rc5. A brief > > description of the bug fix is provided below. > > Chandan: Would _you_ mind pulling this branch with 6.10 fixes and > sending them on to Linus? > > --D > > > > > I did a test-merge with the main upstream branch as of a few minutes ago and > > didn't see any conflicts. Please let me know if you encounter any problems. > > > > The following changes since commit 6ba59ff4227927d3a8530fc2973b80e94b54d58f: > > > > Linux 6.10-rc4 (2024-06-16 13:40:16 -0700) > > > > are available in the Git repository at: > > > > https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-6.10-fixes-4 > > > > for you to fetch changes up to 348a1983cf4cf5099fc398438a968443af4c9f65: > > > > xfs: fix unlink vs cluster buffer instantiation race (2024-06-17 11:17:09 +0530) > > > > ---------------------------------------------------------------- > > Bug fixes for 6.10-rc5: > > > > * Fix assertion failure due to a race between unlink and cluster buffer > > instantiation. > > > > Signed-off-by: Chandan Babu R <chandanbabu@kernel.org> > > > > ---------------------------------------------------------------- > > Dave Chinner (1): > > xfs: fix unlink vs cluster buffer instantiation race > > > > fs/xfs/xfs_inode.c | 23 +++++++++++++++++++---- > > 1 file changed, 19 insertions(+), 4 deletions(-) > > >
On Sat, 22 Jun 2024 at 09:05, Darrick J. Wong <djwong@kernel.org> wrote: > > EVERYONE: ignore this email please. Too late, but I have re-done the xfs merge. Linus
The pull request you sent on Sat, 22 Jun 2024 19:05:49 +0530:
> https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-6.10-fixes-4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/563a50672d8a86ec4b114a4a2f44d6e7ff855f5b
Thank you!
Hi Linus, Please pull this branch which contains an XFS bug fix for 6.10-rc5. A brief description of the bug fix is provided below. I did a test-merge with the main upstream branch as of a few minutes ago and didn't see any conflicts. Please let me know if you encounter any problems. The following changes since commit 6ba59ff4227927d3a8530fc2973b80e94b54d58f: Linux 6.10-rc4 (2024-06-16 13:40:16 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-6.10-fixes-4 for you to fetch changes up to 348a1983cf4cf5099fc398438a968443af4c9f65: xfs: fix unlink vs cluster buffer instantiation race (2024-06-17 11:17:09 +0530) ---------------------------------------------------------------- Bug fixes for 6.10-rc5: * Fix assertion failure due to a race between unlink and cluster buffer instantiation. Signed-off-by: Chandan Babu R <chandanbabu@kernel.org> ---------------------------------------------------------------- Dave Chinner (1): xfs: fix unlink vs cluster buffer instantiation race fs/xfs/xfs_inode.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)