<feed xmlns='http://www.w3.org/2005/Atom'>
<title>linux.git/drivers/char/vt.c, branch v2.6.21</title>
<subtitle>Linux kernel source tree</subtitle>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/'/>
<entry>
<title>[PATCH] Initialise SAK member for each virtual console to prevent oops</title>
<updated>2007-03-17T02:25:06+00:00</updated>
<author>
<name>Bernhard Walle</name>
<email>bwalle@suse.de</email>
</author>
<published>2007-03-16T21:38:30+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=c2c88f109eebb940ddca17472d2e149560bcf7eb'/>
<id>c2c88f109eebb940ddca17472d2e149560bcf7eb</id>
<content type='text'>
Initialise the SAK member of the vc_cons variable on all virtual terminals,
not only the first one.  This prevents an oops when trying Sysrq-C on e.g.
the second virtual terminal:

  kernel BUG at kernel/workqueue.c:212!
  invalid opcode: 0000 [1] SMP
  CPU 0
  Modules linked in: i915 drm deflate zlib_deflate twofish twofish_common serpent blowfish des ce
  Pid: 0, comm: swapper Not tainted 2.6.21-rc3-default #15
  RIP: 0010:[&lt;ffffffff8028c955&gt;]  [&lt;ffffffff8028c955&gt;] queue_work+0x32/0x51
  RSP: 0018:ffffffff805fada8  EFLAGS: 00010013
  RAX: ffffffff80683f38 RBX: ffffffff804ae700 RCX: 0000000000000000
  RDX: 0000000000000000 RSI: ffffffff80683f30 RDI: ffff81000134a840
  RBP: 0000000000000001 R08: 0000000000000005 R09: 0000000000000002
  R10: ffffffff805990e0 R11: ffff810037f4c0f0 R12: 000000000000006b
  R13: ffff81007aa23000 R14: 0000000000000001 R15: 0000000000000096
  FS:  0000000000000000(0000) GS:ffffffff804d8000(0000) knlGS:0000000000000000
  CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
  CR2: 00002b72026e9000 CR3: 0000000079175000 CR4: 00000000000006e0
  Process swapper (pid: 0, threadinfo ffffffff8059e000, task ffffffff80490840)
  Stack:  0000000000000096 ffffffff803635db ffffffff805fadf8 0000000000000001
   ffff8100013c2e40 0000000000000025 ffff81007c931c00 ffff81007aa23000
   0000000000000001 ffffffff8035e3ee 0000000000000092 ffff810037cc8000
  Call Trace:
   &lt;IRQ&gt;  [&lt;ffffffff803635db&gt;] __handle_sysrq+0x98/0x129
   [&lt;ffffffff8035e3ee&gt;] kbd_event+0x32e/0x56a
   [&lt;ffffffff8037d502&gt;] input_event+0x422/0x44a
   [&lt;ffffffff80381d71&gt;] atkbd_interrupt+0x449/0x503
   [&lt;ffffffff8037a42d&gt;] serio_interrupt+0x37/0x6f
   [&lt;ffffffff8037affb&gt;] i8042_interrupt+0x1f4/0x20a
   [&lt;ffffffff8026bd20&gt;] smp_send_timer_broadcast_ipi+0x2d/0x4e
   [&lt;ffffffff8020eee5&gt;] handle_IRQ_event+0x25/0x53
   [&lt;ffffffff802a924c&gt;] handle_edge_irq+0xe4/0x128
   [&lt;ffffffff802562ac&gt;] call_softirq+0x1c/0x28
   [&lt;ffffffff802632eb&gt;] do_IRQ+0x6c/0xd3
   [&lt;ffffffff8024f4e7&gt;] mwait_idle+0x0/0x45
   [&lt;ffffffff80255631&gt;] ret_from_intr+0x0/0xa
   &lt;EOI&gt;  [&lt;ffffffff80248a4d&gt;] datagram_poll+0x0/0xc8
   [&lt;ffffffff8024f529&gt;] mwait_idle+0x42/0x45
   [&lt;ffffffff80242c05&gt;] cpu_idle+0x8b/0xae
   [&lt;ffffffff805a8779&gt;] start_kernel+0x2b9/0x2c5
   [&lt;ffffffff805a815e&gt;] _sinittext+0x15e/0x162

  Code: 0f 0b eb fe 48 8b 07 48 63 d2 48 f7 d0 48 8b 3c d0 e8 13 ff
  RIP  [&lt;ffffffff8028c955&gt;] queue_work+0x32/0x51
   RSP &lt;ffffffff805fada8&gt;
  Kernel panic - not syncing: Aiee, killing interrupt handler!

