Linus Torvalds
4533f6e27a
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client ...
Pull Ceph changes from Sage Weil:
"On the RBD side, there is a conversion to blk-mq from Christoph,
several long-standing bug fixes from Ilya, and some cleanup from
Rickard Strandqvist.
On the CephFS side there is a long list of fixes from Zheng, including
improved session handling, a few IO path fixes, some dcache management
correctness fixes, and several blocking while !TASK_RUNNING fixes.
The core code gets a few cleanups and Chaitanya has added support for
TCP_NODELAY (which has been used on the server side for ages but we
somehow missed on the kernel client).
There is also an update to MAINTAINERS to fix up some email addresses
and reflect that Ilya and Zheng are doing most of the maintenance for
RBD and CephFS these days. Do not be surprised to see a pull request
come from one of them in the future if I am unavailable for some
reason"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits)
MAINTAINERS: update Ceph and RBD maintainers
libceph: kfree() in put_osd() shouldn't depend on authorizer
libceph: fix double __remove_osd() problem
rbd: convert to blk-mq
ceph: return error for traceless reply race
ceph: fix dentry leaks
ceph: re-send requests when MDS enters reconnecting stage
ceph: show nocephx_require_signatures and notcp_nodelay options
libceph: tcp_nodelay support
rbd: do not treat standalone as flatten
ceph: fix atomic_open snapdir
ceph: properly mark empty directory as complete
client: include kernel version in client metadata
ceph: provide seperate {inode,file}_operations for snapdir
ceph: fix request time stamp encoding
ceph: fix reading inline data when i_size > PAGE_SIZE
ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_close_sessions)
ceph: avoid block operation when !TASK_RUNNING (ceph_get_caps)
ceph: avoid block operation when !TASK_RUNNING (ceph_mdsc_sync)
rbd: fix error paths in rbd_dev_refresh()
...
2015-02-19 14:14:42 -08:00
libceph: tcp_nodelay support
2015-02-19 13:31:40 +03:00
fsl /bestcomm
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-16 15:20:40 -08:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
MMC core:
2015-02-11 10:56:48 -08:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
SCSI misc on 20150209
2015-02-11 10:28:45 -08:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
rtc: add driver for DS1685 family of real time clocks
2015-02-16 17:56:05 -08:00
soc /ti
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:27:47 -08:00
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
watchdog: bcm47xx_wdt.c: add restart handler support
2015-02-17 21:33:27 +01:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
block: remove unused function blk_bio_map_sg
2015-02-11 11:24:14 -07:00
mm/compaction: add tracepoint to observe behaviour of compaction defer
2015-02-11 17:06:04 -08:00
compiler: introduce __alias(symbol) shortcut
2015-02-13 21:21:40 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
Tighten rules for ACCESS_ONCE
2015-02-14 10:54:28 -08:00
PM / sleep: Make it possible to quiesce timers during suspend-to-idle
2015-02-15 19:40:09 +01:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
debugfs: Provide a file creation function that also takes an initial size
2015-02-17 12:21:51 -05:00
arm64 updates for 3.20:
2015-02-11 18:03:54 -08:00
f2fs: introduce macros to convert bytes and blocks in f2fs
2015-02-11 17:04:48 -08:00
File locking related fixes for v3.20 (pile #2 )
2015-02-18 10:21:47 -08:00
fsnotify: fix handling of renames in audit
2015-02-10 14:30:28 -08:00
The updates included in this pull request for ftrace are:
2015-02-12 08:37:41 -08:00
mm/mempolicy.c: merge alloc_hugepage_vma to alloc_pages_vma
2015-02-11 17:06:04 -08:00
mm: numa: do not trap faults on the huge zero page
2015-02-12 18:54:08 -08:00
mm/hugetlb: take page table lock in follow_huge_pmd()
2015-02-11 17:06:01 -08:00
kasan: enable stack instrumentation
2015-02-13 21:21:41 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kernel.h: remove ancient __FUNCTION__ hack
2015-02-12 18:54:13 -08:00
kernfs: remove KERNFS_STATIC_NAME
2015-02-13 21:21:36 -08:00
kexec: add IND_FLAGS macro
2015-02-17 14:34:51 -08:00
Fairly small update, but there are some interesting new features.
2015-02-13 09:55:09 -08:00
lguest: remove NOTIFY call and eventfd facility.
2015-02-11 16:47:46 +10:30
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
memcg: reparent list_lrus and free kmemcg_id on css offline
2015-02-12 18:54:10 -08:00
list_lru: introduce per-memcg lists
2015-02-12 18:54:09 -08:00
mm: numa: do not dereference pmd outside of the lock during NUMA hinting fault
2015-02-12 18:54:08 -08:00
mm: allow page fault handlers to perform the COW
2015-02-16 17:56:03 -08:00
mm: account pmd page tables to the process
2015-02-11 17:06:04 -08:00
mm: microoptimize zonelist operations
2015-02-11 17:06:02 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-17 17:41:19 -08:00
module: fix types of device tables aliases
2015-02-13 21:21:42 -08:00
mutex: remove unused field "name" in debug mode
2015-02-14 11:32:59 -08:00
net: Infrastructure for CHECKSUM_PARTIAL with remote checsum offload
2015-02-11 15:12:12 -08:00
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
oom, PM: make OOM detection in the freezer path raceless
2015-02-11 17:06:03 -08:00
mm: page_counter: pull "-1" handling out of page_counter_memparse()
2015-02-11 17:06:02 -08:00
mm/page_owner.c: remove unnecessary stack_trace field
2015-02-11 17:06:07 -08:00
ACPI and power management updates for v3.20-rc1
2015-02-10 15:09:41 -08:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-16 14:58:12 -08:00
hexdump: make it return number of bytes placed in buffer
2015-02-12 18:54:15 -08:00
lib/rbtree.c: fix typo in comment
2015-02-17 14:34:52 -08:00
vfs: remove get_xip_mem
2015-02-16 17:56:03 -08:00
kasan: add kernel address sanitizer infrastructure
2015-02-13 21:21:40 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
vmscan: per memory cgroup slab shrinkers
2015-02-12 18:54:09 -08:00
net: Infrastructure for CHECKSUM_PARTIAL with remote checsum offload
2015-02-11 15:12:12 -08:00
mm: slub: add kernel address sanitizer support for slub allocator
2015-02-13 21:21:41 -08:00
slab: embed memcg_cache_params to kmem_cache
2015-02-12 18:54:09 -08:00
mm: slub: share object_err function
2015-02-13 21:21:41 -08:00
mm/util: add kstrdup_const
2015-02-13 21:21:35 -08:00
libstring_helpers.c:string_get_size(): return void
2015-02-12 18:54:13 -08:00
PM / sleep: Re-implement suspend-to-idle handling
2015-02-13 23:49:36 +01:00
swap: remove unused mem_cgroup_uncharge_swapcache declaration
2015-02-11 17:06:00 -08:00
mm: remove remaining references to NUMA hinting bits and helpers
2015-02-12 18:54:08 -08:00
PM / sleep: Make it possible to quiesce timers during suspend-to-idle
2015-02-15 19:40:09 +01:00
linux/types.h: Always use unsigned long for pgoff_t
2015-02-12 18:54:13 -08:00
Merge branch 'iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:48:33 -08:00
mm: vmalloc: pass additional vm_flags to __vmalloc_node_range()
2015-02-13 21:21:42 -08:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
