Linus Torvalds b9044ac829 Merge of primary rdma-core code for 4.9 ... - Updates to mlx5 - Updates to mlx4 (two conflicts, both minor and easily resolved) - Updates to iw_cxgb4 (one conflict, not so obvious to resolve, proper resolution is to keep the code in cxgb4_main.c as it is in Linus' tree as attach_uld was refactored and moved into cxgb4_uld.c) - Improvements to uAPI (moved vendor specific API elements to uAPI area) - Add hns-roce driver and hns and hns-roce ACPI reset support - Conversion of all rdma code away from deprecated create_singlethread_workqueue - Security improvement: remove unsafe ib_get_dma_mr (breaks lustre in staging) -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJX+AwSAAoJELgmozMOVy/d0WkQAKxPzVccMWwHv28iZI4ey13u JwE+VoCNpCAZAVuEgzK5zzFdNHPvAk2jU93H4apA7dfXJBXPatVuj9Lnk+ieEEnW tbFwJjBpbQ3Zol3+SPfAHnsVMbtax+xmd6WDKExPXXEDl1L6rutwL3KKfmgWEitg ysX7XOJCiSdyM0hcg4T6UPB9a3jGPff9NLu0oGamV+yoUk5Y0WGoVFxHZ4MKcw8t OkFBYIxGz4SGwq2tulStuH03HteURX594KngtrA8dyq6l1R2GlGRv+bkJAUEIWUv aA0ow3VWusOM6fT+jLXPCv8iUwIXM8tR/U6F7X+cmORUUtWvCl+uCUVid113j/aN BK+Af2nJnfoJ5cDBPsD+bC76l5gQycNZO/Qh8op2kmgJtD+6OpGM3cBXsHx53+kk 0wloJ2lKCGShWxNj+ig8n8rR/rhhs/x3vV3ouCVWNMbOUgOSN3eYHxmK3wGFW4nd Qx+WYCjj9Yi/J6nmUDcfEQ4NWPR22Q2+0ENAabfhLhV6mDloAO5ILHd4GDqC3IA9 UtxlVjf4ZonaiLnTQQzCnDMGVVk6tT8FJ9D42s0ScwjbdYwjyCW9/rs/g2EhcprR Cc+AmjqLviCWGtzBSFO0SijqQon8lcQOwdLw61CdFFvPa/mlLdf1rbx9ArIyNVKn JSrbr3CGyoqyYj6qaEO5 =LC+S -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma Pull main rdma updates from Doug Ledford: "This is the main pull request for the rdma stack this release. The code has been through 0day and I had it tagged for linux-next testing for a couple days. Summary: - updates to mlx5 - updates to mlx4 (two conflicts, both minor and easily resolved) - updates to iw_cxgb4 (one conflict, not so obvious to resolve, proper resolution is to keep the code in cxgb4_main.c as it is in Linus' tree as attach_uld was refactored and moved into cxgb4_uld.c) - improvements to uAPI (moved vendor specific API elements to uAPI area) - add hns-roce driver and hns and hns-roce ACPI reset support - conversion of all rdma code away from deprecated create_singlethread_workqueue - security improvement: remove unsafe ib_get_dma_mr (breaks lustre in staging)" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (75 commits) staging/lustre: Disable InfiniBand support iw_cxgb4: add fast-path for small REG_MR operations cxgb4: advertise support for FR_NSMR_TPTE_WR IB/core: correctly handle rdma_rw_init_mrs() failure IB/srp: Fix infinite loop when FMR sg[0].offset != 0 IB/srp: Remove an unused argument IB/core: Improve ib_map_mr_sg() documentation IB/mlx4: Fix possible vl/sl field mismatch in LRH header in QP1 packets IB/mthca: Move user vendor structures IB/nes: Move user vendor structures IB/ocrdma: Move user vendor structures IB/mlx4: Move user vendor structures IB/cxgb4: Move user vendor structures IB/cxgb3: Move user vendor structures IB/mlx5: Move and decouple user vendor structures IB/{core,hw}: Add constant for node_desc ipoib: Make ipoib_warn ratelimited IB/mlx4/alias_GUID: Remove deprecated create_singlethread_workqueue IB/ipoib_verbs: Remove deprecated create_singlethread_workqueue IB/ipoib: Remove deprecated create_singlethread_workqueue ...		2016-10-09 17:04:33 -07:00
..
ABI	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2016-10-07 11:58:38 -07:00
accounting	taskstats: fix nl parsing in accounting/getdelays.c	2016-04-27 12:50:14 -04:00
acpi	Merge branches 'acpi-button', 'acpi-battery' and 'acpi-doc'	2016-10-02 01:40:20 +02:00
aoe
arm	ARM: SoC platform updates for v4.9	2016-10-07 21:18:42 -07:00
arm64	arm64 updates for 4.9:	2016-10-03 08:58:35 -07:00
auxdisplay
backlight
blackfin
block	block: remove remnant refs to hardsect	2016-09-14 08:44:57 -06:00
blockdev	zram: cosmetic: cleanup documentation	2016-07-26 16:19:19 -07:00
bus-devices
cdrom
cgroup-v1	Three fixes for the docs build, including removing an annoying warning on	2016-08-07 10:23:17 -04:00
cma
connector	samples: connector: from Documentation to samples directory	2016-04-28 07:47:35 -06:00
console
cpu-freq	cpufreq-stats: Minor documentation fix	2016-09-08 23:05:07 +02:00
cpuidle
cris
crypto	crypto: doc - Fix typo	2016-05-31 16:41:55 +08:00
dev-tools	Merge branch 'dev-tools' into doc/4.9	2016-08-19 11:38:36 -06:00
development-process	docs-rst: add inter-document cross references	2016-09-21 15:43:09 -06:00
device-mapper	block: rename bio bi_rw to bi_opf	2016-08-07 14:41:02 -06:00
devicetree	Merge of primary rdma-core code for 4.9	2016-10-09 17:04:33 -07:00
dmaengine	dmaengine: documentation to the new callback mechanism	2016-08-08 08:11:42 +05:30
DocBook	Merge branch 'driver-api' into doc/4.9	2016-09-16 10:04:25 -06:00
driver-api	docs: Don't format internal MPT docs	2016-09-06 09:15:48 -06:00
driver-model	power supply and reset changes for the v4.9 series	2016-10-06 18:21:15 -07:00
early-userspace
EDID
extcon
fault-injection
fb	Documentation: fb: fix spelling mistakes	2016-05-10 12:05:27 +03:00
features	powerpc: Add HAVE_PERF_USER_STACK_DUMP support	2016-05-11 21:54:05 +10:00
filesystems	Documentation/filesystems/proc.txt: add more description for maps/smaps	2016-10-07 18:46:30 -07:00
firmware_class	Documentation: fix common spelling mistakes	2016-04-28 07:51:59 -06:00
fmc
fpga
frv
gpio	Merge branch 'gpio-irq-validmask' of /home/linus/linux-pinctrl into devel	2016-09-23 14:51:18 +02:00
gpu	doc-rst: add index to sub-folders	2016-08-18 15:31:56 -06:00
hid	Documentation: HID: Intel ISH HID document	2016-08-17 11:13:07 +02:00
hwmon	hwmon: (max6650) Allow fan shutdown and initial rpm target	2016-09-08 21:34:17 -07:00
i2c	Documentation: i2c: slave-interface: add note for driver development	2016-09-08 16:57:14 +02:00
ia64
ide
iio	iio: Documentation: Correct the path used to create triggers.	2016-10-01 00:49:58 -06:00
infiniband	IB/hfi1: Document new sysfs entries for hfi1 driver	2016-10-02 08:42:19 -04:00
input	Input: clarify we want BTN_TOOL_<name> on proximity	2016-04-06 10:23:09 -07:00
ioctl	doc: ioctl: Add some clarifications to botching-up-ioctls	2016-09-06 06:00:22 -06:00
isdn
ja_JP	Documentatio: HOWTO: remove regression postings info from translations	2016-04-16 10:49:08 -06:00
kbuild	kconfig-language: improve menuconfig usage description	2016-08-18 15:23:31 -06:00
kdump	Documentation: kdump: Add description of enable multi-cpus support	2016-09-20 18:02:54 -06:00
ko_KR	locking/Documentation: Add Korean translation	2016-08-12 08:24:14 +02:00
laptops	leds: documentation: 'ide-disk' to 'disk-activity'	2016-06-27 08:58:35 +02:00
leds	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds	2016-10-04 10:25:53 -07:00
livepatch	Documentation: livepatch: add section about arch-specific code	2016-08-18 23:41:56 +02:00
locking	locking/lglock: Remove lglock implementation	2016-09-22 15:25:56 +02:00
m68k
media	This is the documentation update pull for the 4.9 merge window.	2016-10-04 13:54:07 -07:00
memory-devices
metag
mic	mpssd: fix buffer overflow warning	2016-06-03 13:31:37 -06:00
mips
misc-devices
mmc	mmc: core: Extend sysfs with DSR register	2016-07-25 10:34:51 +02:00
mn10300
mtd
namespaces
netlabel
networking	doc: update switchdev L3 section	2016-09-28 04:48:00 -04:00
nfc
nios2
nvdimm	libnvdimm, btt: update the usage section in Documentation	2016-06-17 16:23:23 -07:00
nvmem
parisc
PCI	PCI changes for the v4.9 merge window:	2016-10-07 11:46:37 -07:00
pcmcia
perf	perf: xgene: Add APM X-Gene SoC Performance Monitoring Unit driver	2016-09-15 11:20:55 -07:00
phy
platform
power	power supply and reset changes for the v4.9 series	2016-10-06 18:21:15 -07:00
powerpc	powerpc updates for 4.9	2016-10-07 20:19:31 -07:00
pps	Documentation: pps: fix spelling mistake	2016-04-28 07:23:59 -06:00
prctl
pti
ptp	Another relatively boring cycle for the docs tree: typo fixes, translation	2016-03-17 12:09:35 -07:00
rapidio	rapidio/documentation/mport_cdev: add missing parameter description	2016-09-01 17:52:02 -07:00
RCU	documentation: Record reason for rcu_head two-byte alignment	2016-08-22 09:25:33 -07:00
s390	s390/Documentation: improve sort command for trace buffer	2016-06-13 15:58:23 +02:00
scheduler	sched/deadline: Document behavior of sched_yield()	2016-09-10 11:17:41 +02:00
scsi	scsi: dtc: remove from tree	2016-09-26 20:49:25 -04:00
security	Some big changes this month, headlined by the addition of a new formatted	2016-07-26 13:05:11 -07:00
serial	Documentation: rs485: Do not define manually the ioctl	2016-08-18 11:08:33 -06:00
sh
sound	ASoC: Updates for v4.8	2016-07-26 10:35:31 +02:00
sphinx	doc-rst:c-domain: function-like macros arguments	2016-09-16 09:53:40 -06:00
sphinx-static	This is the documentation update pull for the 4.9 merge window.	2016-10-04 13:54:07 -07:00
spi
sysctl	mnt: Add a per mount namespace limit on the number of mounts	2016-09-30 12:46:48 -05:00
target	target: make close_session optional	2016-05-10 01:19:26 -07:00
thermal	Doc: PM: Fix a typo in intel_powerclamp.txt	2016-06-30 13:05:40 -06:00
timers	Documentation: fix common spelling mistakes	2016-04-28 07:51:59 -06:00
tpm	tpm: Add documentation for the tpm_vtpm_proxy device driver	2016-06-25 17:26:35 +03:00
trace	This release cycle is rather small. Just a few fixes to tracing.	2016-10-06 11:48:41 -07:00
usb	Documentation: tiny typo fix in usb/gadget_multi.txt	2016-06-23 08:09:10 -06:00
vDSO
virtual	KVM: arm64: Require in-kernel irqchip for PMU support	2016-09-27 18:57:07 +02:00
vm	Three fixes for the docs build, including removing an annoying warning on	2016-08-07 10:23:17 -04:00
w1	w1: add ability to set (SRAM) and store (EEPROM) configuration for temp sensors like DS18B20	2016-05-01 14:37:49 -07:00
watchdog	Documentation/watchdog: check return value for magic close	2016-07-25 11:02:17 +02:00
wimax
x86	x86: fix memory ranges in mm documentation	2016-09-06 06:42:42 -06:00
xtensa	xtensa: cleanup MMU setup and kernel layout macros	2016-07-24 06:33:58 +03:00
zh_CN	docs: deprecate kernel-doc-nano-HOWTO.txt	2016-07-20 16:45:37 -06:00
.gitignore	Add .pyc files to .gitignore	2016-06-30 13:07:33 -06:00
00-INDEX	docs: deprecate kernel-doc-nano-HOWTO.txt	2016-07-20 16:45:37 -06:00
adding-syscalls.txt	documentation: trivial typo: adding-syscalls.txt: s/statat/fstatat/	2016-04-18 11:31:49 -06:00
applying-patches.txt	docs: Clean up bare :: lines	2016-09-20 18:46:36 -06:00
assoc_array.txt
atomic_ops.txt
bad_memory.txt
basic_profiling.txt
bcache.txt	bcache: documentation formatting, edited for clarity, stripe alignment notes	2016-06-23 07:58:38 -06:00
binfmt_misc.txt	binfmt_misc: add F option description to documentation	2016-03-30 14:12:22 -07:00
braille-console.txt
bt8xxgpio.txt
btmrvl.txt
BUG-HUNTING
bus-virt-phys-mapping.txt
cachetlb.txt
cec.txt	[media] cec.txt: add CEC framework documentation	2016-06-22 08:36:50 -03:00
cgroup-v2.txt	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
Changes	docs: Clean up bare :: lines	2016-09-20 18:46:36 -06:00
circular-buffers.txt
clk.txt	Documentation: clk: update file names containing referenced structures	2016-08-14 12:12:36 -06:00
CodeOfConflict	URL changed for Linux Foundation TAB	2016-10-01 00:57:13 -06:00
CodingStyle	docs: Remove space-before-label guidance from CodingStyle	2016-09-21 15:53:31 -06:00
conf.py	This is the documentation update pull for the 4.9 merge window.	2016-10-04 13:54:07 -07:00
cpu-hotplug.txt
cpu-load.txt
cputopology.txt	topology/sysfs: provide drawer id and siblings attributes	2016-06-13 15:58:27 +02:00
crc32.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt
devices.txt	Documentation: update the devices.txt documentation	2016-03-29 10:11:44 -07:00
digsig.txt
DMA-API-HOWTO.txt	Documentation: DMA-API-HOWTO: Fix a typo	2016-09-20 17:58:46 -06:00
DMA-API.txt	dma-mapping: add dma_{map,unmap}_resource	2016-09-26 22:16:41 +05:30
DMA-attributes.txt	dma-mapping: use unsigned long for dma_attrs	2016-08-04 08:50:07 -04:00
dma-buf-sharing.txt	dma-buf: Update docs for SYNC ioctl	2016-03-21 09:26:45 +01:00
DMA-ISA-LPC.txt
docutils.conf	doc-rst: add docutils config file	2016-08-14 11:52:40 -06:00
dontdiff	GCC plugin infrastructure	2016-06-07 22:57:10 +02:00
dynamic-debug-howto.txt
edac.txt
efi-stub.txt
eisa.txt
email-clients.txt	Documentation/email-clients.txt: convert it to ReST markup	2016-09-21 15:41:50 -06:00
flexible-arrays.txt
futex-requeue-pi.txt
gcc-plugins.txt	GCC plugin infrastructure	2016-06-07 22:57:10 +02:00
highuid.txt
HOWTO	docs: Clean up bare :: lines	2016-09-20 18:46:36 -06:00
hw_random.txt
hwspinlock.txt
index.rst	docs-rst: create a book for the development process	2016-09-20 18:33:46 -06:00
init.txt
initrd.txt
intel_txt.txt
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ-domain.txt	Documentation/IRQ-domain.txt: Document irq_domain_create_{linear, tree}	2016-03-31 00:32:59 -06:00
IRQ.txt
irqflags-tracing.txt
isa.txt	Documentation: Add ISA bus driver documentation	2016-05-02 09:32:04 -07:00
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	docs: deprecate kernel-doc-nano-HOWTO.txt	2016-07-20 16:45:37 -06:00
kernel-docs.txt	Documentation/kernel-docs.txt: reorder based on timestamp	2016-09-20 18:54:42 -06:00
kernel-documentation.rst	This is the documentation update pull for the 4.9 merge window.	2016-10-04 13:54:07 -07:00
kernel-parameters.txt	KVM updates for v4.9-rc1	2016-10-06 10:49:01 -07:00
kernel-per-CPU-kthreads.txt	Documenation: update cgroup's document path	2016-08-03 15:43:58 -06:00
kobject.txt
kprobes.txt	Documentation: kprobes: Document jprobes stack copying limitations	2016-08-15 10:19:11 -06:00
kref.txt
kselftest.txt
ldm.txt
local_ops.txt
lockup-watchdogs.txt
logo.gif
logo.txt
lzo.txt	Documentation: lzo: fix spelling mistakes	2016-04-28 07:23:11 -06:00
magic-number.txt
mailbox.txt
Makefile	[media] samples: v4l: from Documentation to samples directory	2016-05-09 18:34:37 -03:00
Makefile.sphinx	doc-rst: generic way to build PDF of sub-folders	2016-09-01 08:49:23 -06:00
ManagementStyle	Documentation/HOWTO: add cross-references to other documents	2016-09-20 18:41:04 -06:00
md-cluster.txt	md-cluster: change array_sectors and update size are not supported	2016-05-04 12:39:35 -07:00
md.txt	Documentation: fix wrong value in md.txt	2016-06-23 08:08:36 -06:00
memory-barriers.txt	locking/Documentation: Fix a typo of example result	2016-08-12 08:24:13 +02:00
memory-hotplug.txt	memory_hotplug: introduce CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE	2016-05-19 19:12:14 -07:00
men-chameleon-bus.txt
module-signing.txt	Documentation/module-signing.txt: Note need for version info if reusing a key	2016-07-27 12:38:00 +09:30
mono.txt
nommu-mmap.txt
ntb.txt
numastat.txt
oops-tracing.txt
padata.txt
parport-lowlevel.txt
parport.txt
percpu-rw-semaphore.txt
phy.txt	phy: core: Allow children node to be overridden	2016-04-29 16:39:39 +02:00
pi-futex.txt
pinctrl.txt	pinctrl: Flag strict is a field in struct pinmux_ops	2016-06-23 10:50:10 +02:00
pnp.txt
preempt-locking.txt
printk-formats.txt
pwm.txt	pwm: Update documentation	2016-05-17 14:48:04 +02:00
ramoops.txt	ramoops: use DT reserved-memory bindings	2016-08-05 11:21:36 -07:00
rbtree.txt
remoteproc.txt	remoteproc: Split driver and consumer dereferencing	2016-10-02 22:50:21 -07:00
rfkill.txt
robust-futex-ABI.txt
robust-futexes.txt	Documentation: robust-futexes: fix spelling mistakes	2016-04-28 07:26:41 -06:00
rpmsg.txt	rpmsg: use module_rpmsg_driver in existing drivers and examples	2016-05-06 11:09:01 -07:00
rtc.txt
SAK.txt
SecurityBugs	Documentation/HOWTO: add cross-references to other documents	2016-09-20 18:41:04 -06:00
serial-console.txt
sgi-ioc4.txt
SM501.txt
smsc_ece1099.txt
stable_api_nonsense.txt	Documentation/HOWTO: add cross-references to other documents	2016-09-20 18:41:04 -06:00
stable_kernel_rules.txt	docs-rst: add inter-document cross references	2016-09-21 15:43:09 -06:00
static-keys.txt	jump_labels: Allow array initialisers	2016-09-07 09:41:11 +01:00
SubmitChecklist	docs-rst: add inter-document cross references	2016-09-21 15:43:09 -06:00
SubmittingDrivers	docs-rst: add inter-document cross references	2016-09-21 15:43:09 -06:00
SubmittingPatches	docs-rst: add inter-document cross references	2016-09-21 15:43:09 -06:00
svga.txt
sync_file.txt	Documentation: Fix some grammar mistakes in sync_file.txt	2016-06-03 13:24:16 -06:00
sysfs-rules.txt
sysrq.txt	Doc: correct the location of sysrq.c	2016-04-28 08:02:36 -06:00
this_cpu_ops.txt
unaligned-memory-access.txt
unicode.txt
unshare.txt
vfio.txt
VGA-softcursor.txt
vgaarbiter.txt
video-output.txt
vme_api.txt	vme: Update documentation to match api	2016-08-31 13:20:16 +02:00
volatile-considered-harmful.txt
workqueue.txt	workqueue: Fix a typo in workqueue.txt	2016-07-06 02:37:38 -06:00
xillybus.txt	Documentation: xillybus: fix spelling mistake	2016-04-28 07:44:54 -06:00
xz.txt
zorro.txt