Merge branch 'master' into for-linus (39cf0518) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/filesystems/afs.txt

+12 −14

Original line number	Diff line number	Diff line
		@@ -23,15 +23,13 @@ it does support include:

		(*) Security (currently only AFS kaserver and KerberosIV tickets).

		(*) File reading.
		(*) File reading and writing.

		(*) Automounting.

		It does not yet support the following AFS features:

		(*) Write support.
		(*) Local caching (via fscache).

		(*) Local caching.
		It does not yet support the following AFS features:

		(*) pioctl() system call.

		@@ -56,7 +54,7 @@ They permit the debugging messages to be turned on dynamically by manipulating
		the masks in the following files:

		/sys/module/af_rxrpc/parameters/debug
		/sys/module/afs/parameters/debug
		/sys/module/kafs/parameters/debug


		=====
		@@ -66,9 +64,9 @@ USAGE
		When inserting the driver modules the root cell must be specified along with a
		list of volume location server IP addresses:

		insmod af_rxrpc.o
		insmod rxkad.o
		insmod kafs.o rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91
		modprobe af_rxrpc
		modprobe rxkad
		modprobe kafs rootcell=cambridge.redhat.com:172.16.18.73:172.16.18.91

		The first module is the AF_RXRPC network protocol driver. This provides the
		RxRPC remote operation protocol and may also be accessed from userspace. See:
		@@ -81,7 +79,7 @@ is the actual filesystem driver for the AFS filesystem.
		Once the module has been loaded, more modules can be added by the following
		procedure:

		echo add grand.central.org 18.7.14.88:128.2.191.224 >/proc/fs/afs/cells
		echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 >/proc/fs/afs/cells

		Where the parameters to the "add" command are the name of a cell and a list of
		volume location servers within that cell, with the latter separated by colons.
		@@ -101,7 +99,7 @@ The name of the volume can be suffixes with ".backup" or ".readonly" to
		specify connection to only volumes of those types.

		The name of the cell is optional, and if not given during a mount, then the
		named volume will be looked up in the cell specified during insmod.
		named volume will be looked up in the cell specified during modprobe.

		Additional cells can be added through /proc (see later section).

		@@ -163,14 +161,14 @@ THE CELL DATABASE

		The filesystem maintains an internal database of all the cells it knows and the
		IP addresses of the volume location servers for those cells. The cell to which
		the system belongs is added to the database when insmod is performed by the
		the system belongs is added to the database when modprobe is performed by the
		"rootcell=" argument or, if compiled in, using a "kafs.rootcell=" argument on
		the kernel command line.

		Further cells can be added by commands similar to the following:

		echo add CELLNAME VLADDR[:VLADDR][:VLADDR]... >/proc/fs/afs/cells
		echo add grand.central.org 18.7.14.88:128.2.191.224 >/proc/fs/afs/cells
		echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 >/proc/fs/afs/cells

		No other cell database operations are available at this time.

		@@ -233,7 +231,7 @@ insmod /tmp/kafs.o rootcell=cambridge.redhat.com:172.16.18.91
		mount -t afs \%root.afs. /afs
		mount -t afs \%cambridge.redhat.com:root.cell. /afs/cambridge.redhat.com/

		echo add grand.central.org 18.7.14.88:128.2.191.224 > /proc/fs/afs/cells
		echo add grand.central.org 18.9.48.14:128.2.203.61:130.237.48.87 > /proc/fs/afs/cells
		mount -t afs "#grand.central.org:root.cell." /afs/grand.central.org/
		mount -t afs "#grand.central.org:root.archive." /afs/grand.central.org/archive
		mount -t afs "#grand.central.org:root.contrib." /afs/grand.central.org/contrib

Documentation/filesystems/proc.txt

+5 −10

