On 31/07/2015 14:23, Daniel P. Berrange wrote: > For unknown reasons (probably a git rebase merge mistake) > > commit 2da776db4846eadcb808598a5d3484d149773c05 > Author: Michael R. Hines <mrhi...@us.ibm.com> > Date: Mon Jul 22 10:01:54 2013 -0400 > > rdma: core logic > > Adds CONFIG_RDMA to config-host.h twice, as can be seen > in the generated file: > > $ grep CONFIG_RDMA config-host.h > #define CONFIG_RDMA 1 > #define CONFIG_RDMA 1 > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > configure | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/configure b/configure > index a14dc44..8f35400b 100755 > --- a/configure > +++ b/configure > @@ -5635,10 +5635,6 @@ if [ "$pixman" = "internal" ]; then > echo "config-host.h: subdir-pixman" >> $config_host_mak > fi > > -if test "$rdma" = "yes" ; then > -echo "CONFIG_RDMA=y" >> $config_host_mak > -fi > - > if [ "$dtc_internal" = "yes" ]; then > echo "config-host.h: subdir-dtc" >> $config_host_mak > fi >
Picked up for 2.5, thanks. Paolo