Signed-off-by: Bernhard Walle &lt;bwalle@suse.de&gt;
Acked-by: Eric Biederman &lt;ebiederm@xmission.com&gt;
Cc: &lt;stable@kernel.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Initialise the SAK member of the vc_cons variable on all virtual terminals,
not only the first one.  This prevents an oops when trying Sysrq-C on e.g.
the second virtual terminal:

  kernel BUG at kernel/workqueue.c:212!
  invalid opcode: 0000 [1] SMP
  CPU 0
  Modules linked in: i915 drm deflate zlib_deflate twofish twofish_common serpent blowfish des ce
  Pid: 0, comm: swapper Not tainted 2.6.21-rc3-default #15
  RIP: 0010:[&lt;ffffffff8028c955&gt;]  [&lt;ffffffff8028c955&gt;] queue_work+0x32/0x51
  RSP: 0018:ffffffff805fada8  EFLAGS: 00010013
  RAX: ffffffff80683f38 RBX: ffffffff804ae700 RCX: 0000000000000000
  RDX: 0000000000000000 RSI: ffffffff80683f30 RDI: ffff81000134a840
  RBP: 0000000000000001 R08: 0000000000000005 R09: 0000000000000002
  R10: ffffffff805990e0 R11: ffff810037f4c0f0 R12: 000000000000006b
  R13: ffff81007aa23000 R14: 0000000000000001 R15: 0000000000000096
  FS:  0000000000000000(0000) GS:ffffffff804d8000(0000) knlGS:0000000000000000
  CS:  0010 DS: 0018 ES: 0018 CR0: 000000008005003b
  CR2: 00002b72026e9000 CR3: 0000000079175000 CR4: 00000000000006e0
  Process swapper (pid: 0, threadinfo ffffffff8059e000, task ffffffff80490840)
  Stack:  0000000000000096 ffffffff803635db ffffffff805fadf8 0000000000000001
   ffff8100013c2e40 0000000000000025 ffff81007c931c00 ffff81007aa23000
   0000000000000001 ffffffff8035e3ee 0000000000000092 ffff810037cc8000
  Call Trace:
   &lt;IRQ&gt;  [&lt;ffffffff803635db&gt;] __handle_sysrq+0x98/0x129
   [&lt;ffffffff8035e3ee&gt;] kbd_event+0x32e/0x56a
   [&lt;ffffffff8037d502&gt;] input_event+0x422/0x44a
   [&lt;ffffffff80381d71&gt;] atkbd_interrupt+0x449/0x503
   [&lt;ffffffff8037a42d&gt;] serio_interrupt+0x37/0x6f
   [&lt;ffffffff8037affb&gt;] i8042_interrupt+0x1f4/0x20a
   [&lt;ffffffff8026bd20&gt;] smp_send_timer_broadcast_ipi+0x2d/0x4e
   [&lt;ffffffff8020eee5&gt;] handle_IRQ_event+0x25/0x53
   [&lt;ffffffff802a924c&gt;] handle_edge_irq+0xe4/0x128
   [&lt;ffffffff802562ac&gt;] call_softirq+0x1c/0x28
   [&lt;ffffffff802632eb&gt;] do_IRQ+0x6c/0xd3
   [&lt;ffffffff8024f4e7&gt;] mwait_idle+0x0/0x45
   [&lt;ffffffff80255631&gt;] ret_from_intr+0x0/0xa
   &lt;EOI&gt;  [&lt;ffffffff80248a4d&gt;] datagram_poll+0x0/0xc8
   [&lt;ffffffff8024f529&gt;] mwait_idle+0x42/0x45
   [&lt;ffffffff80242c05&gt;] cpu_idle+0x8b/0xae
   [&lt;ffffffff805a8779&gt;] start_kernel+0x2b9/0x2c5
   [&lt;ffffffff805a815e&gt;] _sinittext+0x15e/0x162

  Code: 0f 0b eb fe 48 8b 07 48 63 d2 48 f7 d0 48 8b 3c d0 e8 13 ff
  RIP  [&lt;ffffffff8028c955&gt;] queue_work+0x32/0x51
   RSP &lt;ffffffff805fada8&gt;
  Kernel panic - not syncing: Aiee, killing interrupt handler!

Signed-off-by: Bernhard Walle &lt;bwalle@suse.de&gt;
Acked-by: Eric Biederman &lt;ebiederm@xmission.com&gt;
Cc: &lt;stable@kernel.org&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] swsusp: fix suspend when console is in VT_AUTO+KD_GRAPHICS mode</title>
<updated>2007-03-17T02:25:05+00:00</updated>
<author>
<name>Andrew Johnson</name>
<email>ajohnson@intrinsyc.com</email>
</author>
<published>2007-03-16T21:38:24+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=b257bc051f06607beb3004d9a1c297085e728bec'/>
<id>b257bc051f06607beb3004d9a1c297085e728bec</id>
<content type='text'>
When the console is in VT_AUTO+KD_GRAPHICS mode, switching to the
SUSPEND_CONSOLE fails, resulting in vt_waitactive() waiting indefinitely or
until the task is interrupted.  This patch tests if a console switch can
occur in set_console() and returns early if a console switch is not
possible.

[akpm@linux-foundation.org: cleanup]
Signed-off-by: Andrew Johnson &lt;ajohnson@intrinsyc.com&gt;
Acked-by: Pavel Machek &lt;pavel@ucw.cz&gt;
Cc: "Antonino A. Daplas" &lt;adaplas@pol.net&gt;
Cc: "Rafael J. Wysocki" &lt;rjw@sisk.pl&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When the console is in VT_AUTO+KD_GRAPHICS mode, switching to the
SUSPEND_CONSOLE fails, resulting in vt_waitactive() waiting indefinitely or
until the task is interrupted.  This patch tests if a console switch can
occur in set_console() and returns early if a console switch is not
possible.

[akpm@linux-foundation.org: cleanup]
Signed-off-by: Andrew Johnson &lt;ajohnson@intrinsyc.com&gt;
Acked-by: Pavel Machek &lt;pavel@ucw.cz&gt;
Cc: "Antonino A. Daplas" &lt;adaplas@pol.net&gt;
Cc: "Rafael J. Wysocki" &lt;rjw@sisk.pl&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] Fix SAK_work workqueue initialization.</title>
<updated>2007-02-14T00:07:36+00:00</updated>
<author>
<name>Eric W. Biederman</name>
<email>ebiederm@xmission.com</email>
</author>
<published>2007-02-13T21:38:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=7f1f86a0d04e79f8165e6f50d329a520b8cd11e5'/>
<id>7f1f86a0d04e79f8165e6f50d329a520b8cd11e5</id>
<content type='text'>
Somewhere in the rewrite of the work queues my cleanup of SAK handling
got broken.  Maybe I didn't retest it properly or possibly the API
was changing so fast I missed something.  Regardless currently
triggering a SAK now generates an ugly BUG_ON and kills the kernel.

Thanks to Alexey Dobriyan &lt;adobriyan@openvz.org&gt; for spotting this.

This modifies the use of SAK_work to initialize it when the data
structure it resides in is initialized, and to simply call
schedule_work when we need to generate a SAK.  I update both
data structures that have a SAK_work member for consistency.

All of the old PREPARE_WORK calls that are now gone.

If we call schedule_work again before it has processed it
has generated the first SAK it will simply ignore the duplicate
schedule_work request.

Signed-off-by: Eric W. Biederman &lt;ebiederm@xmission.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Somewhere in the rewrite of the work queues my cleanup of SAK handling
got broken.  Maybe I didn't retest it properly or possibly the API
was changing so fast I missed something.  Regardless currently
triggering a SAK now generates an ugly BUG_ON and kills the kernel.

Thanks to Alexey Dobriyan &lt;adobriyan@openvz.org&gt; for spotting this.

