Skip to content

Revert "Pre linux.pagecache.recoverfs support"#1563

Merged
ikelos merged 1 commit intodevelopfrom
revert-1561-pre_linux_pagecache_recoverfs_support
Jan 20, 2025
Merged

Revert "Pre linux.pagecache.recoverfs support"#1563
ikelos merged 1 commit intodevelopfrom
revert-1561-pre_linux_pagecache_recoverfs_support

Conversation

@ikelos
Copy link
Member

@ikelos ikelos commented Jan 19, 2025

Reverts #1561

As requested, temporarily reverting this while work is done to the pagecache areas. It might be easiest all round for this to get a new PR to be applied again (with a big notice not to apply until another issue has been resolved, or just a clear flag to indicate what's being worked on).

Also, since I don't know which bits you guys are working on, could you please keep an eye out for PRs and flag that they shouldn't be applied yet in some way please? This one did only arrive 9 hours ago, so you won't necessarily have had time to see it/comment on it, so I'm ok reverting in this instance. But in general, I'm not sure it's fair to play favourites with more notice of which areas are under construction and keeping an eye out for PRs that may conflict. Resolve merge conflicts should be par for the course, and I'd like us to get used to them rather than revert when they crop up in the future...

@gcmoreira
Copy link
Contributor

@Abyss-W4tcher Apologies for this; I didn't mean to interfere with your work. I know this is frustrating but the issue isn't just about resolving a merge conflict. I'm currently running a large set of semi-automated (or more accurately, semi-manual) tests locally. It’s taking quite some time and requires thorough manual supervision to review the results. Additionally, @atcuno is running a much larger set of tests on his side and reviewing each sample individually. Given this, we want to avoid introducing additional changes that could complicate the situation further. We're close to finishing up the remaining tickets, so it shouldn't take much longer. Hopefully, we'll soon have better sample coverage in the GitHub test cases. Thanks for your understanding

Copy link
Contributor

@gcmoreira gcmoreira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks good

@ikelos ikelos merged commit 0f09ecd into develop Jan 20, 2025
24 checks passed
@Abyss-W4tcher
Copy link
Contributor

Hi, no worries, this PR is also a work towards a vol2 plugin parity but given the context it can wait a few more days 👍.

@Abyss-W4tcher
Copy link
Contributor

@gcmoreira Hi, do you think I can push the PR again now ?

@ikelos
Copy link
Member Author

ikelos commented Feb 5, 2025

I think it's probably fine, but you'll need to submit it as a new PR please...

@Abyss-W4tcher
Copy link
Contributor

Yes of course, the previous changes have merge conflicts anyway 👍.

@ikelos ikelos deleted the revert-1561-pre_linux_pagecache_recoverfs_support branch February 9, 2025 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants