Commit 76eb75be authored by David S. Miller's avatar David S. Miller
Browse files
parents 57ea884b e02003b5
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ DOCBOOKS := z8530book.xml \
	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	    80211.xml sh.xml regulator.xml w1.xml \
	    sh.xml regulator.xml w1.xml \
	    writing_musb_glue_layer.xml iio.xml
	    writing_musb_glue_layer.xml iio.xml


ifeq ($(DOCBOOKS),)
ifeq ($(DOCBOOKS),)
+3 −3
Original line number Original line Diff line number Diff line
@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes.


io_poll (RW)
io_poll (RW)
------------
------------
When read, this file shows the total number of block IO polls and how
When read, this file shows whether polling is enabled (1) or disabled
many returned success.  Writing '0' to this file will disable polling
(0).  Writing '0' to this file will disable polling for this device.
for this device.  Writing any non-zero value will enable this feature.
Writing any non-zero value will enable this feature.


io_poll_delay (RW)
io_poll_delay (RW)
------------------
------------------
+2 −2
Original line number Original line Diff line number Diff line
@@ -5,8 +5,8 @@ platform_labels - INTEGER
	possible to configure forwarding for label values equal to or
	possible to configure forwarding for label values equal to or
	greater than the number of platform labels.
	greater than the number of platform labels.


	A dense utliziation of the entries in the platform label table
	A dense utilization of the entries in the platform label table
	is possible and expected aas the platform labels are locally
	is possible and expected as the platform labels are locally
	allocated.
	allocated.


	If the number of platform label table entries is set to 0 no
	If the number of platform label table entries is set to 0 no
+1 −1
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ bool ether_addr_equal(const u8 *addr1, const u8 *addr2)
#else
#else
	const u16 *a = (const u16 *)addr1;
	const u16 *a = (const u16 *)addr1;
	const u16 *b = (const u16 *)addr2;
	const u16 *b = (const u16 *)addr2;
	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) != 0;
	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | (a[2] ^ b[2])) == 0;
#endif
#endif
}
}


+12 −5
Original line number Original line Diff line number Diff line
@@ -5086,9 +5086,11 @@ F: drivers/net/wan/dlci.c
F:	drivers/net/wan/sdla.c
F:	drivers/net/wan/sdla.c


FRAMEBUFFER LAYER
FRAMEBUFFER LAYER
M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
L:	linux-fbdev@vger.kernel.org
L:	linux-fbdev@vger.kernel.org
T:	git git://github.com/bzolnier/linux.git
Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
Q:	http://patchwork.kernel.org/project/linux-fbdev/list/
S:	Orphan
S:	Maintained
F:	Documentation/fb/
F:	Documentation/fb/
F:	drivers/video/
F:	drivers/video/
F:	include/video/
F:	include/video/
@@ -8858,17 +8860,22 @@ F: drivers/video/fbdev/nvidia/
NVM EXPRESS DRIVER
NVM EXPRESS DRIVER
M:	Keith Busch <keith.busch@intel.com>
M:	Keith Busch <keith.busch@intel.com>
M:	Jens Axboe <axboe@fb.com>
M:	Jens Axboe <axboe@fb.com>
M:	Christoph Hellwig <hch@lst.de>
M:	Sagi Grimberg <sagi@grimberg.me>
L:	linux-nvme@lists.infradead.org
L:	linux-nvme@lists.infradead.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
T:	git://git.infradead.org/nvme.git
W:	https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
W:	http://git.infradead.org/nvme.git
S:	Supported
S:	Supported
F:	drivers/nvme/host/
F:	drivers/nvme/host/
F:	include/linux/nvme.h
F:	include/linux/nvme.h
F:	include/uapi/linux/nvme_ioctl.h


NVM EXPRESS TARGET DRIVER
NVM EXPRESS TARGET DRIVER
M:	Christoph Hellwig <hch@lst.de>
M:	Christoph Hellwig <hch@lst.de>
M:	Sagi Grimberg <sagi@grimberg.me>
M:	Sagi Grimberg <sagi@grimberg.me>
L:	linux-nvme@lists.infradead.org
L:	linux-nvme@lists.infradead.org
T:	git://git.infradead.org/nvme.git
W:	http://git.infradead.org/nvme.git
S:	Supported
S:	Supported
F:	drivers/nvme/target/
F:	drivers/nvme/target/


@@ -13533,11 +13540,11 @@ F: arch/x86/xen/*swiotlb*
F:	drivers/xen/*swiotlb*
F:	drivers/xen/*swiotlb*


XFS FILESYSTEM
XFS FILESYSTEM
M:	Dave Chinner <david@fromorbit.com>
M:	Darrick J. Wong <darrick.wong@oracle.com>
M:	linux-xfs@vger.kernel.org
M:	linux-xfs@vger.kernel.org
L:	linux-xfs@vger.kernel.org
L:	linux-xfs@vger.kernel.org
W:	http://xfs.org/
W:	http://xfs.org/
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
T:	git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
S:	Supported
S:	Supported
F:	Documentation/filesystems/xfs.txt
F:	Documentation/filesystems/xfs.txt
F:	fs/xfs/
F:	fs/xfs/
Loading