Linus Torvalds
3341713c67
Updates #2 for 4.12 kernel merge window ...
- mlx5/IPoIB fixup patch
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJZC7idAAoJELgmozMOVy/d8bEP/31hq3Vr1unNJYjU8yEaWI0l
D/k3ZSJcnLaeoUE5Ts69pYVkncAM/g55bmS80bKyNONRJp0BMU0MxmmzQC/iMqMM
LAvDf3Qyv8rTrEgjjmjWVQrP/v7K0+teD6YMmTkfB8fWqhi/vR+84Sv3c50GUXpL
OZMrn6p/IXptWa24kvi5/mKNSmeOBQkp/1lRxyi6bhAcFhjwQZoO4tDkOL6Aj1oA
FFeUcBDwMsOjbqhH59sM9ryOnGXPEwJUnLOPfq36pIrFzyUtbbcmFfMmefjJWMLK
XW4VBXywYLzkCvr2tGeXMukJzroUPQhD6G/4uwnFlwad0tovlBCwPmOmXHbnhRbh
JmriZaQEGj43o3yH/HHSeRvbwJ7e71xbH0tW21K9cB/CuYTixwlvYAMd218qXQ+k
Q6qBRueWlgsaDatlkuRV0ezrILvGQhn6QgEbCUIluDjKp/d6aRtI4IM60Y5G02U/
WLvnMQJ/MaGQXPVR1gWqWpy1ojvj/mAeTQf6aKw1Icjd3oSPgAI06B/uThXoWxh/
FyvDl/+HNW2StxPudQPKWkMjamaD/cToSa4HjLjdPER9HiCHmUru6nRZOufhwtwh
q2NEPx5kraRQNEMqjpopzNIWPpGBNBm+htkqXmTRpDdfvKgQ29vL49GCcV1VHtj9
TpYkqu/6ZVPItAAfyklh
=Ihe9
-----END PGP SIGNATURE-----
mergetag object 67cf3623e0#3 for 4.12 kernel merge window
- The hfi1 15 patch set that landed late
- IPoIB get_link_ksettings which landed late because I asked for a
respin
- One late rxe change
- One -rc worthy fix that's in early
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJZC7q5AAoJELgmozMOVy/dungQAKpWG7sq+23PhsXDTOGtKSRg
6jrgt5lG+V4twAJogXazxYsanPLQOE6ItKUFaBqEh2fULGyzXyPv1PsLNAVi4MYR
6vbsMh2qCW8+dy+uEBveirQzdwdJr8U7g1mvJYPDr1Rmaw852Sq+PbId3nEy/cFK
boMn/zhSSJuF8VsTfFCHx1gVdRN7n7gclqBP7Phq4bzdZ8E0u5GIPjmPDePUTpwH
r3yFSC3VV5JGGgOSUc66oPPoIgraAG9EQezn01Llk5n+HPJ3eM91spV1Y9tZ7EgA
toNW+bxEmanFYtuR+qzd0ctozUt2Ke6AUdTgcZcSCFkIan2ZOssJ0y2UN3CsNxlQ
rYcOBe5KBNcFVb5E3NoeG+iHo9jT86fBqzYheHKmQJy38xalAlOoX6mLOvn4pPzo
DFYDd6PpEU9SQSmhpPj1UbhvCOzecBaV3cRF/TihnqlOrRiKtd/YCccqT5GguPCB
RVW6h1qQ94rmr/k6gobT7lNDWn2bZAgUupUD19Nw+7YwauxjGhSFsXW357NVcs4B
3a/uLNVvnoyIjm62Sm8YFz9Bz3pRutfP9b6pSJ5V4P7dBgXYFZU35buViwcAj5fL
DNGx4a8Poi3VQR8lQjpK6MRCWAibUY27zW1nbWQrQ9TdcHhK4sJC9Mqe41W4FXpU
qQLkYBChz+mkCzE44bN/
=H9f5
-----END PGP SIGNATURE-----
Merge tags 'for-linus' and 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull more rdma updates from Doug Ledford:
"As mentioned in my first pull request, this is the subsequent pull
requests I had. This is all I have, and in fact this cleans out the
RDMA subsystem's entire patchworks queue of kernel changes that are
ready to go (well, it did for the weekend anyway, a few new patches
are in, but they'll be coming during the -rc cycle).
The first tag contains a single patch that would have conflicted if
taken from my tree or DaveM's tree as it needed our trees merged to
come cleanly.
The second tag contains the patch series from Intel plus three other
stragllers that came in late last week. I took them because it allowed
me to legitimately claim that the RDMA patchworks queue was, for a
short time, 100% cleared of all waiting kernel patches, woohoo! :-).
I have it under my for-next tag, so it did get 0day and linux- next
over the end of last week, and linux-next did show one minor conflict.
Summary:
'for-linus' tag:
- mlx5/IPoIB fixup patch
'for-next' tag:
- the hfi1 15 patch set that landed late
- IPoIB get_link_ksettings which landed late because I asked for a
respin
- one late rxe change
- one -rc worthy fix that's in early"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
IB/mlx5: Enable IPoIB acceleration
* tag 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
rxe: expose num_possible_cpus() cnum_comp_vectors
IB/rxe: Update caller's CRC for RXE_MEM_TYPE_DMA memory type
IB/hfi1: Clean up on context initialization failure
IB/hfi1: Fix an assign/ordering issue with shared context IDs
IB/hfi1: Clean up context initialization
IB/hfi1: Correctly clear the pkey
IB/hfi1: Search shared contexts on the opened device, not all devices
IB/hfi1: Remove atomic operations for SDMA_REQ_HAVE_AHG bit
IB/hfi1: Use filedata rather than filepointer
IB/hfi1: Name function prototype parameters
IB/hfi1: Fix a subcontext memory leak
IB/hfi1: Return an error on memory allocation failure
IB/hfi1: Adjust default eager_buffer_size to 8MB
IB/hfi1: Get rid of divide when setting the tx request header
IB/hfi1: Fix yield logic in send engine
IB/hfi1, IB/rdmavt: Move r_adefered to r_lock cache line
IB/hfi1: Fix checks for Offline transient state
IB/ipoib: add get_link_ksettings in ethtool
2017-05-08 20:07:29 -07:00
scripts/spelling.txt: add regsiter -> register spelling mistake
2017-05-08 17:15:13 -07:00
firmware /meson
This is the bulk of GPIO changes for the v4.12 kernel cycle:
2017-05-04 12:05:32 -07:00
Merge branch 'for-4.12/asus' into for-linus
2017-05-02 11:02:41 +02:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-01 16:15:18 -07:00
pci-v4.12-changes
2017-05-08 19:03:25 -07:00
treewide: spelling: correct diffrent[iate] and banlance typos
2017-05-08 17:15:13 -07:00
Updates #2 for 4.12 kernel merge window
2017-05-08 20:07:29 -07:00
This is the bulk of pin control changes for the v4.12 cycle:
2017-05-02 17:59:33 -07:00
platform-drivers-x86 for v4.12-1
2017-05-04 11:56:59 -07:00
qed*: Fix possible overflow for status block id field.
2017-05-04 12:31:02 -04:00
Merge remote-tracking branches 'regulator/topic/notifier', 'regulator/topic/pfuze100', 'regulator/topic/settle', 'regulator/topic/tps65132' and 'regulator/topic/twl6030' into regulator-next
2017-04-30 22:17:36 +09:00
mm: introduce memalloc_noreclaim_{save,restore}
2017-05-08 17:15:15 -07:00
USB patches for 4.12-rc1
2017-05-04 18:03:51 -07:00
USB patches for 4.12-rc1
2017-05-04 18:03:51 -07:00
This is the bulk of GPIO changes for the v4.12 kernel cycle:
2017-05-04 12:05:32 -07:00
libata: remove SCT WRITE SAME support
2017-04-28 18:09:59 -04:00
audit: Use timespec64 to represent audit timestamps
2017-05-02 10:16:05 -04:00
Merge branch 'md-next' into md-linus
2017-05-01 14:09:21 -07:00
blk-mq-debugfs: allow schedulers to register debugfs attributes
2017-05-04 08:24:40 -06:00
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2017-05-06 11:25:08 -07:00
Merge branch 'for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2017-05-01 13:52:24 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-01 16:15:18 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2017-05-03 08:50:52 -07:00
cpumask: make "nr_cpumask_bits" unsigned
2017-05-08 17:15:11 -07:00
ia64: reuse append_elf_note() and final_note() functions
2017-05-08 17:15:11 -07:00
libnvdimm for 4.12
2017-05-05 18:49:20 -07:00
blk-mq-debugfs: allow schedulers to register debugfs attributes
2017-05-04 08:24:40 -06:00
ia64: reuse append_elf_note() and final_note() functions
2017-05-08 17:15:11 -07:00
f2fs: introduce CP_TRIMMED_FLAG to avoid unneeded discard
2017-05-03 10:04:56 -07:00
include/linux/filter.h: use set_memory.h header
2017-05-08 17:15:14 -07:00
fs: semove set but not checked AOP_FLAG_UNINTERRUPTIBLE flag
2017-05-08 17:15:14 -07:00
fscrypt: remove fscrypt_symlink_data_len()
2017-04-30 01:26:34 -04:00
fscrypt: introduce helper function for filename matching
2017-05-04 11:44:37 -04:00
fscrypt: correct collision claim for digested names
2017-05-04 11:44:41 -04:00
scripts/spelling.txt: add regsiter -> register spelling mistake
2017-05-08 17:15:13 -07:00
mm: fix spelling error
2017-05-03 15:52:10 -07:00
Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112', 'for-4.12/hid-core-null-state-handling', 'for-4.12/hiddev', 'for-4.12/i2c-hid', 'for-4.12/innomedia', 'for-4.12/logitech-hidpp-battery-power-supply', 'for-4.12/multitouch', 'for-4.12/nti', 'for-4.12/upstream' and 'for-4.12/wacom' into for-linus
2017-05-02 11:01:10 +02:00
char/misc patches for 4.12-rc1
2017-05-04 19:15:35 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2017-05-03 12:38:20 -07:00
mac80211: Add support for BSS max idle period element
2017-04-28 12:28:45 +02:00
bridge: add per-port broadcast flood flag
2017-04-27 16:34:29 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2017-05-03 08:50:52 -07:00
sysv,ipc: cacheline align kern_ipc_perm
2017-05-08 17:15:12 -07:00
jbd2: mark the transaction context with the scope GFP_NOFS context
2017-05-03 15:52:09 -07:00
jiffies.h: declare jiffies and jiffies_64 with ____cacheline_aligned_in_smp
2017-05-08 17:15:10 -07:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2017-05-02 15:53:46 -07:00
crash: move crashkernel parsing and vmcore related code under CONFIG_CRASH_CORE
2017-05-08 17:15:11 -07:00
powerpc updates for 4.12 part 1.
2017-05-05 11:36:44 -07:00
kref: remove WARN_ON for NULL release functions
2017-05-08 17:15:14 -07:00
mm: make rmap_walk() return void
2017-05-03 15:52:10 -07:00
Merge branch 'akpm' (patches from Andrew)
2017-05-08 18:17:56 -07:00
libnvdimm: convert NDD_ flags to use bitops, introduce NDD_LOCKED
2017-05-04 14:01:24 -07:00
mm: memcontrol: use node page state naming scheme for memcg
2017-05-03 15:52:11 -07:00
include/linux/migrate.h: add arg names to prototype
2017-05-03 15:52:10 -07:00
treewide: use kv[mz]alloc* rather than opencoded variants
2017-05-08 17:15:13 -07:00
mm, compaction: change migrate_async_suitable() to suitable_migration_source()
2017-05-08 17:15:10 -07:00
Modules updates for v4.12
2017-05-03 19:12:27 -07:00
xdp: propagate extended ack to XDP setup
2017-05-01 10:35:47 -04:00
xdp: use common helper for netlink extended ack reporting
2017-05-03 09:51:24 -04:00
powerpc updates for 4.12 part 1.
2017-05-05 11:36:44 -07:00
of: fix sparse warnings in fdt, irq, reserved mem, and resolver code
2017-05-04 14:01:13 -05:00
mm, page_alloc: count movable pages when stealing from pageblock
2017-05-08 17:15:10 -07:00
pci-v4.12-changes
2017-05-08 19:03:25 -07:00
PCI: Add device IDs for DRA74x and DRA72x
2017-04-28 10:23:19 -05:00
crash: move crashkernel parsing and vmcore related code under CONFIG_CRASH_CORE
2017-05-08 17:15:11 -07:00
pidns: expose task pid_ns_for_children to userspace
2017-05-08 17:15:12 -07:00
rhashtable: compact struct rhashtable_params
2017-05-01 16:22:40 -04:00
ring-buffer: Return reader page back into existing ring buffer
2017-05-01 10:26:40 -04:00
mm: remove SWAP_[SUCCESS|AGAIN|FAIL]
2017-05-03 15:52:10 -07:00
mm: remove rodata_test_data export, add pr_fmt
2017-05-03 15:52:09 -07:00
Staging/IIO patches for 4.12-rc1
2017-05-05 18:16:23 -07:00
sysv,ipc: cacheline align kern_ipc_perm
2017-05-08 17:15:12 -07:00
TTY/Serial patches for 4.12-rc1
2017-05-08 18:49:23 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2017-05-02 16:40:27 -07:00
libnvdimm for 4.12
2017-05-05 18:49:20 -07:00
mm, swap: remove unused function prototype
2017-05-03 15:52:11 -07:00
A couple hardened usercopy changes:
2017-05-02 10:45:15 -07:00
time: delete CURRENT_TIME_SEC and CURRENT_TIME
2017-05-08 17:15:15 -07:00
include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec
2017-05-08 17:15:14 -07:00
mm: move MADV_FREE pages into LRU_INACTIVE_FILE list
2017-05-03 15:52:08 -07:00
mm, vmalloc: properly track vmalloc users
2017-05-08 17:15:12 -07:00
