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

Commit 912bc6ae authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents d37dc42a 091438dd

Documentation/ABI/testing/sysfs-firmware-acpi

+6 −2
Original line number Diff line number Diff line
@@ -69,9 +69,13 @@ Description: 
		gpe1F:	     0	invalid

		gpe_all:    1192

		sci:	1194

		sci_not:     0	



		sci - The total number of times the ACPI SCI

		has claimed an interrupt.

		sci - The number of times the ACPI SCI

		has been called and claimed an interrupt.



		sci_not - The number of times the ACPI SCI

		has been called and NOT claimed an interrupt.



		gpe_all - count of SCI caused by GPEs.

Documentation/DocBook/kernel-api.tmpl

+5 −1
Original line number Diff line number Diff line
@@ -190,16 +190,20 @@ X!Ekernel/module.c 
!Edrivers/pci/pci.c

!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

!Edrivers/pci/access.c

!Edrivers/pci/irq.c

!Edrivers/pci/htirq.c

<!-- FIXME: Removed for now since no structured comments in source

X!Edrivers/pci/hotplug.c

-->

!Edrivers/pci/probe.c

!Edrivers/pci/slot.c

!Edrivers/pci/rom.c

!Edrivers/pci/iov.c

!Idrivers/pci/pci-sysfs.c

     </sect1>

     <sect1><title>PCI Hotplug Support Library</title>

!Edrivers/pci/hotplug/pci_hotplug_core.c

Documentation/filesystems/caching/cachefiles.txt

+4 −4
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ A NOTE ON SECURITY 
==================



CacheFiles makes use of the split security in the task_struct.  It allocates

its own task_security structure, and redirects current->act_as to point to it

its own task_security structure, and redirects current->cred to point to it

when it acts on behalf of another process, in that process's context.



The reason it does this is that it calls vfs_mkdir() and suchlike rather than
@@ -429,9 +429,9 @@ This means it may lose signals or ptrace events for example, and affects what 
the process looks like in /proc.



So CacheFiles makes use of a logical split in the security between the

objective security (task->sec) and the subjective security (task->act_as).  The

objective security holds the intrinsic security properties of a process and is

never overridden.  This is what appears in /proc, and is what is used when a

objective security (task->real_cred) and the subjective security (task->cred).

The objective security holds the intrinsic security properties of a process and

is never overridden.  This is what appears in /proc, and is what is used when a

process is the target of an operation by some other process (SIGKILL for

example).

Documentation/filesystems/vfs.txt

+1 −2
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ or bottom half). 
  unfreeze_fs: called when VFS is unlocking a filesystem and making it writable

  	again.



  statfs: called when the VFS needs to get filesystem statistics. This

	is called with the kernel lock held

  statfs: called when the VFS needs to get filesystem statistics.



  remount_fs: called when the filesystem is remounted. This is called

	with the kernel lock held

Documentation/isdn/00-INDEX

+13 −4
Original line number Diff line number Diff line
@@ -2,8 +2,14 @@ 
	- this file (info on ISDN implementation for Linux)

CREDITS

	- list of the kind folks that brought you this stuff.

HiSax.cert

	- information about the ITU approval certification of the HiSax driver.

INTERFACE

	- description of Linklevel and Hardwarelevel ISDN interface.

	- description of isdn4linux Link Level and Hardware Level interfaces.

INTERFACE.fax

	- description of the fax subinterface of isdn4linux.

INTERFACE.CAPI

	- description of kernel CAPI Link Level to Hardware Level interface.

README

	- general info on what you need and what to do for Linux ISDN.

README.FAQ
@@ -12,6 +18,8 @@ README.audio 
	- info for running audio over ISDN.

README.fax

	- info for using Fax over ISDN.

README.gigaset

	- info on the drivers for Siemens Gigaset ISDN adapters.

README.icn

	- info on the ICN-ISDN-card and its driver.

README.HiSax
@@ -37,7 +45,8 @@ README.diversion 
README.sc

	- info on driver for Spellcaster cards.

README.x25

    _ info for running X.25 over ISDN.

	- info for running X.25 over ISDN.

README.hysdn

	- info on driver for Hypercope active HYSDN cards

 
README.mISDN

	- info on the Modular ISDN subsystem (mISDN).