Linus Torvalds
b8ba452683
Round two of 4.6 merge window patches ...
- A few minor core fixups needed for the next patch series
- The IB SRIOV series. This has bounced around for several versions.
Of note is the fact that the first patch in this series effects
the net core. It was directed to netdev and DaveM for each iteration
of the series (three versions total). Dave did not object, but did
not respond either. I've taken this as permission to move forward
with the series.
- The new Intel X722 iWARP driver
- A huge set of updates to the Intel hfi1 driver. Of particular interest
here is that we have left the driver in staging since it still has an
API that people object to. Intel is working on a fix, but getting
these patches in now helps keep me sane as the upstream and Intel's
trees were over 300 patches apart.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJW8HR9AAoJELgmozMOVy/dDYMP+wSBALhIdV/pqVzdLCGfIUbK
H5agonm/3b/Oj74W30w2JYqXBFfZC2LGVJy6OwocJ3wK04v/KfZbA9G+QsOuh2hQ
Db+tFn1eoltvzrcx3k/a7x6zHGC4YyxyH9OX2B3QfRsNHeE7PG9KGp5dfEs2OH1r
WGp3jMLAsHf7o8uKpa0jyTEUEErATaTlG+YoaJ+BGHwurgCNy8ni+wAn+EAFiJ3w
iEJhcXB6KY69vkLsrLYuT9xxJn4udFJ3QEk8xdPkpLKsu+6Ue5i/eNQ19VfbpZgR
c6fTc8genfIv5S+fis+0P44u1oA7Kl2JT6IZYLi35gJ60ZmxTD+7GruWP3xX/wJ2
zuR3sTj5fjcFWenk087RSIU/EK87ONPD4g9QPdZpf3FtgleTVKk3YDlqwjqf8pgv
cO6gQ1BcOBnixJvhjNFiX1c2hvNhb3CkgObly1JBwhcCzZhLkV7BNFPbZuDHAeAx
VqzNEUse4hupkgiiuiGgudcJ4fsSxMW37kyfX9QC/qyk6YVuUDbrekcWI+MAKot7
5e5dHqFExpbn1Zgvc8yfvh88H2MUQAgaYwjanWF/qpppOPRd01nTisVQIOJn7s5C
arcWzvocpQe0GL2UsvDoWwAABXznL3bnnAoCyTWOES2RhOOcw0Ibw46Jl8FQ8gnl
2IRxQ+ltNEscb2cwi5wE
=t2Ko
-----END PGP SIGNATURE-----
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma updates from Doug Ledford:
"Round two of 4.6 merge window patches.
This is a monster pull request. I held off on the hfi1 driver updates
(the hfi1 driver is intimately tied to the qib driver and the new
rdmavt software library that was created to help both of them) in my
first pull request. The hfi1/qib/rdmavt update is probably 90% of
this pull request. The hfi1 driver is being left in staging so that
it can be fixed up in regards to the API that Al and yourself didn't
like. Intel has agreed to do the work, but in the meantime, this
clears out 300+ patches in the backlog queue and brings my tree and
their tree closer to sync.
This also includes about 10 patches to the core and a few to mlx5 to
create an infrastructure for configuring SRIOV ports on IB devices.
That series includes one patch to the net core that we sent to netdev@
and Dave Miller with each of the three revisions to the series. We
didn't get any response to the patch, so we took that as implicit
approval.
Finally, this series includes Intel's new iWARP driver for their x722
cards. It's not nearly the beast as the hfi1 driver. It also has a
linux-next merge issue, but that has been resolved and it now passes
just fine.
Summary:
- A few minor core fixups needed for the next patch series
- The IB SRIOV series. This has bounced around for several versions.
Of note is the fact that the first patch in this series effects the
net core. It was directed to netdev and DaveM for each iteration
of the series (three versions total). Dave did not object, but did
not respond either. I've taken this as permission to move forward
with the series.
- The new Intel X722 iWARP driver
- A huge set of updates to the Intel hfi1 driver. Of particular
interest here is that we have left the driver in staging since it
still has an API that people object to. Intel is working on a fix,
but getting these patches in now helps keep me sane as the upstream
and Intel's trees were over 300 patches apart"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (362 commits)
IB/ipoib: Allow mcast packets from other VFs
IB/mlx5: Implement callbacks for manipulating VFs
net/mlx5_core: Implement modify HCA vport command
net/mlx5_core: Add VF param when querying vport counter
IB/ipoib: Add ndo operations for configuring VFs
IB/core: Add interfaces to control VF attributes
IB/core: Support accessing SA in virtualized environment
IB/core: Add subnet prefix to port info
IB/mlx5: Fix decision on using MAD_IFC
net/core: Add support for configuring VF GUIDs
IB/{core, ulp} Support above 32 possible device capability flags
IB/core: Replace setting the zero values in ib_uverbs_ex_query_device
net/mlx5_core: Introduce offload arithmetic hardware capabilities
net/mlx5_core: Refactor device capability function
net/mlx5_core: Fix caching ATOMIC endian mode capability
ib_srpt: fix a WARN_ON() message
i40iw: Replace the obsolete crypto hash interface with shash
IB/hfi1: Add SDMA cache eviction algorithm
IB/hfi1: Switch to using the pin query function
IB/hfi1: Specify mm when releasing pages
...
2016-03-22 15:48:44 -07:00
drivers/hwtracing: make coresight-* explicitly non-modular
2016-02-20 14:11:01 -08:00
bcma: move parallel flash support to separated file
2016-03-07 14:41:08 +02:00
ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support
2016-03-04 21:00:37 +01:00
powerpc/rcpm: add RCPM driver
2016-03-04 23:50:27 -06:00
gpio: Add devm_ apis for gpiochip_add_data and gpiochip_remove
2016-02-23 19:40:33 +05:30
MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
2016-02-25 10:56:58 +01:00
MMC core:
2016-03-21 14:35:52 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
Round two of 4.6 merge window patches
2016-03-22 15:48:44 -07:00
mmc: dw_mmc: remove DW_MCI_QUIRK_BROKEN_CARD_DETECTION quirk
2016-02-29 11:03:10 +01:00
netfilter: xtables: don't hook tables by default
2016-03-02 20:05:24 +01:00
netfilter: xtables: prepare for on-demand hook register
2016-03-02 20:05:23 +01:00
netfilter: xtables: prepare for on-demand hook register
2016-03-02 20:05:23 +01:00
netfilter: xtables: prepare for on-demand hook register
2016-03-02 20:05:23 +01:00
drivers/perf: arm_pmu: implement CPU_PM notifier
2016-02-26 14:37:06 +00:00
ARM: SoC platform updates for v4.6
2016-03-20 14:57:08 -07:00
power supply and reset changes for the v4.6 series
2016-03-17 12:50:55 -07:00
qed/qede: Add infrastructure support for hardware GRO
2016-03-07 15:01:39 -05:00
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
2016-03-13 15:19:35 +07:00
mm: move max_map_count bits into mm.h
2016-03-17 15:09:34 -07:00
ARM: SoC platform updates for v4.6
2016-03-20 14:57:08 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-03-17 21:51:52 -07:00
NFS client updates for Linux 4.6
2016-03-22 13:16:21 -07:00
include/linux/unaligned: force inlining of byteswap operations
2016-03-17 15:09:34 -07:00
USB: core: let USB device know device node
2016-03-05 12:05:01 -08:00
tty/serial: at91: fix bad offset for UART timeout register
2016-03-07 16:11:14 -08:00
powerpc updates for 4.6
2016-03-19 15:38:41 -07:00
autofs4: fix string.h include in auto_dev-ioctl.h
2016-03-15 16:55:16 -07:00
autofs4: coding style fixes
2016-03-15 16:55:16 -07:00
block: don't optimize for non-cloned bio in bio_get_last_bvec()
2016-03-12 14:12:10 -07:00
lib/bitmap.c: conversion routines to/from u32 array
2016-02-19 22:54:09 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-03-19 18:52:29 -07:00
bpf: convert stackmap to pre-allocation
2016-03-08 15:28:31 -05:00
bufferhead: force inlining of buffer head flag operations
2016-03-17 15:09:34 -07:00
mm: Some arch may want to use HPAGE_PMD related values as variables
2016-03-03 21:18:29 +11:00
arch: Introduce post-init read-only memory
2016-02-22 08:51:38 +01:00
crypto: ccp - CCP versioning support
2016-03-11 21:19:16 +08:00
cgroup: ignore css_sets associated with dead cgroups during migration
2016-03-16 13:31:46 -07:00
clocksource: Introduce clocksource_freq2mult()
2016-02-27 08:55:30 +01:00
mm, compaction: introduce kcompactd
2016-03-17 15:09:34 -07:00
vfs: vfs: Define new syscalls preadv2,pwritev2
2016-03-04 12:20:10 -05:00
Merge commit 'fixes.2015.02.23a' into core/rcu
2016-03-15 09:01:06 +01:00
configfs: switch ->default groups to a linked list
2016-03-06 16:11:24 +01:00
coresight: introducing a global trace ID function
2016-02-20 14:11:01 -08:00
coresight: etb10: implementing AUX API
2016-02-20 14:11:01 -08:00
rcu: Make CPU_DYING_IDLE an explicit call
2016-03-01 20:36:58 +01:00
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
2016-03-10 20:46:03 +01:00
cpu/hotplug: Make wait for dead cpu completion based
2016-03-01 20:36:58 +01:00
misc: at24: replace memory_accessor with nvmem_device_read
2016-03-01 16:55:48 -08:00
dax: move writeback calls into the filesystems
2016-02-27 10:28:52 -08:00
Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
2016-03-21 11:03:02 -07:00
dm snapshot: disallow the COW and origin devices from being identical
2016-03-10 17:12:09 -05:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2016-03-19 16:31:54 -07:00
virtio/vhost: new features, performance improvements, cleanups
2016-03-20 13:28:18 -07:00
Merge branch 'topic/pl330' into for-linus
2016-03-14 11:18:12 +05:30
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
net: ethtool: remove unused __ethtool_get_settings
2016-02-25 22:06:47 -05:00
staging/lustre: proper support of NFS anonymous dentries
2016-02-25 22:12:26 -08:00
f2fs: introduce f2fs_journal struct to wrap journal info
2016-02-22 21:39:53 -08:00
mm: fault-inject take over bootstrap kmem_cache check
2016-03-15 16:55:16 -07:00
fbdev: kill fb_rotate
2016-02-26 13:28:35 +02:00
objtool: Add STACK_FRAME_NON_STANDARD() macro
2016-02-29 08:35:10 +01:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
xfs: Changes for 4.6-rc1
2016-03-21 11:53:05 -07:00
Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
2016-03-21 11:03:02 -07:00
untangle fsnotify_d_instantiate() a bit
2016-03-14 00:17:28 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-03-19 18:52:29 -07:00
sched/debug: Fix preempt_disable_ip recording for preempt_disable()
2016-02-29 09:53:10 +01:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
Revert "gpio: remove broken irq_to_gpio() interface"
2016-02-20 12:53:31 +01:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
powerpc updates for 4.6
2016-03-19 15:38:41 -07:00
Drivers: hv: util: Pass the channel information during the init call
2016-03-01 16:57:20 -08:00
mac80211: limit the A-MSDU Tx based on peer's capabilities
2016-02-24 09:04:20 +01:00
bridge: allow zero ageing time
2016-03-11 14:58:58 -05:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
asm-generic: Consolidate mark_rodata_ro()
2016-02-22 08:51:37 +01:00
x86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected"
2016-03-09 01:23:35 +01:00
libnvdimm for 4.6
2016-03-16 17:45:56 -07:00
net: ipv6: Make address flushing on ifdown optional
2016-02-25 21:45:15 -05:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 12:48:48 -07:00
Staging driver patches for 4.6-rc1
2016-03-17 22:13:41 -07:00
iscsi_ibft: Add prefix-len attr and display netmask
2016-03-14 10:30:57 -04:00
jbd2: unify revoke and tag block checksum handling
2016-02-22 23:19:09 -05:00
kasan: add functions to clear stack poison
2016-03-09 15:43:42 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
KVM: Use simple waitqueue for vcpu->wq
2016-02-25 11:27:16 +01:00
leds: core: avoid error message when a USB LED device is unplugged
2016-03-14 09:22:20 +01:00
libata: Align ata_device's id on a cacheline
2016-02-25 16:37:06 -05:00
nfit: disable userspace initiated ars during scrub
2016-03-05 12:24:06 -08:00
Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block
2016-03-18 17:13:31 -07:00
list: kill list_force_poison()
2016-03-09 15:43:42 -08:00
include/linux/list_bl.h: use bool instead of int for boolean functions
2016-03-17 15:09:34 -07:00
livepatch/module: remove livepatch module notifier
2016-03-17 09:45:10 +01:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
mbcache: add reusable flag to cache entries
2016-02-22 22:44:04 -05:00
bus: mvebu-mbus: provide api for obtaining IO and DRAM window information
2016-03-14 12:19:46 -04:00
mm: workingset: make shadow node shrinker memcg aware
2016-03-17 15:09:34 -07:00
Char/Misc patches for 4.6-rc1
2016-03-17 13:47:50 -07:00
mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
2016-03-15 16:55:16 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -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
mm, debug: move bad flags printing to bad_page()
2016-03-15 16:55:16 -07:00
mm: scale kswapd watermarks in proportion to memory
2016-03-17 15:09:34 -07:00
namei: teach lookup_slow() to skip revalidate
2016-03-14 00:15:46 -04:00
libnvdimm: async notification support
2016-03-05 12:24:06 -08:00
net: Make sock_alloc exportable
2016-03-09 16:36:13 -05:00
Round two of 4.6 merge window patches
2016-03-22 15:48:44 -07:00
netfilter: don't call hooks unless needed
2016-03-02 20:05:26 +01:00
rcu: Make CPU_DYING_IDLE an explicit call
2016-03-01 20:36:58 +01:00
nvmem: Add backwards compatibility support for older EEPROM drivers.
2016-03-01 16:55:48 -08:00
DeviceTree updates for 4.6:
2016-03-19 15:15:07 -07:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
include/linux/page-flags.h: force inlining of selected page flag modifications
2016-03-17 15:09:34 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
mm, page_owner: dump page owner info from dump_page()
2016-03-15 16:55:16 -07:00
mm/page_ref: add tracepoint to track down page reference manipulation
2016-03-17 15:09:34 -07:00
mm: introduce page reference manipulation functions
2016-03-17 15:09:34 -07:00
PCI: Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h
2016-03-07 11:39:16 -06:00
powerpc updates for 4.6
2016-03-19 15:38:41 -07:00
PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
2016-03-15 08:52:28 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
phy: remove documentation of removed members of phy_device structure
2016-03-13 22:11:43 -04:00
phy: fixed: Fix removal of phys.
2016-03-14 15:43:11 -04:00
libnvdimm, pmem: clear poison on write
2016-03-09 15:15:32 -08:00
mm/page_poisoning.c: allow for zero poisoning
2016-03-15 16:55:16 -07:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
posix-cpu-timers: Migrate to use new tick dependency mask model
2016-03-02 16:44:27 +01:00
time: Remove duplicated code in ktime_get_raw_and_real()
2016-03-02 17:13:02 -08:00
pstore: Add support for 64 Bit address space
2016-03-10 09:43:36 -08:00
ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping
2016-03-03 14:23:43 -08:00
fix Christoph's email addresses
2016-03-17 15:09:34 -07:00
radix-tree,shmem: introduce radix_tree_iter_next()
2016-03-17 15:09:34 -07:00
drivers: char: random: add get_random_long()
2016-02-27 10:28:52 -08:00
rcu: Add list_next_or_null_rcu
2016-03-09 16:36:13 -05:00
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 13:50:29 -07:00
Merge remote-tracking branch 'regmap/topic/update-bits' into regmap-next
2016-03-05 21:30:41 +09:00
net: rfkill: add rfkill_find_type function
2016-02-24 09:12:45 +01:00
mm: make remove_migration_ptes() beyond mm/migration.c
2016-03-17 15:09:34 -07:00
Input: synaptics-rmi4 - add SPI transport driver
2016-03-10 16:04:24 -08:00
rtc: Add functions to set and read rtc offset
2016-03-14 17:08:15 +01:00
Merge branch 'akpm' (patches from Andrew)
2016-03-18 19:26:54 -07:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-03-08 12:34:12 -05:00
slub: convert SLAB_DEBUG_FREE to SLAB_CONSISTENCY_CHECKS
2016-03-15 16:55:16 -07:00
mm/slab: alternative implementation for DEBUG_SLAB_LEAK
2016-03-15 16:55:16 -07:00
mm/slub: support left redzone
2016-03-15 16:55:16 -07:00
kcm: Kernel Connection Multiplexor module
2016-03-09 16:36:14 -05:00
rcu: Document unique-name limitation for DEFINE_STATIC_SRCU()
2016-02-23 19:59:55 -08:00
stm class: Plug stm device's unlink callback
2016-02-20 14:09:14 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-03-08 12:34:12 -05:00
lib: move strtobool() to kstrtobool()
2016-03-17 15:09:34 -07:00
wait.[ch]: Introduce the simple waitqueue (swait) implementation
2016-02-25 11:27:16 +01:00
vfs: vfs: Define new syscalls preadv2,pwritev2
2016-03-04 12:20:10 -05:00
tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In
2016-03-14 14:55:26 -04:00
param: convert some "on"/"off" users to strtobool
2016-03-17 15:09:34 -07:00
time: Add history to cross timestamp interface supporting slower devices
2016-03-02 17:13:17 -08:00
time: Add history to cross timestamp interface supporting slower devices
2016-03-02 17:13:17 -08:00
tracepoints: move trace_print_flags definitions to tracepoint-defs.h
2016-03-15 16:55:16 -07:00
tracepoints: move trace_print_flags definitions to tracepoint-defs.h
2016-03-15 16:55:16 -07:00
tracing: Fix check for cpu online when event is disabled
2016-03-09 11:58:41 -05:00
vfio: Add capability chain helpers
2016-02-22 16:10:08 -07:00
virtio: Add improved queue allocation API
2016-03-02 17:01:57 +02:00
virtio: Add improved queue allocation API
2016-03-02 17:01:57 +02:00
thp, vmstats: count deferred split events
2016-03-17 15:09:34 -07:00
sched/wait: Fix wait_event_freezable() documentation
2016-02-24 09:09:45 +01:00
watchdog: Add support for minimum time between heartbeats
2016-03-16 21:11:19 +01:00
writeback: flush inode cgroup wb switches instead of pinning super_block
2016-03-03 14:42:50 -07:00
