David S. Miller 1806c13dc2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... xdp_umem.c had overlapping changes between the 64-bit math fix for the calculation of npgs and the removal of the zerocopy memory type which got rid of the chunk_size_nohdr member. The mlx5 Kconfig conflict is a case where we just take the net-next copy of the Kconfig entry dependency as it takes on the ESWITCH dependency by one level of indirection which is what the 'net' conflicting change is trying to ensure. Signed-off-by: David S. Miller <davem@davemloft.net>		2020-05-31 17:48:46 -07:00
..
crush	crush: fix using plain integer as NULL warning	2018-08-13 17:55:44 +02:00
armor.c
auth_none.c	ceph: fix whitespace	2018-08-02 21:33:21 +02:00
auth_none.h	ceph: fix whitespace	2018-08-02 21:33:21 +02:00
auth_x_protocol.h	libceph: add authorizer challenge	2018-08-02 21:33:24 +02:00
auth_x.c	libceph: weaken sizeof check in ceph_x_verify_authorizer_reply()	2018-08-02 21:33:26 +02:00
auth_x.h	ceph: fix whitespace	2018-08-02 21:33:21 +02:00
auth.c	libceph: add authorizer challenge	2018-08-02 21:33:24 +02:00
buffer.c
ceph_common.c	fs_parse: fold fs_parameter_desc/fs_parameter_spec	2020-02-07 14:48:37 -05:00
ceph_hash.c
ceph_strings.c
cls_lock_client.c	rbd: support for object-map and fast-diff	2019-07-08 14:01:45 +02:00
crypto.c	libceph: don't call crypto_free_sync_skcipher() on a NULL tfm	2019-08-28 12:33:46 +02:00
crypto.h	libceph: Remove VLA usage of skcipher	2018-09-28 12:46:07 +08:00
debugfs.c	libceph: drop CEPH_DEFINE_SHOW_FUNC	2020-03-30 12:42:40 +02:00
decode.c	libceph: use TYPE_LEGACY for entity addrs instead of TYPE_NONE	2019-07-08 14:01:43 +02:00
Kconfig	docs: networking: convert dns_resolver.txt to ReST	2020-04-28 14:39:46 -07:00
Makefile	ceph: move net/ceph/ceph_fs.c to fs/ceph/util.c	2020-01-27 16:53:40 +01:00
messenger.c	tcp: add tcp_sock_set_nodelay	2020-05-28 11:11:45 -07:00
mon_client.c	libceph: simplify ceph_monc_handle_map()	2020-03-30 12:42:41 +02:00
msgpool.c	libceph: preallocate message data items	2018-10-22 10:28:22 +02:00
osd_client.c	libceph: ignore pool overlay and cache logic on redirects	2020-05-27 12:43:35 +02:00
osdmap.c	ceph: check POOL_FLAG_FULL/NEARFULL in addition to OSDMAP_FULL/NEARFULL	2020-03-23 13:07:08 +01:00
pagelist.c	libceph: introduce ceph_pagelist_alloc()	2018-10-22 10:28:21 +02:00
pagevec.c	libceph: remove ceph_get_direct_page_vector()	2019-07-08 14:01:40 +02:00
snapshot.c	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 268	2019-06-05 17:30:29 +02:00
string_table.c
striper.c	rbd: support for object-map and fast-diff	2019-07-08 14:01:45 +02:00