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

Commit bb1281f2 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 rocket science stuff from trivial.git"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  neighbour.h: fix comment
  sched: Fix warning on make htmldocs caused by wait.h
  slab: struct kmem_cache is protected by slab_mutex
  doc: Fix typo in USB Gadget Documentation
  of/Kconfig: Spelling s/one/once/
  mkregtable: Fix sscanf handling
  lp5523, lp8501: comment improvements
  thermal: rcar: comment spelling
  treewide: fix comments and printk msgs
  IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
  Documentation: update /proc/uptime field description
  Documentation: Fix size parameter for snprintf
  arm: fix comment header and macro name
  asm-generic: uaccess: Spelling s/a ny/any/
  mtd: onenand: fix comment header
  doc: driver-model/platform.txt: fix a typo
  drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
  doc: Fix typo (acces_process_vm -> access_process_vm)
  treewide: Fix typos in printk
  drivers/gpu/drm/qxl/Kconfig: reformat the help text
  ...
parents 4988abf1 c04e7da0

Documentation/DocBook/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -10,5 +10,6 @@ 
*.out

*.png

*.gif

*.svg

media-indices.tmpl

media-entities.tmpl

Documentation/DocBook/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ htmldocs: $(HTML) 


MAN := $(patsubst %.xml, %.9, $(BOOKS))

mandocs: $(MAN)

	$(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9)



installmandocs: mandocs

	mkdir -p /usr/local/man/man9/
@@ -145,7 +146,7 @@ build_main_index = rm -rf $(main_idx); \ 
		   cat $(HTML) >> $(main_idx)



quiet_cmd_db2html = HTML    $@

      cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \

      cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \

		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \

        $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
@@ -159,7 +160,7 @@ quiet_cmd_db2html = HTML $@ 
            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi



quiet_cmd_db2man = MAN     $@

      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi

      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi

%.9 : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

Documentation/DocBook/kernel-api.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ X!Ilib/string.c 
     <sect1><title>The Slab Cache</title>

!Iinclude/linux/slab.h

!Emm/slab.c

!Emm/util.c

     </sect1>

     <sect1><title>User Space Memory Access</title>

!Iarch/x86/include/asm/uaccess_32.h

Documentation/IRQ-domain.txt

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ will use a legacy domain only if an IRQ range is supplied by the 
system and will otherwise use a linear domain mapping. The semantics

of this call are such that if an IRQ range is specified then

descriptors will be allocated on-the-fly for it, and if no range is

specified it will fall through to irq_domain_add_linear() which meand

specified it will fall through to irq_domain_add_linear() which means

*no* irq descriptors will be allocated.



A typical use case for simple domains is where an irqchip provider

Documentation/driver-model/platform.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct platform_driver { 
	struct device_driver driver;

};



Note that probe() should general verify that the specified device hardware

Note that probe() should in general verify that the specified device hardware

actually exists; sometimes platform setup code can't be sure.  The probing

can use device resources, including clocks, and device platform_data.