Linus Torvalds fa453a625d Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml ... Pull UML changes from Richard Weinberger: "Mostly bug fixes and cleanups" * 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (35 commits) um: Update defconfig um: Switch to large mcmodel on x86_64 MTD: Relax dependencies um: Wire CONFIG_GENERIC_IO up um: Serve io_remap_pfn_range() Introduce CONFIG_GENERIC_IO um: allow SUBARCH=x86 um: most of the SUBARCH uses can be killed um: deadlock in line_write_interrupt() um: don't bother trying to rebuild CHECKFLAGS for USER_OBJS um: use the right ifdef around exports in user_syms.c um: a bunch of headers can be killed by using generic-y um: ptrace-generic.h doesn't need user.h um: kill HOST_TASK_PID um: remove pointless include of asm/fixmap.h from asm/pgtable.h um: asm-offsets.h might as well come from underlying arch... um: merge processor_{32,64}.h a bit... um: switch close_chan() to struct line um: race fix: initialize delayed_work *before* registering IRQ um: line->have_irq is never checked... ...		2012-03-27 18:29:53 -07:00
..
chan.h	um: switch close_chan() to struct line	2012-03-25 00:29:54 +01:00
chan_kern.c	um: switch close_chan() to struct line	2012-03-25 00:29:54 +01:00
chan_user.c	um: take register_winch_irq() into the caller of is_skas_winch()	2011-11-02 14:15:11 +01:00
chan_user.h	um: chan_init_pri is dead now	2012-03-25 00:29:54 +01:00
cow.h	[PATCH] uml: avoid warnings for diffent names for an unsigned quadword	2006-04-11 06:18:37 -07:00
cow_sys.h	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
cow_user.c	uml: cow_user.c warning corrections	2011-07-25 20:57:13 -07:00
daemon.h	uml: network formatting	2007-10-16 09:43:08 -07:00
daemon_kern.c	um: Kill directly reference of netdev->priv	2008-12-04 15:07:33 -08:00
daemon_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
fd.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
harddog_kern.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
harddog_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
hostaudio_kern.c	Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:43:11 -07:00
line.c	um: deadlock in line_write_interrupt()	2012-03-25 00:29:56 +01:00
line.h	um: line->have_irq is never checked...	2012-03-25 00:29:54 +01:00
Makefile	um: add ucast ethernet transport	2011-05-25 08:39:41 -07:00
mconsole.h	um: take mconsole*.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
mconsole_kern.c	um: irq: Remove IRQF_DISABLED	2012-03-25 00:29:52 +01:00
mconsole_kern.h	um: take mconsole*.h to arch/um/drivers	2011-11-02 14:15:12 +01:00
mconsole_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
mmapper_kern.c	treewide: remove extra semicolons	2011-04-10 17:01:05 +02:00
net_kern.c	Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2012-03-27 18:29:53 -07:00
net_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
null.c	spelling fixes: arch/um/	2007-10-20 01:23:03 +02:00
pcap_kern.c	um: Kill directly reference of netdev->priv	2008-12-04 15:07:33 -08:00
pcap_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
pcap_user.h	uml: remove useless comments	2009-04-01 08:59:17 -07:00
port.h	uml: remove useless comments	2009-04-01 08:59:17 -07:00
port_kern.c	um: irq: Remove IRQF_DISABLED	2012-03-25 00:29:52 +01:00
port_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
pty.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
random.c	um: irq: Remove IRQF_DISABLED	2012-03-25 00:29:52 +01:00
slip.h	[PATCH] uml: const more data	2006-09-27 08:26:15 -07:00
slip_common.c	[PATCH] uml: slirp and slip driver cleanups and fixes	2005-06-13 20:58:43 -07:00
slip_common.h	[PATCH] uml: fix hugest stack users	2006-02-01 08:53:22 -08:00
slip_kern.c	UML: Fix some apparent bitrot	2009-06-25 11:22:13 -07:00
slip_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
slirp.h	[PATCH] uml: const more data	2006-09-27 08:26:15 -07:00
slirp_kern.c	UML: Fix some apparent bitrot	2009-06-25 11:22:13 -07:00
slirp_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
ssl.c	um: switch users of ->chan_list to ->chan_{in,out} (easy cases)	2012-03-25 00:29:54 +01:00
ssl.h	uml: remove useless comments	2009-04-01 08:59:17 -07:00
stderr_console.c	spelling fixes: arch/um/	2007-10-20 01:23:03 +02:00
stdio_console.c	um: switch users of ->chan_list to ->chan_{in,out} (easy cases)	2012-03-25 00:29:54 +01:00
stdio_console.h	uml: remove useless comments	2009-04-01 08:59:17 -07:00
tty.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
ubd.h	um: clean up the includes in ubd	2012-03-25 00:29:52 +01:00
ubd_kern.c	um: clean up the includes in ubd	2012-03-25 00:29:52 +01:00
ubd_user.c	um: clean up the includes in ubd	2012-03-25 00:29:52 +01:00
umcast.h	um: add ucast ethernet transport	2011-05-25 08:39:41 -07:00
umcast_kern.c	um: add ucast ethernet transport	2011-05-25 08:39:41 -07:00
umcast_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
vde.h	uml: add VDE networking support	2007-10-16 09:43:05 -07:00
vde_kern.c	um: Kill directly reference of netdev->priv	2008-12-04 15:07:33 -08:00
vde_user.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
xterm.c	um: -include user.h for USER_OBJ, trim includes	2011-11-02 14:14:44 +01:00
xterm.h	uml: remove useless comments	2009-04-01 08:59:17 -07:00
xterm_kern.c	um: irq: Remove IRQF_DISABLED	2012-03-25 00:29:52 +01:00