Commit 49023ff7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'sweil/for-anthony' into staging 

* sweil/for-anthony:
  Fix some more license versions (GPL2+ instead of GPL2)
  dump: Fix license version (GPL2+ instead of GPL2)
  configure: Fix build for some versions of glibc (9pfs)
  monitor: Fix memory leak with readline completion
parents eb2aeacf fc0608ac

configure

+4 −0
Original line number Diff line number Diff line
@@ -2812,7 +2812,11 @@ fi 
open_by_hande_at=no

cat > $TMPC << EOF

#include <fcntl.h>

#if !defined(AT_EMPTY_PATH)

# error missing definition

#else

int main(void) { struct file_handle fh; return open_by_handle_at(0, &fh, 0); }

#endif

EOF

if compile_prog "" "" ; then

    open_by_handle_at=yes

dump-stub.c

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * Authors:

 *     Wen Congyang <wency@cn.fujitsu.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 */

dump.c

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * Authors:

 *     Wen Congyang <wency@cn.fujitsu.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 */

dump.h

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * Authors:

 *     Wen Congyang <wency@cn.fujitsu.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2. See

 * the COPYING file in the top-level directory.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 */

memory_mapping-stub.c

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
 * Authors:

 *     Wen Congyang <wency@cn.fujitsu.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2. See

 * the COPYING file in the top-level directory.

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 */