This modifies the use of SAK_work to initialize it when the data
structure it resides in is initialized, and to simply call
schedule_work when we need to generate a SAK.  I update both
data structures that have a SAK_work member for consistency.

All of the old PREPARE_WORK calls that are now gone.

If we call schedule_work again before it has processed it
has generated the first SAK it will simply ignore the duplicate
schedule_work request.

Signed-off-by: Eric W. Biederman &lt;ebiederm@xmission.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] tty: update the tty layer to work with struct pid</title>
<updated>2007-02-12T17:48:32+00:00</updated>
<author>
<name>Eric W. Biederman</name>
<email>ebiederm@xmission.com</email>
</author>
<published>2007-02-12T08:53:00+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=ab521dc0f8e117fd808d3e425216864d60390500'/>
<id>ab521dc0f8e117fd808d3e425216864d60390500</id>
<content type='text'>
Of kernel subsystems that work with pids the tty layer is probably the largest
consumer.  But it has the nice virtue that the assiation with a session only
lasts until the session leader exits.  Which means that no reference counting
is required.  So using struct pid winds up being a simple optimization to
avoid hash table lookups.

In the long term the use of pid_nr also ensures that when we have multiple pid
spaces mixed everything will work correctly.

Signed-off-by: Eric W. Biederman &lt;eric@maxwell.lnxi.com&gt;
Cc: Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;
Cc: Oleg Nesterov &lt;oleg@tv-sign.ru&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Of kernel subsystems that work with pids the tty layer is probably the largest
consumer.  But it has the nice virtue that the assiation with a session only
lasts until the session leader exits.  Which means that no reference counting
is required.  So using struct pid winds up being a simple optimization to
avoid hash table lookups.

In the long term the use of pid_nr also ensures that when we have multiple pid
spaces mixed everything will work correctly.

Signed-off-by: Eric W. Biederman &lt;eric@maxwell.lnxi.com&gt;
Cc: Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;
Cc: Oleg Nesterov &lt;oleg@tv-sign.ru&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] Char: timers cleanup</title>
<updated>2007-02-12T17:48:30+00:00</updated>
<author>
<name>Jiri Slaby</name>
<email>jirislaby@gmail.com</email>
</author>
<published>2007-02-12T08:52:31+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=40565f1962c5be9b9e285e05af01ab7771534868'/>
<id>40565f1962c5be9b9e285e05af01ab7771534868</id>
<content type='text'>
- Use timer macros to set function and data members and to modify
  expiration time.
- Use DEFINE_TIMER for global timers and do not init them at run-time in
  these cases.
- del_timer_sync is common in most cases -- we want to wait for timer
  function if it's still running.

Signed-off-by: Jiri Slaby &lt;jirislaby@gmail.com&gt;
Cc: Dave Airlie &lt;airlied@linux.ie&gt;
Cc: David Woodhouse &lt;dwmw2@infradead.org&gt;
Cc: Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;
Cc: Alessandro Zummo &lt;a.zummo@towertech.it&gt;
Cc: Paul Fulghum &lt;paulkf@microgate.com&gt;
Cc: Kylene Jo Hall &lt;kjhall@us.ibm.com&gt;
Cc: Wim Van Sebroeck &lt;wim@iguana.be&gt;
Acked-by: Dmitry Torokhov &lt;dtor@mail.ru&gt;	(Input bits)
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
- Use timer macros to set function and data members and to modify
  expiration time.
- Use DEFINE_TIMER for global timers and do not init them at run-time in
  these cases.
- del_timer_sync is common in most cases -- we want to wait for timer
  function if it's still running.

