public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: Carlos Maiolino <cem@kernel.org>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [ANNOUNCE] xfsdump: for-next updated to c3a72aa
Date: Thu, 27 Apr 2023 09:04:53 -0700	[thread overview]
Message-ID: <20230427160453.GE59245@frogsfrogsfrogs> (raw)
In-Reply-To: <20230427154810.2lqqlpnxsgh6gv6q@andromeda>

On Thu, Apr 27, 2023 at 05:48:10PM +0200, Carlos Maiolino wrote:
> 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.

Ah, ok.  No worries, I wanted to make sure that 3.1.12 was still a legit
release. :)

--D

> 
> > 
> > --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

      reply	other threads:[~2023-04-27 16:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-24 10:47 [ANNOUNCE] xfsdump: for-next updated to c3a72aa Carlos Maiolino
2023-04-24 17:45 ` Darrick J. Wong
2023-04-27 15:48   ` Carlos Maiolino
2023-04-27 16:04     ` Darrick J. Wong [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=20230427160453.GE59245@frogsfrogsfrogs \
    --to=djwong@kernel.org \
    --cc=cem@kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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