Due to the merge of https://review.gluster.org/c/glusterfs/+/21746 which changes a whole lot of files to get header includes with the new changed path for libglusterfs includes, a lot of patches are in merge conflict. If you notice that your patch is one such, please rebase to the tip of master, using the gerrit UI, or manually if that fails. Thanks, Shyam _______________________________________________ Gluster-devel mailing list Gluster-devel@xxxxxxxxxxx https://lists.gluster.org/mailman/listinfo/gluster-devel
