android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89982f7cce
android_kernel_asus_sm8350/net/smc
History
Jason Gunthorpe 89982f7cce Linux 4.18 
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAltwm2geHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGITkH/iSzkVhT2OxHoir0
 mLVzTi7/Z17L0e/ELl7TvAC0iLFlWZKdlGR0g3b4/QpXLPmNK4HxiDRTQuWn8ke0
 qDZyDq89HqLt+mpeFZ43PCd9oqV8CH2xxK3iCWReqv6bNnowGnRpSStlks4rDqWn
 zURC/5sUh7TzEG4s997RrrpnyPeQWUlf/Mhtzg2/WvK2btoLWgu5qzjX1uFh3s7u
 vaF2NXVJ3X03gPktyxZzwtO1SwLFS1jhwUXWBZ5AnoJ99ywkghQnkqS/2YpekNTm
 wFk80/78sU+d91aAqO8kkhHj8VRrd+9SGnZ4mB2aZHwjZjGcics4RRtxukSfOQ+6
 L47IdXo=
 =sJkt
 -----END PGP SIGNATURE-----

Merge tag 'v4.18' into rdma.git for-next

Resolve merge conflicts from the -rc cycle against the rdma.git tree:

Conflicts:
 drivers/infiniband/core/uverbs_cmd.c
  - New ifs added to ib_uverbs_ex_create_flow in -rc and for-next
  - Merge removal of file->ucontext in for-next with new code in -rc
 drivers/infiniband/core/uverbs_main.c
  - for-next removed code from ib_uverbs_write() that was modified
    in for-rc

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2018-08-16 13:12:00 -06:00
..
af_smc.c net/smc: move sock lock in smc_ioctl() 2018-08-08 19:14:22 -07:00
Kconfig net/smc: remove Kconfig warning 2017-07-29 11:22:58 -07:00
Makefile smc: netlink interface for SMC sockets 2017-01-09 16:07:41 -05:00
smc_cdc.c net/smc: no cursor update send in state SMC_INIT 2018-08-04 13:09:33 -07:00
smc_cdc.h net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_clc.c net/smc: reset recv timeout after clc handshake 2018-07-18 10:58:27 -07:00
smc_clc.h net/smc: rename connection index to RMBE index 2018-05-18 13:15:01 -04:00
smc_close.c net/smc: reduce sock_put() for fallback sockets 2018-07-07 20:25:13 +09:00
smc_close.h net/smc: replace sock_put worker by socket refcounting 2018-01-26 10:41:56 -05:00
smc_core.c net/smc: Replace ib_query_gid with rdma_get_gid_attr 2018-06-18 11:09:05 -06:00
smc_core.h net/smc: move smc_core specific code from smc.h to smc_core 2018-05-18 13:15:01 -04:00
smc_diag.c net/smc: add common buffer size in send and receive buffer descriptors 2018-05-18 13:15:01 -04:00
smc_ib.c net/smc: Replace ib_query_gid with rdma_get_gid_attr 2018-06-18 11:09:05 -06:00
smc_ib.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
smc_llc.c net/smc: drop messages when link state is inactive 2018-05-16 11:49:20 -04:00
smc_llc.h net/smc: use a workqueue to defer llc send 2018-05-16 11:49:19 -04:00
smc_pnet.c net/smc: check for missing nlattrs in SMC_PNETID messages 2018-05-14 16:40:45 -04:00
smc_pnet.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
smc_rx.c net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_rx.h smc: add support for splice() 2018-05-04 11:45:06 -04:00
smc_tx.c Linux 4.18 2018-08-16 13:12:00 -06:00
smc_tx.h net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_wr.c net/smc: Simplify ib_post_(send|recv|srq_recv)() calls 2018-07-24 16:06:37 -06:00
smc_wr.h net/smc: Simplify ib_post_(send|recv|srq_recv)() calls 2018-07-24 16:06:37 -06:00
smc.h net/smc: rebuild nonblocking connect 2018-06-28 22:03:55 +09:00