Commit 28596c97 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 

Pull "trivial tree" updates from Jiri Kosina:
 "Usual pile from trivial tree everyone is so eagerly waiting for"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Remove MN10300_PROC_MN2WS0038
  mei: fix comments
  treewide: Fix typos in Kconfig
  kprobes: update jprobe_example.c for do_fork() change
  Documentation: change "&" to "and" in Documentation/applying-patches.txt
  Documentation: remove obsolete pcmcia-cs from Changes
  Documentation: update links in Changes
  Documentation: Docbook: Fix generated DocBook/kernel-api.xml
  score: Remove GENERIC_HAS_IOMAP
  gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
  tty: doc: Fix grammar in serial/tty
  dma-debug: modify check_for_stack output
  treewide: fix errors in printk
  genirq: fix reference in devm_request_threaded_irq comment
  treewide: fix synchronize_rcu() in comments
  checkstack.pl: port to AArch64
  doc: queue-sysfs: minor fixes
  init/do_mounts: better syntax description
  MIPS: fix comment spelling
  powerpc/simpleboot: fix comment
  ...
parents b6420ebd 7bb38d57

Documentation/ABI/testing/sysfs-class-net

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ Description: 
		lower-level interface protocol used. Ethernet devices will show

		a 'mtu' attribute value of 1500 unless changed.



What:		/sys/calss/net/<iface>/netdev_group

What:		/sys/class/net/<iface>/netdev_group

Date:		January 2011

KernelVersion:	2.6.39

Contact:	netdev@vger.kernel.org

Documentation/Changes

+5 −16
Original line number Diff line number Diff line
@@ -167,18 +167,11 @@ later is recommended, due to some significant improvements). 
PCMCIAutils

-----------



PCMCIAutils replaces pcmcia-cs (see below). It properly sets up

PCMCIAutils replaces pcmcia-cs. It properly sets up

PCMCIA sockets at system startup and loads the appropriate modules

for 16-bit PCMCIA devices if the kernel is modularized and the hotplug

subsystem is used.



Pcmcia-cs

---------



PCMCIA (PC Card) support is now partially implemented in the main

kernel source. The "pcmciautils" package (see above) replaces pcmcia-cs

for newest kernels.



Quota-tools

-----------
@@ -341,17 +334,13 @@ Pcmciautils 
-----------

o  <ftp://ftp.kernel.org/pub/linux/utils/kernel/pcmcia/>



Pcmcia-cs

---------

o  <http://pcmcia-cs.sourceforge.net/>



Quota-tools

----------

o  <http://sourceforge.net/projects/linuxquota/>



DocBook Stylesheets

-------------------

o  <http://nwalsh.com/docbook/dsssl/>

o  <http://sourceforge.net/projects/docbook/files/docbook-dsssl/>



XMLTO XSLT Frontend

-------------------
@@ -359,11 +348,11 @@ o <http://cyberelk.net/tim/xmlto/> 


Intel P6 microcode

------------------

o  <http://www.urbanmyth.org/microcode/>

o  <https://downloadcenter.intel.com/>



udev

----

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

o <http://www.freedesktop.org/software/systemd/man/udev.html>



FUSE

----
@@ -371,7 +360,7 @@ o <http://sourceforge.net/projects/fuse> 


mcelog

------

o <ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/>

o <http://www.mcelog.org/>



Networking

**********

Documentation/CodingStyle

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ the ones already enabled by DEBUG. 
Many subsystems have Kconfig debug options to turn on -DDEBUG in the

corresponding Makefile; in other cases specific files #define DEBUG.  And

when a debug message should be unconditionally printed, such as if it is

already inside a debug-related #ifdef secton, printk(KERN_DEBUG ...) can be

already inside a debug-related #ifdef section, printk(KERN_DEBUG ...) can be

used.

Documentation/applying-patches.txt

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ Common errors when patching 
---

 When patch applies a patch file it attempts to verify the sanity of the

file in different ways.

Checking that the file looks like a valid patch file & checking the code

Checking that the file looks like a valid patch file and checking the code

around the bits being modified matches the context provided in the patch are

just two of the basic sanity checks patch does.

Documentation/block/null_blk.txt

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ nr_devices=[Number of devices]: Default: 2 
  Number of block devices instantiated. They are instantiated as /dev/nullb0,

  etc.



irq_mode=[0-2]: Default: 1-Soft-irq

irqmode=[0-2]: Default: 1-Soft-irq

  The completion mode used for completing IOs to the block-layer.



  0: None.
@@ -53,7 +53,7 @@ irq_mode=[0-2]: Default: 1-Soft-irq 
     completion.



completion_nsec=[ns]: Default: 10.000ns

  Combined with irq_mode=2 (timer). The time each completion event must wait.

  Combined with irqmode=2 (timer). The time each completion event must wait.



submit_queues=[0..nr_cpus]:

  The number of submission queues attached to the device driver. If unset, it

CRA Git | Maintained and supported by SUSTech CRA and CCSE