On 15 March 2018 at 17:18, Kevin Wolf <kw...@redhat.com> wrote: > The following changes since commit 56e8698ffa8aba9f762f980bc21b5340b006f24b: > > Merge remote-tracking branch > 'remotes/stsquad/tags/pull-travis-speedup-130318-1' into staging (2018-03-15 > 14:48:09 +0000) > > are available in the git repository at: > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to d3137181e5e1e5e6b651b58484fc8f705a48ee36: > > iscsi: fix iSER compilation (2018-03-15 17:58:26 +0100) > > ---------------------------------------------------------------- > Block layer patches >
I get merge conflicts trying to apply this; please fix and resend: Auto-merging tests/qemu-iotests/group CONFLICT (content): Merge conflict in tests/qemu-iotests/group Auto-merging tests/qemu-iotests/209.out CONFLICT (add/add): Merge conflict in tests/qemu-iotests/209.out Auto-merging tests/qemu-iotests/209 CONFLICT (add/add): Merge conflict in tests/qemu-iotests/209 thanks -- PMM
