Commit d3ec4844 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
parents 0003230e df2e301f

.mailmap

+1 −2
Original line number Original line Diff line number Diff line
@@ -73,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com> 
Mark Brown <broonie@sirena.org.uk>

Mark Brown <broonie@sirena.org.uk>

Matthieu CASTET <castet.matthieu@free.fr>

Matthieu CASTET <castet.matthieu@free.fr>

Mayuresh Janorkar <mayur@ti.com>

Mayuresh Janorkar <mayur@ti.com>

Michael Buesch <mb@bu3sch.de>

Michael Buesch <m@bues.ch>

Michael Buesch <mbuesch@freenet.de>

Michel Dänzer <michel@tungstengraphics.com>

Michel Dänzer <michel@tungstengraphics.com>

Mitesh shah <mshah@teja.com>

Mitesh shah <mshah@teja.com>

Morten Welinder <terra@gnome.org>

Morten Welinder <terra@gnome.org>

Documentation/DocBook/v4l/io.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ for (i = 0; i &lt; reqbuf.count; i++) 
      <programlisting>

      <programlisting>

&v4l2-requestbuffers; reqbuf;

&v4l2-requestbuffers; reqbuf;

/* Our current format uses 3 planes per buffer */

/* Our current format uses 3 planes per buffer */

#define FMT_NUM_PLANES = 3;

#define FMT_NUM_PLANES = 3





struct {

struct {

	void *start[FMT_NUM_PLANES];

	void *start[FMT_NUM_PLANES];

Documentation/RCU/NMI-RCU.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ Although RCU is usually used to protect read-mostly data structures, 
it is possible to use RCU to provide dynamic non-maskable interrupt

it is possible to use RCU to provide dynamic non-maskable interrupt

handlers, as well as dynamic irq handlers.  This document describes

handlers, as well as dynamic irq handlers.  This document describes

how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer

how to do this, drawing loosely from Zwane Mwaikambo's NMI-timer

work in "arch/i386/oprofile/nmi_timer_int.c" and in

work in "arch/x86/oprofile/nmi_timer_int.c" and in

"arch/i386/kernel/traps.c".

"arch/x86/kernel/traps.c".





The relevant pieces of code are listed below, each followed by a

The relevant pieces of code are listed below, each followed by a

brief explanation.

brief explanation.

Documentation/blockdev/README.DAC960

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ replacing "/usr/src" with wherever you keep your Linux kernel source tree: 
  make config

  make config

  make bzImage (or zImage)

  make bzImage (or zImage)





Then install "arch/i386/boot/bzImage" or "arch/i386/boot/zImage" as your

Then install "arch/x86/boot/bzImage" or "arch/x86/boot/zImage" as your

standard kernel, run lilo if appropriate, and reboot.

standard kernel, run lilo if appropriate, and reboot.





To create the necessary devices in /dev, the "make_rd" script included in

To create the necessary devices in /dev, the "make_rd" script included in

Documentation/blockdev/ramdisk.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -64,9 +64,9 @@ the RAM disk dynamically grows as data is being written into it, a size field 
is not required. Bits 11 to 13 are not currently used and may as well be zero.

is not required. Bits 11 to 13 are not currently used and may as well be zero.

These numbers are no magical secrets, as seen below:

These numbers are no magical secrets, as seen below:





./arch/i386/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK     0x07FF

./arch/x86/kernel/setup.c:#define RAMDISK_IMAGE_START_MASK     0x07FF

./arch/i386/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000

./arch/x86/kernel/setup.c:#define RAMDISK_PROMPT_FLAG          0x8000

./arch/i386/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000

./arch/x86/kernel/setup.c:#define RAMDISK_LOAD_FLAG            0x4000





Consider a typical two floppy disk setup, where you will have the

Consider a typical two floppy disk setup, where you will have the

kernel on disk one, and have already put a RAM disk image onto disk #2.

kernel on disk one, and have already put a RAM disk image onto disk #2.
@@ -85,7 +85,7 @@ The command line equivalent is: "prompt_ramdisk=1" 
Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word.

Putting that together gives 2^15 + 2^14 + 0 = 49152 for an rdev word.

So to create disk one of the set, you would do:

So to create disk one of the set, you would do:





	/usr/src/linux# cat arch/i386/boot/zImage > /dev/fd0

	/usr/src/linux# cat arch/x86/boot/zImage > /dev/fd0

	/usr/src/linux# rdev /dev/fd0 /dev/fd0

	/usr/src/linux# rdev /dev/fd0 /dev/fd0

	/usr/src/linux# rdev -r /dev/fd0 49152

	/usr/src/linux# rdev -r /dev/fd0 49152

CRA Git | Maintained and supported by SUSTech CRA and CCSE