Signed-off-by: Jiri Slaby &lt;jirislaby@gmail.com&gt;
Cc: Dave Airlie &lt;airlied@linux.ie&gt;
Cc: David Woodhouse &lt;dwmw2@infradead.org&gt;
Cc: Dominik Brodowski &lt;linux@dominikbrodowski.net&gt;
Cc: Alessandro Zummo &lt;a.zummo@towertech.it&gt;
Cc: Paul Fulghum &lt;paulkf@microgate.com&gt;
Cc: Kylene Jo Hall &lt;kjhall@us.ibm.com&gt;
Cc: Wim Van Sebroeck &lt;wim@iguana.be&gt;
Acked-by: Dmitry Torokhov &lt;dtor@mail.ru&gt;	(Input bits)
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] drivers/char/vc_screen.c: proper prototypes</title>
<updated>2007-02-11T18:51:27+00:00</updated>
<author>
<name>Adrian Bunk</name>
<email>bunk@stusta.de</email>
</author>
<published>2007-02-10T09:45:02+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=1b135431abf5ea92e61bf4e91d93726c7b96da5f'/>
<id>1b135431abf5ea92e61bf4e91d93726c7b96da5f</id>
<content type='text'>
Add proper prototypes for two functions in drivers/char/vc_screen.c

Signed-off-by: Adrian Bunk &lt;bunk@stusta.de&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Add proper prototypes for two functions in drivers/char/vc_screen.c

Signed-off-by: Adrian Bunk &lt;bunk@stusta.de&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] getting rid of all casts of k[cmz]alloc() calls</title>
<updated>2006-12-13T17:05:58+00:00</updated>
<author>
<name>Robert P. J. Day</name>
<email>rpjday@mindspring.com</email>
</author>
<published>2006-12-13T08:35:56+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=5cbded585d129d0226cb48ac4202b253c781be26'/>
<id>5cbded585d129d0226cb48ac4202b253c781be26</id>
<content type='text'>
Run this:

	#!/bin/sh
	for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do
	  echo "De-casting $f..."
	  perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f
	done

And then go through and reinstate those cases where code is casting pointers
to non-pointers.

And then drop a few hunks which conflicted with outstanding work.

Cc: Russell King &lt;rmk@arm.linux.org.uk&gt;, Ian Molton &lt;spyro@f2s.com&gt;
Cc: Mikael Starvik &lt;starvik@axis.com&gt;
Cc: Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;
Cc: Roman Zippel &lt;zippel@linux-m68k.org&gt;
Cc: Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;
Cc: Ralf Baechle &lt;ralf@linux-mips.org&gt;
Cc: Paul Mackerras &lt;paulus@samba.org&gt;
Cc: Kyle McMartin &lt;kyle@mcmartin.ca&gt;
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
Cc: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
Cc: "David S. Miller" &lt;davem@davemloft.net&gt;
Cc: Jeff Dike &lt;jdike@addtoit.com&gt;
Cc: Greg KH &lt;greg@kroah.com&gt;
Cc: Jens Axboe &lt;jens.axboe@oracle.com&gt;
Cc: Paul Fulghum &lt;paulkf@microgate.com&gt;
Cc: Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;
Cc: Karsten Keil &lt;kkeil@suse.de&gt;
Cc: Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;
Cc: Jeff Garzik &lt;jeff@garzik.org&gt;
Cc: James Bottomley &lt;James.Bottomley@steeleye.com&gt;
Cc: Ian Kent &lt;raven@themaw.net&gt;
Cc: Steven French &lt;sfrench@us.ibm.com&gt;
Cc: David Woodhouse &lt;dwmw2@infradead.org&gt;
Cc: Neil Brown &lt;neilb@cse.unsw.edu.au&gt;
Cc: Jaroslav Kysela &lt;perex@suse.cz&gt;
Cc: Takashi Iwai &lt;tiwai@suse.de&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Run this:

	#!/bin/sh
	for f in $(grep -Erl "\([^\)]*\) *k[cmz]alloc" *) ; do
	  echo "De-casting $f..."
	  perl -pi -e "s/ ?= ?\([^\)]*\) *(k[cmz]alloc) *\(/ = \1\(/" $f
	done

And then go through and reinstate those cases where code is casting pointers
to non-pointers.

And then drop a few hunks which conflicted with outstanding work.

