Linus Torvalds
d891ea23d5
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
...
Pull ceph updates from Sage Weil:
"This is a big batch. From Ilya we have:
- rbd support for more than ~250 mapped devices (now uses same scheme
that SCSI does for device major/minor numbering)
- crush updates for new mapping behaviors (will be needed for coming
erasure coding support, among other things)
- preliminary support for tiered storage pools
There is also a big series fixing a pile cephfs bugs with clustered
MDSs from Yan Zheng, ACL support for cephfs from Guangliang Zhao, ceph
fscache improvements from Li Wang, improved behavior when we get
ENOSPC from Josh Durgin, some readv/writev improvements from
Majianpeng, and the usual mix of small cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (76 commits)
ceph: cast PAGE_SIZE to size_t in ceph_sync_write()
ceph: fix dout() compile warnings in ceph_filemap_fault()
libceph: support CEPH_FEATURE_OSD_CACHEPOOL feature
libceph: follow redirect replies from osds
libceph: rename ceph_osd_request::r_{oloc,oid} to r_base_{oloc,oid}
libceph: follow {read,write}_tier fields on osd request submission
libceph: add ceph_pg_pool_by_id()
libceph: CEPH_OSD_FLAG_* enum update
libceph: replace ceph_calc_ceph_pg() with ceph_oloc_oid_to_pg()
libceph: introduce and start using oid abstraction
libceph: rename MAX_OBJ_NAME_SIZE to CEPH_MAX_OID_NAME_LEN
libceph: move ceph_file_layout helpers to ceph_fs.h
libceph: start using oloc abstraction
libceph: dout() is missing a newline
libceph: add ceph_kv{malloc,free}() and switch to them
libceph: support CEPH_FEATURE_EXPORT_PEER
ceph: add imported caps when handling cap export message
ceph: add open export target session helper
ceph: remove exported caps when handling cap import message
ceph: handle session flush message
...
2014-01-28 11:02:23 -08:00
..
9p
net/9p: remove virtio default hack and set appropriate bits instead
2013-11-23 16:13:36 -06:00
802
neigh: use NEIGH_VAR_INIT in ndo_neigh_setup functions.
2014-01-16 11:31:58 -08:00
8021q
8021q: Use ether_addr_copy
2014-01-21 18:13:04 -08:00
appletalk
net: Fix some fallout from the etner_addr_copy() changes.
2014-01-21 18:57:26 -08:00
atm
net: Fix some fallout from the etner_addr_copy() changes.
2014-01-21 18:57:26 -08:00
ax25
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
batman-adv
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2014-01-18 00:55:41 -08:00
bluetooth
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
bridge
bridge: Remove unnecessary vlan_put_tag in br_handle_vlan
2014-01-22 21:29:27 -08:00
caif
net: Missing change from the ether_addr_copy() fixups.
2014-01-21 22:54:01 -08:00
can
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
ceph
libceph: follow redirect replies from osds
2014-01-27 23:57:53 +02:00
core
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
dcb
dcb: use __dev_get_by_name instead of dev_get_by_name to find interface
2014-01-14 18:50:46 -08:00
dccp
ipv4: introduce hardened ip_no_pmtu_disc mode
2014-01-13 11:22:55 -08:00
decnet
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
dns_resolver
net/*: Fix FSF address in file headers
2013-12-06 12:37:57 -05:00
dsa
dsa: Use ether_addr_copy
2014-01-21 18:13:05 -08:00
ethernet
net: eth_type_trans() should use skb_header_pointer()
2014-01-16 15:30:31 -08:00
hsr
net/hsr: using kfree_rcu() to simplify the code
2013-12-17 16:32:30 -05:00
ieee802154
6lowpan: add a license to 6lowpan_iphc module
2014-01-22 21:57:17 -08:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
ipv6
ipv6: reallocate addrconf router for ipv6 address when lo device up
2014-01-24 15:59:38 -08:00
ipx
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
irda
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
iucv
net: rework recvmsg handler msg_name and msg_namelen logic
2013-11-20 21:52:30 -05:00
key
xfrm: export verify_userspi_info for pkfey and netlink interface
2013-12-16 12:54:02 +01:00
l2tp
ipv6: protect protocols not handling ipv4 from v4 connection/bind attempts
2014-01-21 16:59:19 -08:00
lapb
net/lapb: re-send packets on timeout
2013-09-23 16:52:45 -04:00
llc
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
mac80211
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-17 14:43:17 -05:00
mac802154
mac802154: fix following checkpath.pl warning Prefer pr_warn(... to pr_warning(...
2013-12-22 18:53:08 -05:00
mpls
ipip: add GSO/TSO support
2013-10-19 19:36:19 -04:00
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
netlabel
netlabel: Fix FSF address in file headers
2013-12-06 12:37:56 -05:00
netlink
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
netrom
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
nfc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
openvswitch
net: replace macros net_random and net_srandom with direct calls to prandom
2014-01-14 15:15:25 -08:00
packet
af_packet: Add Queue mapping mode to af_packet fanout operation
2014-01-22 17:35:50 -08:00
phonet
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
rds
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
rfkill
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
rose
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
rxrpc
rxrpc: out of bound read in debug code
2014-01-21 17:02:52 -08:00
sched
sch_htb: let skb->priority refer to non-leaf class
2014-01-22 17:39:48 -08:00
sctp
sctp: remove macros sctp_bh_[un]lock_sock
2014-01-21 18:41:36 -08:00
sunrpc
NFS client updates for Linux 3.14
2014-01-28 08:46:44 -08:00
tipc
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
unix
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
vmw_vsock
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
wimax
wimax: remove dead code
2013-11-21 13:09:42 -05:00
wireless
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2014-01-17 14:43:17 -05:00
x25
net: add build-time checks for msg->msg_name size
2014-01-18 23:04:16 -08:00
xfrm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
compat.c
net: clamp ->msg_namelen instead of returning an error
2013-11-29 16:12:52 -05:00
Kconfig
net: netprio: rename config to be more consistent with cgroup configs
2014-01-03 23:41:42 +01:00
Makefile
net: move 6lowpan compression code to separate module
2014-01-15 15:36:38 -08:00
nonet.c
socket.c
net: handle error more gracefully in socketpair()
2013-12-10 22:24:13 -05:00
sysctl_net.c
net: Update the sysctl permissions handler to test effective uid/gid
2013-10-07 15:57:56 -04:00