Test-Label: Intel-compilation Test-Status: FAILURE http://dpdk.org/patch/37199 _apply issues_ Submitter: Zhiyong Yang Date: 2018-04-04 17:17:53 DPDK git baseline: Repo:dpdk-master, CommitID: 05e0eee0001cb19671eb7e8d3dd68680a695fea2 Repo:dpdk-next-eventdev, CommitID: aa9cbfc8cd1cae3e91e4741edc2aaf3d08056a39 Repo:dpdk-next-net, CommitID: 0b8b92e38cd55c68e4dc49dd597f62327798ec74 Repo:dpdk-next-crypto, CommitID: a5203e08a5e9b6ee9ffbbf4c150b7776de833b08 Repo:dpdk-next-virtio, CommitID: 9b954f9c455a76304601deb88e2df1549dc9e09a *Repo: dpdk-master Checking patch doc/guides/rel_notes/release_18_05.rst... error: while searching for: * Added support for NVGRE, VXLAN and GENEVE filters in flow API. * Added support for DROP action in flow API. API Changes ----------- error: patch failed: doc/guides/rel_notes/release_18_05.rst:58 error: doc/guides/rel_notes/release_18_05.rst: patch does not apply Checking patch drivers/net/virtio/virtio_user/vhost_user.c... Hunk #1 succeeded at 429 (offset 51 lines). Hunk #2 succeeded at 469 (offset 51 lines). error: while searching for: memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", dev->path); if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) { PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno)); close(fd); return -1; } dev->vhostfd = fd; return 0; } static int error: patch failed: drivers/net/virtio/virtio_user/vhost_user.c:405 error: drivers/net/virtio/virtio_user/vhost_user.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c... error: while searching for: eth_dev->intr_handle->fd = -1; if (dev->vhostfd >= 0) eth_dev->intr_handle->fd = dev->vhostfd; return 0; } error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.c:254 error: drivers/net/virtio/virtio_user/virtio_user_dev.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.h... error: while searching for: #define _VIRTIO_USER_DEV_H #include #include "../virtio_pci.h" #include "../virtio_ring.h" #include "vhost.h" error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.h:6 error: drivers/net/virtio/virtio_user/virtio_user_dev.h: patch does not apply Checking patch drivers/net/virtio/virtio_user_ethdev.c... error: while searching for: #define virtio_user_get_dev(hw) \ ((struct virtio_user_dev *)(hw)->virtio_user_dev) static void virtio_user_delayed_handler(void *param) -- dev); } static void error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:24 error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply *Repo: dpdk-next-eventdev Checking patch doc/guides/rel_notes/release_18_05.rst... error: while searching for: * Added support for NVGRE, VXLAN and GENEVE filters in flow API. * Added support for DROP action in flow API. API Changes ----------- error: patch failed: doc/guides/rel_notes/release_18_05.rst:58 error: doc/guides/rel_notes/release_18_05.rst: patch does not apply Checking patch drivers/net/virtio/virtio_user/vhost_user.c... Hunk #1 succeeded at 429 (offset 51 lines). Hunk #2 succeeded at 469 (offset 51 lines). error: while searching for: memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", dev->path); if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) { PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno)); close(fd); return -1; } dev->vhostfd = fd; return 0; } static int error: patch failed: drivers/net/virtio/virtio_user/vhost_user.c:405 error: drivers/net/virtio/virtio_user/vhost_user.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c... error: while searching for: eth_dev->intr_handle->fd = -1; if (dev->vhostfd >= 0) eth_dev->intr_handle->fd = dev->vhostfd; return 0; } error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.c:254 error: drivers/net/virtio/virtio_user/virtio_user_dev.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.h... error: while searching for: #define _VIRTIO_USER_DEV_H #include #include "../virtio_pci.h" #include "../virtio_ring.h" #include "vhost.h" error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.h:6 error: drivers/net/virtio/virtio_user/virtio_user_dev.h: patch does not apply Checking patch drivers/net/virtio/virtio_user_ethdev.c... error: while searching for: #define virtio_user_get_dev(hw) \ ((struct virtio_user_dev *)(hw)->virtio_user_dev) static void virtio_user_delayed_handler(void *param) -- dev); } static void error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:24 error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply *Repo: dpdk-next-net Checking patch doc/guides/rel_notes/release_18_05.rst... error: while searching for: * Added support for NVGRE, VXLAN and GENEVE filters in flow API. * Added support for DROP action in flow API. API Changes ----------- error: patch failed: doc/guides/rel_notes/release_18_05.rst:58 error: doc/guides/rel_notes/release_18_05.rst: patch does not apply Checking patch drivers/net/virtio/virtio_user/vhost_user.c... Hunk #1 succeeded at 429 (offset 51 lines). Hunk #2 succeeded at 469 (offset 51 lines). error: while searching for: memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", dev->path); if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) { PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno)); close(fd); return -1; } dev->vhostfd = fd; return 0; } static int error: patch failed: drivers/net/virtio/virtio_user/vhost_user.c:405 error: drivers/net/virtio/virtio_user/vhost_user.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c... error: while searching for: eth_dev->intr_handle->fd = -1; if (dev->vhostfd >= 0) eth_dev->intr_handle->fd = dev->vhostfd; return 0; } error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.c:254 error: drivers/net/virtio/virtio_user/virtio_user_dev.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.h... error: while searching for: #define _VIRTIO_USER_DEV_H #include #include "../virtio_pci.h" #include "../virtio_ring.h" #include "vhost.h" error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.h:6 error: drivers/net/virtio/virtio_user/virtio_user_dev.h: patch does not apply Checking patch drivers/net/virtio/virtio_user_ethdev.c... error: while searching for: #define virtio_user_get_dev(hw) \ ((struct virtio_user_dev *)(hw)->virtio_user_dev) static void virtio_user_delayed_handler(void *param) -- dev); } static void error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:24 error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply *Repo: dpdk-next-crypto Checking patch doc/guides/rel_notes/release_18_05.rst... error: while searching for: * Added support for NVGRE, VXLAN and GENEVE filters in flow API. * Added support for DROP action in flow API. API Changes ----------- error: patch failed: doc/guides/rel_notes/release_18_05.rst:58 error: doc/guides/rel_notes/release_18_05.rst: patch does not apply Checking patch drivers/net/virtio/virtio_user/vhost_user.c... Hunk #1 succeeded at 429 (offset 51 lines). Hunk #2 succeeded at 469 (offset 51 lines). error: while searching for: memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", dev->path); if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) { PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno)); close(fd); return -1; } dev->vhostfd = fd; return 0; } static int error: patch failed: drivers/net/virtio/virtio_user/vhost_user.c:405 error: drivers/net/virtio/virtio_user/vhost_user.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c... error: while searching for: eth_dev->intr_handle->fd = -1; if (dev->vhostfd >= 0) eth_dev->intr_handle->fd = dev->vhostfd; return 0; } error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.c:254 error: drivers/net/virtio/virtio_user/virtio_user_dev.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.h... error: while searching for: #define _VIRTIO_USER_DEV_H #include #include "../virtio_pci.h" #include "../virtio_ring.h" #include "vhost.h" error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.h:6 error: drivers/net/virtio/virtio_user/virtio_user_dev.h: patch does not apply Checking patch drivers/net/virtio/virtio_user_ethdev.c... error: while searching for: #define virtio_user_get_dev(hw) \ ((struct virtio_user_dev *)(hw)->virtio_user_dev) static void virtio_user_delayed_handler(void *param) -- dev); } static void error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:24 error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply *Repo: dpdk-next-virtio Checking patch doc/guides/rel_notes/release_18_05.rst... error: while searching for: * Added support for NVGRE, VXLAN and GENEVE filters in flow API. * Added support for DROP action in flow API. API Changes ----------- error: patch failed: doc/guides/rel_notes/release_18_05.rst:58 error: doc/guides/rel_notes/release_18_05.rst: patch does not apply Checking patch drivers/net/virtio/virtio_user/vhost_user.c... Hunk #1 succeeded at 429 (offset 51 lines). Hunk #2 succeeded at 469 (offset 51 lines). error: while searching for: memset(&un, 0, sizeof(un)); un.sun_family = AF_UNIX; snprintf(un.sun_path, sizeof(un.sun_path), "%s", dev->path); if (connect(fd, (struct sockaddr *)&un, sizeof(un)) < 0) { PMD_DRV_LOG(ERR, "connect error, %s", strerror(errno)); close(fd); return -1; } dev->vhostfd = fd; return 0; } static int error: patch failed: drivers/net/virtio/virtio_user/vhost_user.c:405 error: drivers/net/virtio/virtio_user/vhost_user.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.c... error: while searching for: eth_dev->intr_handle->fd = -1; if (dev->vhostfd >= 0) eth_dev->intr_handle->fd = dev->vhostfd; return 0; } error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.c:254 error: drivers/net/virtio/virtio_user/virtio_user_dev.c: patch does not apply Checking patch drivers/net/virtio/virtio_user/virtio_user_dev.h... error: while searching for: #define _VIRTIO_USER_DEV_H #include #include "../virtio_pci.h" #include "../virtio_ring.h" #include "vhost.h" error: patch failed: drivers/net/virtio/virtio_user/virtio_user_dev.h:6 error: drivers/net/virtio/virtio_user/virtio_user_dev.h: patch does not apply Checking patch drivers/net/virtio/virtio_user_ethdev.c... error: while searching for: #define virtio_user_get_dev(hw) \ ((struct virtio_user_dev *)(hw)->virtio_user_dev) static void virtio_user_delayed_handler(void *param) -- dev); } static void error: patch failed: drivers/net/virtio/virtio_user_ethdev.c:24 error: drivers/net/virtio/virtio_user_ethdev.c: patch does not apply DPDK STV team