Linus Torvalds
40889e8d9f
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client ...
Pull Ceph update from Sage Weil:
"There are a few different groups of commits here. The largest is
Alex's ongoing work to enable the coming RBD features (cloning,
striping). There is some cleanup in libceph that goes along with it.
Cyril and David have fixed some problems with NFS reexport (leaking
dentries and page locks), and there is a batch of patches from Yan
fixing problems with the fs client when running against a clustered
MDS. There are a few bug fixes mixed in for good measure, many of
which will be going to the stable trees once they're upstream.
My apologies for the late pull. There is still a gremlin in the rbd
map/unmap code and I was hoping to include the fix for that as well,
but we haven't been able to confirm the fix is correct yet; I'll send
that in a separate pull once it's nailed down."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (68 commits)
rbd: get rid of rbd_{get,put}_dev()
libceph: register request before unregister linger
libceph: don't use rb_init_node() in ceph_osdc_alloc_request()
libceph: init event->node in ceph_osdc_create_event()
libceph: init osd->o_node in create_osd()
libceph: report connection fault with warning
libceph: socket can close in any connection state
rbd: don't use ENOTSUPP
rbd: remove linger unconditionally
rbd: get rid of RBD_MAX_SEG_NAME_LEN
libceph: avoid using freed osd in __kick_osd_requests()
ceph: don't reference req after put
rbd: do not allow remove of mounted-on image
libceph: Unlock unprocessed pages in start_read() error path
ceph: call handle_cap_grant() for cap import message
ceph: Fix __ceph_do_pending_vmtruncate
ceph: Don't add dirty inode to dirty list if caps is in migration
ceph: Fix infinite loop in __wake_requests
ceph: Don't update i_max_size when handling non-auth cap
bdi_register: add __printf verification, fix arg mismatch
...
2012-12-20 14:00:13 -08:00
Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-14 10:03:23 -08:00
Merge tag 'tegra-for-3.8-fixes-for-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into fixes
2012-12-17 10:04:27 -08:00
1) More ACPI fixes
2012-12-15 12:37:18 -08:00
solos-pci: ensure all TX packets are aligned to 4 bytes
2012-12-19 14:53:53 -08:00
dma-buf: might_sleep() in dma_buf_unmap_attachment()
2012-12-20 12:05:05 +05:30
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-12-20 14:00:13 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
ARM: OMAP: Fix drivers to depend on omap for internal devices
2012-12-16 15:23:37 -08:00
Some nice cleanups, and even a patch my wife did as a "live" demo for
2012-12-20 08:37:05 -08:00
MTD pull for 3.8
2012-12-19 12:47:41 -08:00
ARM: arm-soc: Updates for Marvell mvebu/kirkwood
2012-12-14 14:54:26 -08:00
ACPI and power management updates for 3.8-rc1
2012-12-11 12:45:35 -08:00
ARM: arm-soc: SoC updates for 3.8
2012-12-12 12:05:15 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
Merge branch 'pm-devfreq'
2012-12-07 23:13:36 +01:00
dmatest: check for dma mapping error
2012-12-17 17:15:13 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
efi: Fix the build with user namespaces enabled.
2012-12-17 20:14:15 -08:00
gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG
2012-12-19 22:15:14 +00:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-12-19 20:24:25 -08:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-12-13 19:22:22 -08:00
hwmon-vid: Add support for AMD family 11h to 15h processors
2012-12-19 22:17:02 +01:00
Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux
2012-12-18 16:51:10 -08:00
This is the MFD patch set for the 3.8 merge window.
2012-12-16 18:55:20 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-12-19 12:56:42 -08:00
IOMMU Updates for Linux v3.8
2012-12-20 10:07:25 -08:00
TTY/Serial merge for 3.8-rc1
2012-12-11 14:08:47 -08:00
ARM: arm-soc: Device-tree updates, take 2
2012-12-14 14:42:53 -08:00
mISDN: fix race in timer canceling on module unloading
2012-12-14 13:14:07 -05:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2012-12-15 12:52:42 -08:00
lguest: fix typo
2012-12-18 15:19:06 +10:30
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
md update for 3.8
2012-12-18 09:32:44 -08:00
Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and 'arm/omap' into next
2012-12-16 12:24:09 +01:00
drivers/message/fusion/mptscsih.c: missing break
2012-12-18 15:02:12 -08:00
ARM: arm-soc fixes for 3.8
2012-12-20 07:21:54 -08:00
Sound updates for 3.8-rc1
2012-12-13 11:51:23 -08:00
This is the MFD patch set for the 3.8 merge window.
2012-12-16 18:55:20 -08:00
Nothing exciting, just clean-ups and nicification. Oh, and one small
2012-12-20 07:39:03 -08:00
Some nice cleanups, and even a patch my wife did as a "live" demo for
2012-12-20 08:37:05 -08:00
of: Fix export of of_find_matching_node_and_match()
2012-12-19 10:58:53 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-12-13 14:20:19 -08:00
ARM: arm-soc: Header cleanups
2012-12-12 11:45:16 -08:00
ARM: arm-soc: multiplatform conversion patches
2012-12-13 10:57:16 -08:00
Corentin has moved
2012-12-17 17:15:14 -08:00
Driver core updates for 3.8-rc1
2012-12-11 13:13:55 -08:00
In part2:
2012-12-19 08:14:08 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
pwm: Changes for v3.8-rc1
2012-12-19 08:19:07 -08:00
Driver core updates for 3.8-rc1
2012-12-11 13:13:55 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
virtio: rpmsg: make it clear that virtqueue_add_buf() no longer returns > 0
2012-12-18 15:20:36 +10:30
rtc: DA9055 RTC driver
2012-12-17 17:15:21 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-12-13 14:20:19 -08:00
Some nice cleanups, and even a patch my wife did as a "live" demo for
2012-12-20 08:37:05 -08:00
spi/sh-hspi: fix return value check in hspi_probe().
2012-12-19 15:11:41 +00:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-12-14 14:27:45 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-12-17 15:44:47 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-12-15 14:25:10 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
2012-12-16 11:28:10 -08:00
ARM: arm-soc: SoC updates for 3.8
2012-12-12 12:05:15 -08:00
usb: musb: use io{read,write}*_rep accessors
2012-12-17 17:15:13 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-12-15 14:25:10 -08:00
backlight: locomolcd: fix checkpatch error and warning
2012-12-18 15:02:11 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2012-12-18 09:58:09 -08:00
Some nice cleanups, and even a patch my wife did as a "live" demo for
2012-12-20 08:37:05 -08:00
ARM: OMAP: Fix drivers to depend on omap for internal devices
2012-12-16 15:23:37 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Feature:
2012-12-16 17:39:14 -08:00
40889e8d9f