On Fri, Jan 12, 2018 at 10:44:39AM +0000, Peter Maydell wrote: > On 11 January 2018 at 21:05, Michael S. Tsirkin <m...@redhat.com> wrote: > > Merged and pushed. Pls merge, but please also make sure > > I didn't modify any submodules by mistake. > > > Applied, thanks. Submodule stuff all ok (my apply-pullreq > script checks these days that there aren't any submodule > changes in by mistake). > > -- PMM
Good to know. Note to self: don't merge upstream into a branch in the future. Always checkout upstream, merge branch there. -- MST
