Re: [PULL 00/11] emulated nvme updates and fixes
On Mar 18 12:11, Daniel P. Berrangé wrote: > On Thu, Mar 18, 2021 at 01:01:58PM +0100, Klaus Jensen wrote: > > On Mar 18 11:28, Peter Maydell wrote: > > > On Thu, 18 Mar 2021 at 11:27, Klaus Jensen wrote: > > > > > > > > On Mar 18 11:26, Peter Maydell wrote: > > > > > On Tue, 16 Mar 2021 at 21:47, Klaus Jensen wrote: > > > > > Hi. This tag includes a submodule update which is not mentioned > > > > > in the cover letter or listed in the cover letter diffstat: > > > > > > > > > > roms/opensbi |2 +- > > > > > > > > > > so I suspect it was inadvertent. Please fix up and resend. > > > > > > > > > > > > > Oh crap. Sorry! > > > > > > No worries -- git makes this a very easy mistake to make when > > > doing rebases. That's why I have a check for it in my 'apply > > > a pull request' scripts :-) > > > > > > > Out of curiosity, are there any obvious safe guards I can implement > > myself to stop this from happening? > > AFAICT, latest versions of git no longer add a submodule when doing > "git add -u". You have to explicitly specify the submodule path > to stage it. So this prevent exactly this kind of accident. > Never said thanks for that tip, so Thanks! :) git commit -a is a pretty bad habbit and it's too bad it can't easily be disallowed in the config file ;) signature.asc Description: PGP signature
Re: [PULL 00/11] emulated nvme updates and fixes
On Thu, Mar 18, 2021 at 01:01:58PM +0100, Klaus Jensen wrote: > On Mar 18 11:28, Peter Maydell wrote: > > On Thu, 18 Mar 2021 at 11:27, Klaus Jensen wrote: > > > > > > On Mar 18 11:26, Peter Maydell wrote: > > > > On Tue, 16 Mar 2021 at 21:47, Klaus Jensen wrote: > > > > Hi. This tag includes a submodule update which is not mentioned > > > > in the cover letter or listed in the cover letter diffstat: > > > > > > > > roms/opensbi |2 +- > > > > > > > > so I suspect it was inadvertent. Please fix up and resend. > > > > > > > > > > Oh crap. Sorry! > > > > No worries -- git makes this a very easy mistake to make when > > doing rebases. That's why I have a check for it in my 'apply > > a pull request' scripts :-) > > > > Out of curiosity, are there any obvious safe guards I can implement > myself to stop this from happening? AFAICT, latest versions of git no longer add a submodule when doing "git add -u". You have to explicitly specify the submodule path to stage it. So this prevent exactly this kind of accident. Regards, Daniel -- |: https://berrange.com -o-https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o-https://fstop138.berrange.com :| |: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|
Re: [PULL 00/11] emulated nvme updates and fixes
On Mar 18 11:28, Peter Maydell wrote: > On Thu, 18 Mar 2021 at 11:27, Klaus Jensen wrote: > > > > On Mar 18 11:26, Peter Maydell wrote: > > > On Tue, 16 Mar 2021 at 21:47, Klaus Jensen wrote: > > > Hi. This tag includes a submodule update which is not mentioned > > > in the cover letter or listed in the cover letter diffstat: > > > > > > roms/opensbi |2 +- > > > > > > so I suspect it was inadvertent. Please fix up and resend. > > > > > > > Oh crap. Sorry! > > No worries -- git makes this a very easy mistake to make when > doing rebases. That's why I have a check for it in my 'apply > a pull request' scripts :-) > Out of curiosity, are there any obvious safe guards I can implement myself to stop this from happening? signature.asc Description: PGP signature
Re: [PULL 00/11] emulated nvme updates and fixes
On Thu, 18 Mar 2021 at 11:27, Klaus Jensen wrote: > > On Mar 18 11:26, Peter Maydell wrote: > > On Tue, 16 Mar 2021 at 21:47, Klaus Jensen wrote: > > Hi. This tag includes a submodule update which is not mentioned > > in the cover letter or listed in the cover letter diffstat: > > > > roms/opensbi |2 +- > > > > so I suspect it was inadvertent. Please fix up and resend. > > > > Oh crap. Sorry! No worries -- git makes this a very easy mistake to make when doing rebases. That's why I have a check for it in my 'apply a pull request' scripts :-) thanks -- PMM
Re: [PULL 00/11] emulated nvme updates and fixes
On Mar 18 11:26, Peter Maydell wrote: > On Tue, 16 Mar 2021 at 21:47, Klaus Jensen wrote: > > > > From: Klaus Jensen > > > > Hi Peter, > > > > The following changes since commit 6e31b3a5c34c6e5be7ef60773e607f189eaa15f3: > > > > Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' > > into staging (2021-03-16 10:53:47 +) > > > > are available in the Git repository at: > > > > git://git.infradead.org/qemu-nvme.git tags/nvme-next-pull-request > > > > for you to fetch changes up to e2c8dd15807886ca234cdd06eba47fa65162: > > > > hw/block/nvme: add support for the format nvm command (2021-03-16 > > 22:30:47 +0100) > > > > > > emulated nvme updates and fixes > > > > * fixes for Coverity CID 1450756, 1450757 and 1450758 (me) > > * fix for a bug in zone management receive (me) > > * metadata and end-to-end data protection support (me & Gollu Appalanaidu) > > * verify support (Gollu Appalanaidu) > > * multiple lba formats and format nvm support (Minwoo Im) > > > > and a couple of misc refactorings from me. > > > hw/block/nvme-dif.h| 53 ++ > > hw/block/nvme-ns.h | 50 +- > > hw/block/nvme-subsys.h |2 + > > hw/block/nvme.h| 44 +- > > include/block/nvme.h | 29 +- > > hw/block/nvme-dif.c| 508 > > hw/block/nvme-ns.c | 124 +++- > > hw/block/nvme-subsys.c |7 +- > > hw/block/nvme.c| 1257 > > hw/block/meson.build |2 +- > > hw/block/trace-events | 22 +- > > 11 files changed, 1939 insertions(+), 159 deletions(-) > > create mode 100644 hw/block/nvme-dif.h > > create mode 100644 hw/block/nvme-dif.c > > Hi. This tag includes a submodule update which is not mentioned > in the cover letter or listed in the cover letter diffstat: > > roms/opensbi |2 +- > > so I suspect it was inadvertent. Please fix up and resend. > Oh crap. Sorry! signature.asc Description: PGP signature
Re: [PULL 00/11] emulated nvme updates and fixes
On Tue, 16 Mar 2021 at 21:47, Klaus Jensen wrote: > > From: Klaus Jensen > > Hi Peter, > > The following changes since commit 6e31b3a5c34c6e5be7ef60773e607f189eaa15f3: > > Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into > staging (2021-03-16 10:53:47 +) > > are available in the Git repository at: > > git://git.infradead.org/qemu-nvme.git tags/nvme-next-pull-request > > for you to fetch changes up to e2c8dd15807886ca234cdd06eba47fa65162: > > hw/block/nvme: add support for the format nvm command (2021-03-16 22:30:47 > +0100) > > > emulated nvme updates and fixes > > * fixes for Coverity CID 1450756, 1450757 and 1450758 (me) > * fix for a bug in zone management receive (me) > * metadata and end-to-end data protection support (me & Gollu Appalanaidu) > * verify support (Gollu Appalanaidu) > * multiple lba formats and format nvm support (Minwoo Im) > > and a couple of misc refactorings from me. > hw/block/nvme-dif.h| 53 ++ > hw/block/nvme-ns.h | 50 +- > hw/block/nvme-subsys.h |2 + > hw/block/nvme.h| 44 +- > include/block/nvme.h | 29 +- > hw/block/nvme-dif.c| 508 > hw/block/nvme-ns.c | 124 +++- > hw/block/nvme-subsys.c |7 +- > hw/block/nvme.c| 1257 > hw/block/meson.build |2 +- > hw/block/trace-events | 22 +- > 11 files changed, 1939 insertions(+), 159 deletions(-) > create mode 100644 hw/block/nvme-dif.h > create mode 100644 hw/block/nvme-dif.c Hi. This tag includes a submodule update which is not mentioned in the cover letter or listed in the cover letter diffstat: roms/opensbi |2 +- so I suspect it was inadvertent. Please fix up and resend. thanks -- PMM