Original line number	Diff line number	Diff line
		@@ -1167,13 +1167,11 @@ CHAPTER 3: PER-PROCESS PARAMETERS
		3.1 /proc/<pid>/oom_adj - Adjust the oom-killer score
		------------------------------------------------------

		This file can be used to adjust the score used to select which processes should
		be killed in an out-of-memory situation. The oom_adj value is a characteristic
		of the task's mm, so all threads that share an mm with pid will have the same
		oom_adj value. A high value will increase the likelihood of this process being
		killed by the oom-killer. Valid values are in the range -16 to +15 as
		explained below and a special value of -17, which disables oom-killing
		altogether for threads sharing pid's mm.
		This file can be used to adjust the score used to select which processes
		should be killed in an out-of-memory situation. Giving it a high score will
		increase the likelihood of this process being killed by the oom-killer. Valid
		values are in the range -16 to +15, plus the special value -17, which disables
		oom-killing altogether for this process.

		The process to be killed in an out-of-memory situation is selected among all others
		based on its badness score. This value equals the original memory size of the process
		@@ -1187,9 +1185,6 @@ the parent's score if they do not share the same memory. Thus forking servers
		are the prime candidates to be killed. Having only one 'hungry' child will make
		parent less preferable than the child.

		/proc/<pid>/oom_adj cannot be changed for kthreads since they are immune from
		oom-killing already.

		/proc/<pid>/oom_score shows process' current badness score.

		The following heuristics are then applied:

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -3429,6 +3429,7 @@ F: drivers/mfd/

		MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
		S: Orphan
		L: linux-mmc@vger.kernel.org
		F: drivers/mmc/
		F: include/linux/mmc/

		@@ -3809,7 +3810,7 @@ W: http://open-osd.org
		T: git git://git.open-osd.org/open-osd.git
		S: Maintained
		F: drivers/scsi/osd/
		F: drivers/include/scsi/osd_*
		F: include/scsi/osd_*
		F: fs/exofs/

		P54 WIRELESS DRIVER

REPORTING-BUGS

+4 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,10 @@ worry too much about getting the wrong person. If you are unsure send it
		to the person responsible for the code relevant to what you were doing.
		If it occurs repeatably try and describe how to recreate it. That is
		worth even more than the oops itself. The list of maintainers and
		mailing lists is in the MAINTAINERS file in this directory.
		mailing lists is in the MAINTAINERS file in this directory. If you
		know the file name that causes the problem you can use the following
		command in this directory to find some of the maintainers of that file:
		perl scripts/get_maintainer.pl -f <filename>

		If it is a security bug, please copy the Security Contact listed
		in the MAINTAINERS file. They can help coordinate bugfix and disclosure.

arch/microblaze/configs/mmu_defconfig

