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

Commit 3cfc2c42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
  Documentation: update broken web addresses.
  fix comment typo "choosed" -> "chosen"
  hostap:hostap_hw.c Fix typo in comment
  Fix spelling contorller -> controller in comments
  Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
  fs/Kconfig: Fix typo Userpace -> Userspace
  Removing dead MACH_U300_BS26
  drivers/infiniband: Remove unnecessary casts of private_data
  fs/ocfs2: Remove unnecessary casts of private_data
  libfc: use ARRAY_SIZE
  scsi: bfa: use ARRAY_SIZE
  drm: i915: use ARRAY_SIZE
  drm: drm_edid: use ARRAY_SIZE
  synclink: use ARRAY_SIZE
  block: cciss: use ARRAY_SIZE
  comment typo fixes: charater => character
  fix comment typos concerning "challenge"
  arm: plat-spear: fix typo in kerneldoc
  reiserfs: typo comment fix
  update email address
  ...
parents 5cf65713 0ea6e611

Documentation/ABI/testing/sysfs-devices-memory

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ Description: 
		added or removed dynamically to represent hot-add/remove

		operations.

Users:		hotplug memory add/remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils



What:		/sys/devices/system/memory/memoryX/removable

Date:		June 2008
@@ -19,7 +19,7 @@ Description: 
		identify removable sections of the memory before attempting

		potentially expensive hot-remove memory operation

Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils	



What:		/sys/devices/system/memory/memoryX/phys_device

Date:		September 2008
@@ -58,7 +58,7 @@ Description: 
		by root to offline that section.

		# echo offline > /sys/devices/system/memory/memory22/state

Users:		hotplug memory remove tools

		https://w3.opensource.ibm.com/projects/powerpc-utils/

		http://www.ibm.com/developerworks/wikis/display/LinuxP/powerpc-utils





What:		/sys/devices/system/memoryX/nodeY

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ Description: These files exist in every cpu's cache index directories. 
		Currently, only AMD Family 10h Processors support cache index

		disable, and only for their L3 caches.  See the BIOS and

		Kernel Developer's Guide at

		http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf

		http://support.amd.com/us/Embedded_TechDocs/31116-Public-GH-BKDG_3-28_5-28-09.pdf	

		for formatting information and other details on the

		cache index disable.

Users:    joachim.deguara@amd.com

Documentation/Changes

+6 −6
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ o <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/> 


Mkinitrd

--------

o  <ftp://rawhide.redhat.com/pub/rawhide/SRPMS/SRPMS/>

o  <https://code.launchpad.net/initrd-tools/main>



E2fsprogs

---------
@@ -343,11 +343,11 @@ o <http://jfs.sourceforge.net/> 


Reiserfsprogs

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

o  <http://www.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.3.tar.gz>

o  <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>



Xfsprogs

--------

o  <ftp://oss.sgi.com/projects/xfs/download/>

o  <ftp://oss.sgi.com/projects/xfs/>



Pcmciautils

-----------
@@ -387,18 +387,18 @@ o <http://sourceforge.net/projects/fuse> 


mcelog

------

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

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



Networking

**********



PPP

---

o  <ftp://ftp.samba.org/pub/ppp/ppp-2.4.0.tar.gz>

o  <ftp://ftp.samba.org/pub/ppp/>



Isdn4k-utils

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

o  <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/isdn4k-utils.v3.1pre1.tar.gz>

o  <ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/>



NFS-utils

---------

Documentation/DocBook/scsi.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ 
        </para>

        <para>

          For documentation see

          <ulink url='http://www.torque.net/sg/sdebug26.html'>http://www.torque.net/sg/sdebug26.html</ulink>

          <ulink url='http://sg.danny.cz/sg/sdebug26.html'>http://sg.danny.cz/sg/sdebug26.html</ulink>

        </para>

<!-- !Edrivers/scsi/scsi_debug.c -->

      </sect2>

Documentation/DocBook/v4l/compat.xml

+3 −2
Original line number Diff line number Diff line
@@ -1091,8 +1091,9 @@ signed 64-bit integer. Output devices should not send a buffer out 
until the time in the timestamp field has arrived. I would like to

follow SGI's lead, and adopt a multimedia timestamping system like

their UST (Unadjusted System Time). See

http://reality.sgi.com/cpirazzi_engr/lg/time/intro.html. [This link is

no longer valid.] UST uses timestamps that are 64-bit signed integers

http://web.archive.org/web/*/http://reality.sgi.com

/cpirazzi_engr/lg/time/intro.html. 

UST uses timestamps that are 64-bit signed integers

(not struct timeval's) and given in nanosecond units. The UST clock

starts at zero when the system is booted and runs continuously and

uniformly. It takes a little over 292 years for UST to overflow. There