On Mon, Apr 24, 2023 at 10:45:31AM -0700, Darrick J. Wong wrote: > On Mon, Apr 24, 2023 at 12:47:56PM +0200, Carlos Maiolino wrote: > > Hello. > > > > The xfsdump for-next branch, located at: > > > > https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/?h=for-next > > > > Has just been updated. > > > > Patches often get missed, so if your outstanding patches are properly reviewed on > > the list and not included in this update, please let me know. > > Why does for-next diverge from master? > > $ git log --oneline master | head -n15 > acb8083 xfsdump: Release 3.1.12 > aaaa57f xfsrestore: untangle inventory unpacking logic > 7b843fd xfsdump: fix on-media inventory stream packing > 6503407 xfsrestore: fix on-media inventory stream unpacking > 06dd184 xfsrestore: fix on-media inventory media unpacking > 8b6bbcf xfsdump: Release 3.1.11 > > $ git log --oneline for-next | head -n15 > c3a72aa xfsrestore: fix rootdir due to xfsdump bulkstat misuse > aaaa57f xfsrestore: untangle inventory unpacking logic > 7b843fd xfsdump: fix on-media inventory stream packing > 6503407 xfsrestore: fix on-media inventory stream unpacking > 06dd184 xfsrestore: fix on-media inventory media unpacking > 8b6bbcf xfsdump: Release 3.1.11 > > aaaa57f -> c3a72aa (for-next) > \-----> acb8083 (master) D'oh :( When I release 3.1.12, likely I didn't update for-next as I started to do on xfsprogs. I'm going to fix it tomorrow. Will require a rebase on the for-next though :( Thanks a lot for spotting it, at least the issue won't be pushed to master. > > --D > > > > > The new head of the for-next branch is commit: > > > > c3a72aabb22bb3a79ed0f09762e6d81c0cbdadd6 > > > > 1 new commits: > > > > Gao Xiang (1): > > [c3a72aa] xfsrestore: fix rootdir due to xfsdump bulkstat misuse > > > > Code Diffstat: > > > > common/main.c | 1 + > > man/man8/xfsrestore.8 | 14 ++++++++++ > > restore/content.c | 7 +++++ > > restore/getopt.h | 4 +-- > > restore/tree.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- > > restore/tree.h | 2 ++ > > 6 files changed, 94 insertions(+), 6 deletions(-) > > > > -- > > Carlos Maiolino -- Carlos Maiolino
