Linus Torvalds
8b306a2e7c
Various bugfixes, a RDMA update from Chuck Lever, and support for a new ...
pnfs layout type from Christoph Hellwig. The new layout type is a
variant of the block layout which uses SCSI features to offer improved
fencing and device identification.
Note this pull request also includes the client side of SCSI layout,
with Trond's permission.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJW9D0/AAoJECebzXlCjuG+fYcP/ibluAOSRrQ523gQcJNS+QSV
3B7YY6diJkfQNkm4oAROwPd1KHT2qhoVAO3JHXA3SZnjVVYQxAHeh2wsZJ2jL6Ft
uyZARxix+F9alJVT3S+uYLwagjh9LXLhb0MaRTMheaWGsPKLQTU4JtsLsjAIhCah
R0EIIdQfWcb83XoVPmiflVO4Nl/TQWmfA5wHfoVtITJcL3AaC9gzCGNbc8dHLnFC
HRjGVgHr3nSL3suvUEFfxSEo4QoNPWIX4kBaWXgqbVgOQqmbtQtaXdnd3gIRtkzj
9Q/lxiwaArtDjdAQdyNtRRBUpkpWo+xWp/vpnNUxTXKoRtpSyqYQX5FaPCPRVAAp
GYGw2qHrvWn2hSajtVtKyWwsQ3lYsDmbkxAkgScO9kQdS+kuxNyIzYIEvakdtFyJ
txFsauJczkNNFeHKzLPDoGbuX7KB/+pUsjmX5nYtMhwRriXA5S8zcO4AvTrmTPDF
vQrLM97mqI60LWmpQUO1OE8CEFPVx5DUZ0KdLMvFNKPZph8BTPJxJMmxJK4R6stV
/TWglRTEO8IGUh0ww8+3PfMfxVG5XHnQc99+VGVZOS9hJ4GOXbWYAqZ0m+sRJ2Pi
JPawILie5x2gH1FrVYbcTZsQzdmdn/BF9yePNzAkMucjuEUHXFTlf3MMfEhKpYTl
0l8LBCv6ZvtGU+PUJxZn
=MToz
-----END PGP SIGNATURE-----
Merge tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux
Pull more nfsd updates from Bruce Fields:
"Apologies for the previous request, which omitted the top 8 commits
from my for-next branch (including the SCSI layout commits). Thanks
to Trond for spotting my error!"
This actually includes the new layout types, so here's that part of
the pull message repeated:
"Support for a new pnfs layout type from Christoph Hellwig. The new
layout type is a variant of the block layout which uses SCSI features
to offer improved fencing and device identification.
Note this pull request also includes the client side of SCSI layout,
with Trond's permission"
* tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux:
nfsd: use short read as well as i_size to set eof
nfsd: better layoutupdate bounds-checking
nfsd: block and scsi layout drivers need to depend on CONFIG_BLOCK
nfsd: add SCSI layout support
nfsd: move some blocklayout code
nfsd: add a new config option for the block layout driver
nfs/blocklayout: add SCSI layout support
nfs4.h: add SCSI layout definitions
2016-03-24 19:50:32 -07:00
platform-drivers-x86 for 4.6-1
2016-03-23 17:20:59 -07:00
Documentation-getdelays: Apply a recommendation from "checkpatch.pl" in main()
2015-12-24 07:22:32 -07:00
mfd: core: redo ACPI matching of the children devices
2015-10-26 15:25:53 +01:00
ARM: SoC 64-bit changes for v4.6
2016-03-20 15:08:45 -07:00
arm64: Add workaround for Cavium erratum 27456
2016-02-26 15:14:27 +00:00
A relatively boring cycle in the docs tree. There's a few kernel-doc
2016-01-17 11:55:07 -08:00
cpqarray: remove it from the kernel
2016-03-14 09:06:01 -06:00
Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-03-18 20:25:49 -07:00
Documentation: cpufreq: intel_pstate: fix typo
2016-02-18 20:31:53 +01:00
crypto: doc - Use ahash
2016-02-06 15:33:11 +08:00
dm cache: make the 'mq' policy an alias for 'smq'
2016-03-10 17:12:08 -05:00
ARM: DT changes, part 2
2016-03-24 19:01:38 -07:00
Merge branch 'topic/async' into for-linus
2016-01-06 15:17:47 +05:30
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2016-03-21 13:48:00 -07:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2016-03-19 16:31:54 -07:00
[media] media: change email address
2016-01-25 12:01:08 -02:00
net: Add support for CHANGEUPPER notifier error injection
2015-12-03 11:49:23 -05:00
Documentation/fb: add documentation for sm712fb
2015-08-07 15:05:01 -07:00
arm64 updates for 4.6:
2016-03-17 20:03:47 -07:00
Various bugfixes, a RDMA update from Chuck Lever, and support for a new
2016-03-24 19:50:32 -07:00
usage documentation for FPGA manager core
2015-10-07 18:07:20 +01:00
gpio: documenatation: fix GPIO_LOOKUP{,_IDX} documentation
2016-02-25 16:01:51 +01:00
hwmon: Create an NSA320 hardware monitoring driver
2016-03-08 18:40:49 -08:00
Doc: i2c: Fix typo in Documentation/i2c
2016-02-10 13:12:14 -07:00
iio: Documentation: Add IIO configfs documentation
2015-12-03 18:19:28 +00:00
staging/rdma/hfi1: Method to toggle "fast ECN" detection
2016-03-10 20:37:50 -05:00
Input: add userio module
2015-10-27 18:55:31 -07:00
gpio: uapi: use 0xB4 as ioctl() major
2016-03-10 16:02:52 +07:00
isdn: i4l: move active-isdn drivers to staging
2016-03-05 15:00:38 -08:00
Doc: ja_JP: Fix a typo in HOWTO
2016-02-10 13:14:37 -07:00
kbuild: document recursive dependency limitation / resolution
2015-10-08 15:36:16 +02:00
Documentation/ko_KR: update maintainer information
2016-02-17 14:10:39 -07:00
Move freefall program from Documentation/ to tools/
2015-06-08 16:42:07 -06:00
Documentation: leds: Add description of brightness setting API
2016-01-04 09:57:31 +01:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-11-03 16:10:43 -08:00
Char/Misc patches for 4.6-rc1
2016-03-17 13:47:50 -07:00
Merge char-misc-next into staging-next
2016-02-22 14:46:24 -08:00
mmc: core: Remove MMC_CLKGATE
2015-10-26 16:00:09 +01:00
Documentation: mtd: improve nand_ecc.txt for readability and correctness
2015-11-17 17:05:14 -08:00
igmp: Document sysctl_igmp_max_msf
2016-03-21 22:56:37 -04:00
NFC: Fix typo in nfc-hci.txt
2015-06-08 23:15:45 +02:00
libnvdimm: documentation clarifications
2015-11-12 09:55:23 -08:00
Documentation: nvmem: add nvmem api level and how-to doc
2015-08-05 13:43:45 -07:00
pcmcia: Fix typo in locking documentation
2015-08-07 14:34:58 +02:00
Merge branches 'pm-pci' and 'pm-core'
2016-01-12 01:10:52 +01:00
cxl: Support to flash a new image on the adapter from a guest
2016-03-09 23:39:56 +11:00
Doc: pps: Fix file name in pps.txt
2015-07-14 12:35:42 -06:00
Documentation: Fix int/unsigned int comparison
2016-02-17 14:09:43 -07:00
Another relatively boring cycle for the docs tree: typo fixes, translation
2016-03-17 12:09:35 -07:00
rapidio: add mport char device driver
2016-03-22 15:36:02 -07:00
documentation: Update RCU requirements based on expedited changes
2015-12-05 12:34:32 -08:00
s390/zcore: remove /sys/kernel/debug/zcore/mem
2015-11-27 09:24:12 +01:00
st: Fix MTMKPART to work with newer drives
2016-02-23 21:27:02 -05:00
keys, trusted: seal with a TPM2 authorization policy
2015-12-20 15:27:13 +02:00
tty: Remove chars_in_buffer() line discipline method
2016-01-27 15:01:44 -08:00
Merge branch 'topic/hda-mst' into for-next
2016-02-10 09:25:15 +01:00
spi: tools: move spidev_test metadata
2015-11-30 12:14:12 +00:00
Merge branch 'akpm' (patches from Andrew)
2016-03-18 19:26:54 -07:00
target/user: Report capability of handling out-of-order completions to userspace
2016-03-10 21:49:09 -08:00
thermal: doc: Add details of devm_thermal_zone_of_sensor_{register,unregister}
2016-03-09 10:51:41 -08:00
Another relatively boring cycle for the docs tree: typo fixes, translation
2016-03-17 12:09:35 -07:00
x86, tracing, perf: Add trace point for MSR accesses
2015-12-06 12:56:10 +01:00
usb: devio: Add ioctl to disallow detaching kernel USB drivers.
2016-03-05 12:05:01 -08:00
Documentation/vDSO: don't build tests when cross compiling
2015-06-22 16:04:57 -06:00
[media] saa7134: Add support for Snazio TvPVR PRO
2016-03-03 09:03:48 -03:00
One of the largest releases for KVM... Hardly any generic improvement,
2016-03-16 09:55:35 -07:00
mm: thp: set THP defrag by default to madvise and add a stall-free defrag option
2016-03-17 15:09:34 -07:00
w1: masters: omap_hdq: add support for 1-wire mode
2015-10-05 04:47:09 +01:00
Merge git://www.linux-watchdog.org/linux-watchdog
2016-03-19 19:35:51 -07:00
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-20 18:58:18 -07:00
Documentation: Chinese translation of arm64/silicon-errata.txt
2016-02-17 14:08:07 -07:00
Documentation: describe how to add a system call
2015-08-13 17:54:06 -06:00
locking/atomics, cmpxchg: Privatize the inclusion of asm/cmpxchg.h
2015-09-13 10:35:46 +02:00
Merge branch 'for-4.6-ns' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2016-03-21 10:05:13 -07:00
There is a nice new document from Neil on how pathname lookups work and
2015-11-05 15:59:24 -08:00
clk: change clk_ops' ->determine_rate() prototype
2015-07-27 18:12:01 -07:00
Documentation/CodingStyle: add space before parenthesis in example macro
2016-01-25 12:36:28 -07:00
Documentation: cpu-hotplug: Fix sysfs mount instructions
2015-12-10 11:35:30 -07:00
Documentation: Update cputopology.txt
2015-05-27 15:22:15 +02:00
Doc: Change wikipedia's URL from http to https
2015-06-22 10:14:05 -06:00
dma-mapping: always provide the dma_map_ops based implementation
2016-01-20 17:09:18 -08:00
DMA-API: fix confusing sentence in Documentation/DMA-API.txt
2016-01-11 18:29:00 -07:00
ARM: 8506/1: common: DMA-mapping: add DMA_ATTR_ALLOC_SINGLE_PAGES attribute
2016-02-11 15:33:38 +00:00
dma-buf: Add ioctls to allow userspace to flush
2016-02-12 16:01:32 +01:00
Documentation: dontdiff: remove media from dontdiff
2015-11-11 10:08:07 -07:00
EDAC: Remove references to bluesmoke.sourceforge.net
2015-11-26 14:46:06 +01:00
doc: efi-stub.txt: Fix arm64 paths
2015-12-14 15:24:03 +00:00
A few more documentation patches that wandered in and have no reason to
2015-11-13 09:19:05 -08:00
Documentation: Howto: Fixed subtitles style
2016-03-09 15:30:03 -07:00
hwrng: doc - Fix device node name reference /dev/hw_random => /dev/hwrng
2015-09-21 22:00:41 +08:00
iommu/vt-d: Fix link to Intel IOMMU Specification
2016-01-29 12:32:12 +01:00
ipmi watchdog : add panic_wdt_timeout parameter
2015-11-16 06:28:43 -06:00
irqdomain: Documentation updates
2015-10-13 19:01:25 +02:00
mm, slub, kasan: enable user tracking by default with KASAN=y
2015-11-05 19:34:48 -08:00
kernel: add kcov code coverage
2016-03-22 15:36:02 -07:00
Documenation: Update location of docproc.c
2015-07-14 12:36:39 -06:00
Documentation: translations: update linux cross reference link
2016-01-11 18:26:58 -07:00
Merge branch 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-20 19:08:56 -07:00
irq_poll: make blk-iopoll available outside the block layer
2015-12-11 11:52:24 -08:00
Doc: Change wikipedia's URL from http to https
2015-06-22 10:14:05 -06:00
Documentation: kselftest: Remove duplicate word
2016-03-09 15:33:38 -07:00
kernel/watchdog.c: add sysctl knob hardlockup_panic
2015-11-05 19:34:48 -08:00
Documentation: minor typo fix in mailbox.txt
2015-08-13 18:03:18 -06:00
spi: Move spi code from Documentation to tools
2015-11-23 14:54:01 +00:00
md-cluster: update the documentation
2016-01-06 11:39:06 +11:00
doc:md: fix typo in md.txt.
2015-06-23 06:49:44 -06:00
documentation: Clarify compiler store-fusion example
2016-03-14 15:52:19 -07:00
memory-hotplug: add automatic onlining policy for the newly added memory
2016-03-15 16:55:16 -07:00
Documentation: Minor changes to men-chameleon-bus.txt
2015-07-24 15:15:17 +02:00
modsign: Fix documentation on module signing enforcement parameter.
2016-03-12 01:48:11 -07:00
NTB: Rename Intel code names to platform names
2015-07-04 14:09:25 -04:00
mm, printk: introduce new format string for flags
2016-03-15 16:55:16 -07:00
documentation: fix small typo in rbtree.txt
2015-09-13 14:38:50 -06:00
remoteproc: introduce rproc_get_by_phandle API
2015-06-16 21:12:52 +03:00
rfkill: Add documentation about LED triggers
2016-02-24 09:13:12 +01:00
rtc: implement a sysfs interface for clock offset
2016-03-14 17:08:16 +01:00
stable_kernel_rules.txt: Remove extra space after Cc:
2015-11-20 16:54:57 -07:00
locking/static_keys: Fix up the static keys documentation
2015-09-15 07:12:06 +02:00
SubmittingPatches: fix spelling of "git send-email"
2016-01-25 12:30:18 -07:00
mm, oom: do not panic for oom kills triggered from sysrq
2015-09-08 15:35:28 -07:00
UBSAN: run-time undefined behavior sanity checker
2016-01-20 17:09:18 -08:00
vfio: powerpc/spapr: Support Dynamic DMA windows
2015-06-11 15:16:55 +10:00
Documentation: mention vme_master_mmap() in VME API
2015-06-12 17:26:56 -07:00
8b306a2e7c
