Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3656d89 authored by Larry Finger's avatar Larry Finger
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 0a2f3819 29cfcddc

Documentation/lguest/Makefile

+2 −1
Original line number Diff line number Diff line 
# This creates the demonstration utility "lguest" which runs a Linux guest.

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -I../../include -I../../arch/x86/include -U_FORTIFY_SOURCE

# Missing headers?  Add "-I../../include -I../../arch/x86/include"

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE



all: lguest

Documentation/lguest/lguest.c

+12 −11
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ 
#include <limits.h>

#include <stddef.h>

#include <signal.h>

#include "linux/lguest_launcher.h"

#include "linux/virtio_config.h"

#include "linux/virtio_net.h"

#include "linux/virtio_blk.h"

#include "linux/virtio_console.h"

#include "linux/virtio_rng.h"

#include "linux/virtio_ring.h"

#include "asm/bootparam.h"

#include <linux/virtio_config.h>

#include <linux/virtio_net.h>

#include <linux/virtio_blk.h>

#include <linux/virtio_console.h>

#include <linux/virtio_rng.h>

#include <linux/virtio_ring.h>

#include <asm/bootparam.h>

#include "../../include/linux/lguest_launcher.h"

/*L:110

 * We can ignore the 42 include files we need for this program, but I do want

 * to draw attention to the use of kernel-style types.
@@ -1447,14 +1447,15 @@ static void add_to_bridge(int fd, const char *if_name, const char *br_name) 
static void configure_device(int fd, const char *tapif, u32 ipaddr)

{

	struct ifreq ifr;

	struct sockaddr_in *sin = (struct sockaddr_in *)&ifr.ifr_addr;

	struct sockaddr_in sin;



	memset(&ifr, 0, sizeof(ifr));

	strcpy(ifr.ifr_name, tapif);



	/* Don't read these incantations.  Just cut & paste them like I did! */

	sin->sin_family = AF_INET;

	sin->sin_addr.s_addr = htonl(ipaddr);

	sin.sin_family = AF_INET;

	sin.sin_addr.s_addr = htonl(ipaddr);

	memcpy(&ifr.ifr_addr, &sin, sizeof(sin));

	if (ioctl(fd, SIOCSIFADDR, &ifr) != 0)

		err(1, "Setting %s interface address", tapif);

	ifr.ifr_flags = IFF_UP;

MAINTAINERS

+7 −1
Original line number Diff line number Diff line
@@ -2296,6 +2296,12 @@ S: Maintained 
F:	Documentation/hwmon/f71805f

F:	drivers/hwmon/f71805f.c



FANOTIFY

M:	Eric Paris <eparis@redhat.com>

S:	Maintained

F:	fs/notify/fanotify/

F:	include/linux/fanotify.h



FARSYNC SYNCHRONOUS DRIVER

M:	Kevin Curtis <kevin.curtis@farsite.co.uk>

W:	http://www.farsite.co.uk/
@@ -3488,7 +3494,7 @@ LGUEST 
M:	Rusty Russell <rusty@rustcorp.com.au>

L:	lguest@lists.ozlabs.org

W:	http://lguest.ozlabs.org/

S:	Maintained

S:	Odd Fixes

F:	Documentation/lguest/

F:	arch/x86/lguest/

F:	drivers/lguest/

arch/alpha/kernel/osf_sys.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ SYSCALL_DEFINE3(osf_statfs, const char __user *, pathname, 


	retval = user_path(pathname, &path);

	if (!retval) {

		retval = do_osf_statfs(&path buffer, bufsiz);

		retval = do_osf_statfs(&path, buffer, bufsiz);

		path_put(&path);

	}

	return retval;

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1622,7 +1622,8 @@ config ZRELADDR 
	default 0x40008000 if ARCH_STMP378X ||\

		ARCH_STMP37XX ||\

		ARCH_SH7372 ||\

		ARCH_SH7377

		ARCH_SH7377 ||\

		ARCH_S5PV310

	default 0x50008000 if ARCH_S3C64XX ||\

		ARCH_SH7367

	default 0x60008000 if ARCH_VEXPRESS