+36 −34

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version: 2.6.30-rc6
		# Fri May 22 10:02:33 2009
		# Linux kernel version: 2.6.31-rc6
		# Tue Aug 18 11:00:02 2009
		#
		CONFIG_MICROBLAZE=y
		# CONFIG_SWAP is not set
		@@ -18,7 +18,11 @@ CONFIG_GENERIC_TIME=y
		CONFIG_GENERIC_CLOCKEVENTS=y
		CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
		CONFIG_GENERIC_GPIO=y
		CONFIG_GENERIC_CSUM=y
		# CONFIG_PCI is not set
		CONFIG_NO_DMA=y
		CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
		CONFIG_CONSTRUCTORS=y

		#
		# General setup
		@@ -59,8 +63,8 @@ CONFIG_INITRAMFS_ROOT_GID=0
		CONFIG_RD_GZIP=y
		# CONFIG_RD_BZIP2 is not set
		# CONFIG_RD_LZMA is not set
		CONFIG_INITRAMFS_COMPRESSION_NONE=y
		# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
		# CONFIG_INITRAMFS_COMPRESSION_NONE is not set
		CONFIG_INITRAMFS_COMPRESSION_GZIP=y
		# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
		# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		@@ -71,7 +75,6 @@ CONFIG_SYSCTL_SYSCALL=y
		CONFIG_KALLSYMS=y
		CONFIG_KALLSYMS_ALL=y
		CONFIG_KALLSYMS_EXTRA_PASS=y
		# CONFIG_STRIP_ASM_SYMS is not set
		# CONFIG_HOTPLUG is not set
		CONFIG_PRINTK=y
		CONFIG_BUG=y
		@@ -84,13 +87,22 @@ CONFIG_TIMERFD=y
		CONFIG_EVENTFD=y
		# CONFIG_SHMEM is not set
		CONFIG_AIO=y

		#
		# Performance Counters
		#
		CONFIG_VM_EVENT_COUNTERS=y
		# CONFIG_STRIP_ASM_SYMS is not set
		CONFIG_COMPAT_BRK=y
		CONFIG_SLAB=y
		# CONFIG_SLUB is not set
		# CONFIG_SLOB is not set
		# CONFIG_PROFILING is not set
		# CONFIG_MARKERS is not set

		#
		# GCOV-based kernel profiling
		#
		# CONFIG_SLOW_WORK is not set
		# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
		CONFIG_SLABINFO=y
		@@ -102,7 +114,7 @@ CONFIG_MODULE_UNLOAD=y
		# CONFIG_MODVERSIONS is not set
		# CONFIG_MODULE_SRCVERSION_ALL is not set
		CONFIG_BLOCK=y
		# CONFIG_LBD is not set
		CONFIG_LBDAF=y
		# CONFIG_BLK_DEV_BSG is not set
		# CONFIG_BLK_DEV_INTEGRITY is not set

		@@ -194,9 +206,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
		# CONFIG_PHYS_ADDR_T_64BIT is not set
		CONFIG_ZONE_DMA_FLAG=0
		CONFIG_VIRT_TO_BUS=y
		CONFIG_UNEVICTABLE_LRU=y
		CONFIG_HAVE_MLOCK=y
		CONFIG_HAVE_MLOCKED_PAGE_BIT=y
		CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

		#
		# Exectuable file formats
		@@ -262,6 +274,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		# CONFIG_PHONET is not set
		# CONFIG_IEEE802154 is not set
		# CONFIG_NET_SCHED is not set
		# CONFIG_DCB is not set

		@@ -325,7 +338,6 @@ CONFIG_MISC_DEVICES=y
		# CONFIG_ATA is not set
		# CONFIG_MD is not set
		CONFIG_NETDEVICES=y
		CONFIG_COMPAT_NET_DEV_OPS=y
		# CONFIG_DUMMY is not set
		# CONFIG_BONDING is not set
		# CONFIG_MACVLAN is not set
		@@ -344,7 +356,7 @@ CONFIG_NET_ETHERNET=y
		# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
		# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
		# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
		# CONFIG_B44 is not set
		# CONFIG_KS8842 is not set
		CONFIG_NETDEV_1000=y
		CONFIG_NETDEV_10000=y

		@@ -410,6 +422,11 @@ CONFIG_LEGACY_PTY_COUNT=256
		# CONFIG_TCG_TPM is not set
		# CONFIG_I2C is not set
		# CONFIG_SPI is not set

		#
		# PPS support
		#
		# CONFIG_PPS is not set
		CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
		# CONFIG_GPIOLIB is not set
		# CONFIG_W1 is not set
		@@ -418,12 +435,6 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
		# CONFIG_THERMAL is not set
		# CONFIG_THERMAL_HWMON is not set
		# CONFIG_WATCHDOG is not set
		CONFIG_SSB_POSSIBLE=y

		#
		# Sonics Silicon Backplane
		#
		# CONFIG_SSB is not set

		#
		# Multifunction device drivers
		@@ -433,22 +444,7 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_HTC_PASIC3 is not set
		# CONFIG_MFD_TMIO is not set
		# CONFIG_REGULATOR is not set

		#
		# Multimedia devices
		#

		#
		# Multimedia core support
		#
		# CONFIG_VIDEO_DEV is not set
		# CONFIG_DVB_CORE is not set
		# CONFIG_VIDEO_MEDIA is not set

		#
		# Multimedia drivers
		#
		# CONFIG_DAB is not set
		# CONFIG_MEDIA_SUPPORT is not set

		#
		# Graphics support
		@@ -469,9 +465,12 @@ CONFIG_SSB_POSSIBLE=y
		# CONFIG_NEW_LEDS is not set
		# CONFIG_ACCESSIBILITY is not set
		# CONFIG_RTC_CLASS is not set
		# CONFIG_DMADEVICES is not set
		# CONFIG_AUXDISPLAY is not set
		# CONFIG_UIO is not set

		#
		# TI VLYNQ
		#
		# CONFIG_STAGING is not set

		#
		@@ -485,12 +484,15 @@ CONFIG_EXT2_FS=y
		# CONFIG_REISERFS_FS is not set
		# CONFIG_JFS_FS is not set
		# CONFIG_FS_POSIX_ACL is not set
		CONFIG_FILE_LOCKING=y
		# CONFIG_XFS_FS is not set
		# CONFIG_GFS2_FS is not set
		# CONFIG_OCFS2_FS is not set
		# CONFIG_BTRFS_FS is not set
		CONFIG_FILE_LOCKING=y
		CONFIG_FSNOTIFY=y
		# CONFIG_DNOTIFY is not set
		# CONFIG_INOTIFY is not set
		CONFIG_INOTIFY_USER=y
		# CONFIG_QUOTA is not set
		# CONFIG_AUTOFS_FS is not set
		# CONFIG_AUTOFS4_FS is not set
		@@ -678,6 +680,7 @@ CONFIG_DEBUG_INFO=y
		# CONFIG_SYSCTL_SYSCALL_CHECK is not set
		# CONFIG_PAGE_POISONING is not set
		# CONFIG_SAMPLES is not set
		# CONFIG_KMEMCHECK is not set
		CONFIG_EARLY_PRINTK=y
		CONFIG_HEART_BEAT=y
		CONFIG_DEBUG_BOOTMEM=y
		@@ -793,6 +796,5 @@ CONFIG_ZLIB_INFLATE=y
		CONFIG_DECOMPRESS_GZIP=y
		CONFIG_HAS_IOMEM=y
		CONFIG_HAS_IOPORT=y
		CONFIG_HAS_DMA=y
		CONFIG_HAVE_LMB=y
		CONFIG_NLATTR=y