Cc: Russell King &lt;rmk@arm.linux.org.uk&gt;, Ian Molton &lt;spyro@f2s.com&gt;
Cc: Mikael Starvik &lt;starvik@axis.com&gt;
Cc: Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;
Cc: Roman Zippel &lt;zippel@linux-m68k.org&gt;
Cc: Geert Uytterhoeven &lt;geert@linux-m68k.org&gt;
Cc: Ralf Baechle &lt;ralf@linux-mips.org&gt;
Cc: Paul Mackerras &lt;paulus@samba.org&gt;
Cc: Kyle McMartin &lt;kyle@mcmartin.ca&gt;
Cc: Benjamin Herrenschmidt &lt;benh@kernel.crashing.org&gt;
Cc: Martin Schwidefsky &lt;schwidefsky@de.ibm.com&gt;
Cc: "David S. Miller" &lt;davem@davemloft.net&gt;
Cc: Jeff Dike &lt;jdike@addtoit.com&gt;
Cc: Greg KH &lt;greg@kroah.com&gt;
Cc: Jens Axboe &lt;jens.axboe@oracle.com&gt;
Cc: Paul Fulghum &lt;paulkf@microgate.com&gt;
Cc: Alan Cox &lt;alan@lxorguk.ukuu.org.uk&gt;
Cc: Karsten Keil &lt;kkeil@suse.de&gt;
Cc: Mauro Carvalho Chehab &lt;mchehab@infradead.org&gt;
Cc: Jeff Garzik &lt;jeff@garzik.org&gt;
Cc: James Bottomley &lt;James.Bottomley@steeleye.com&gt;
Cc: Ian Kent &lt;raven@themaw.net&gt;
Cc: Steven French &lt;sfrench@us.ibm.com&gt;
Cc: David Woodhouse &lt;dwmw2@infradead.org&gt;
Cc: Neil Brown &lt;neilb@cse.unsw.edu.au&gt;
Cc: Jaroslav Kysela &lt;perex@suse.cz&gt;
Cc: Takashi Iwai &lt;tiwai@suse.de&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>[PATCH] add return value checking of get_user() in set_vesa_blanking()</title>
<updated>2006-12-07T16:39:40+00:00</updated>
<author>
<name>Yoichi Yuasa</name>
<email>yoichi_yuasa@tripeaks.co.jp</email>
</author>
<published>2006-12-07T04:38:38+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=403aac965eba17a360a93c3b679f57b21030d4cd'/>
<id>403aac965eba17a360a93c3b679f57b21030d4cd</id>
<content type='text'>
[akpm@osdl.org: bugfix]
Signed-off-by: Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;
Cc: James Simmons &lt;jsimmons@infradead.org&gt;
Cc: "Antonino A. Daplas" &lt;adaplas@pol.net&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
[akpm@osdl.org: bugfix]
Signed-off-by: Yoichi Yuasa &lt;yoichi_yuasa@tripeaks.co.jp&gt;
Cc: James Simmons &lt;jsimmons@infradead.org&gt;
Cc: "Antonino A. Daplas" &lt;adaplas@pol.net&gt;
Signed-off-by: Andrew Morton &lt;akpm@osdl.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6</title>
<updated>2006-12-05T14:37:56+00:00</updated>
<author>
<name>David Howells</name>
<email>dhowells@redhat.com</email>
</author>
<published>2006-12-05T14:37:56+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=4c1ac1b49122b805adfa4efc620592f68dccf5db'/>
<id>4c1ac1b49122b805adfa4efc620592f68dccf5db</id>
<content type='text'>
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells &lt;dhowells@redhat.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells &lt;dhowells@redhat.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Driver core: convert vt code to use struct device</title>
<updated>2006-12-01T22:51:59+00:00</updated>
<author>
<name>Greg Kroah-Hartman</name>
<email>gregkh@suse.de</email>
</author>
<published>2006-08-08T05:19:37+00:00</published>
<link rel='alternate' type='text/html' href='https://git.tavy.me/linux.git/commit/?id=805952a889c4d0fdab23307c14c5ce9571f81233'/>
<id>805952a889c4d0fdab23307c14c5ce9571f81233</id>
<content type='text'>
Converts from using struct "class_device" to "struct device" making
everything show up properly in /sys/devices/ with symlinks from the
/sys/class directory.

Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;

</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Converts from using struct "class_device" to "struct device" making
everything show up properly in /sys/devices/ with symlinks from the
/sys/class directory.

Signed-off-by: Greg Kroah-Hartman &lt;gregkh@suse.de&gt;

</pre>
</div>
</content>
</entry>
</feed>
