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
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-02-19 11:28:36 -08:00
ARM: 8256/1: driver coamba: add device binding path 'driver_override'
2015-02-10 10:23:15 +00:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
driver core patches for 3.20-rc1
2015-02-15 11:11:47 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2015-02-19 14:14:42 -08:00
TTY/Serial driver patches for 3.20-rc1
2015-02-15 11:37:02 -08:00
ARM: SoC platform changes
2015-02-17 09:27:54 -08:00
OK, this has the big virtio 1.0 implementation, as specified by OASIS.
2015-02-18 09:24:01 -08:00
ARM: SoC driver updates
2015-02-17 09:38:59 -08:00
ARM: SoC platform changes
2015-02-17 09:27:54 -08:00
Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'
2015-02-13 21:39:06 +01:00
Suspend-to-idle timer quiescing support for v3.20-rc1
2015-02-17 14:17:51 -08:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'
2015-02-13 21:39:06 +01:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
* A fix to sb_edac for proper detection on SNB machines
2015-02-19 11:18:14 -08:00
x86_64: kasan: add interceptors for memset/memmove/memcpy functions
2015-02-13 21:21:41 -08:00
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-02-12 08:51:56 -08:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-02-16 15:48:00 -08:00
Merge branches 'for-3.19/upstream-fixes', 'for-3.20/apple', 'for-3.20/betop', 'for-3.20/lenovo', 'for-3.20/logitech', 'for-3.20/rmi', 'for-3.20/upstream' and 'for-3.20/wacom' into for-linus
2015-02-09 11:17:45 +01:00
Char / Misc patches for 3.20-rc1
2015-02-15 10:48:44 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
intel_idle: Add ->enter_freeze callbacks
2015-02-15 19:40:09 +01:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:18:19 -08:00
input: use %*pb[l] to print bitmaps including cpumasks and nodemasks
2015-02-13 21:21:38 -08:00
IOMMU Updates for Linux v3.20
2015-02-12 09:16:56 -08:00
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
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
OK, this has the big virtio 1.0 implementation, as specified by OASIS.
2015-02-18 09:24:01 -08:00
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
2015-02-11 12:56:40 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
mm: gup: use get_user_pages_unlocked
2015-02-11 17:06:05 -08:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
Char / Misc patches for 3.20-rc1
2015-02-15 10:48:44 -08:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
PCI updates for v3.20:
2015-02-18 09:43:46 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
ARM: SoC driver updates
2015-02-17 09:38:59 -08:00
USB patches for 3.20-rc1
2015-02-15 10:24:55 -08:00
This is the bulk of pin control changes for the v3.20 cycle:
2015-02-11 11:23:13 -08:00
platform-drivers-x86 for 3.20
2015-02-19 10:56:51 -08:00
TTY/Serial driver patches for 3.20-rc1
2015-02-15 11:37:02 -08:00
pwm: tegra: Use NSEC_PER_SEC
2015-02-18 08:40:29 +01:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2015-02-18 08:49:20 -08:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
Fairly small update, but there are some interesting new features.
2015-02-13 09:55:09 -08:00
OK, this has the big virtio 1.0 implementation, as specified by OASIS.
2015-02-18 09:24:01 -08:00
ARM: SoC driver updates
2015-02-17 09:38:59 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
treewide: Remove unnecessary SSB_DEVTABLE_END macro
2015-02-11 14:38:29 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2015-02-19 11:28:36 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
2015-02-19 10:36:45 -08:00
USB patches for 3.20-rc1
2015-02-15 10:24:55 -08:00
vhost_net: fix wrong iter offset when setting number of buffers
2015-02-15 08:17:15 -08:00
mm: gup: use get_user_pages_unlocked
2015-02-11 17:06:05 -08:00
virtio: don't set VIRTIO_CONFIG_S_DRIVER_OK twice.
2015-02-17 16:19:29 +10:30
watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch
2015-02-17 21:34:13 +01:00
SCSI misc on 20150209
2015-02-11 10:28:45 -08:00
4533f6e27a