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
arm: fix comment header and macro name
2014-01-02 10:46:41 +01:00
bcma: export bcma_find_core_unit()
2014-01-04 20:25:19 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2014-01-28 11:02:23 -08:00
Third Round of Renesas ARM Based SoC DT Updates for v3.14
2014-01-03 21:09:51 -08:00
crush: add set_choose_local_[fallback_]tries steps
2013-12-31 20:32:26 +02:00
extcon: gpio: Add power resume support
2014-01-09 09:53:30 +09:00
fsl /bestcomm
gpiolib: convert gpiod_lookup description to kernel-doc
2013-12-09 14:18:33 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-01-24 17:17:30 -08:00
iio: Remove support for the legacy event config interface
2013-12-08 13:13:52 +00:00
Xtensa patchset for 3.14-rc1
2014-01-25 10:49:30 -08:00
MMC highlights for 3.14:
2014-01-26 11:00:41 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
IB/mlx5: Remove old field for create mkey mailbox
2014-01-22 23:23:54 -08:00
MMC highlights for 3.14:
2014-01-26 11:00:41 -08:00
netfilter: ipset: remove unused code
2014-01-03 23:41:35 +01:00
phy: add phy_get_bus_width()/phy_set_bus_width() calls
2013-12-23 14:26:17 -06:00
pinctrl: Add void * to pinctrl_pin_desc
2014-01-16 14:25:37 +01:00
spi: Updates for v3.14
2014-01-25 13:20:36 -08:00
isp1704_charger: Add DT support
2013-12-23 18:34:58 -08:00
regulator: act8865: add PMIC act8865 driver
2013-12-24 13:47:40 +00:00
numa: add a sysctl for numa_balancing
2014-01-23 16:36:51 -08:00
spi: Updates for v3.14
2014-01-25 13:20:36 -08:00
sunrpc: replace sunrpc_net->gssd_running flag with a more reliable check
2013-12-06 13:06:31 -05:00
ARM: driver updates for 3.14
2014-01-23 18:49:36 -08:00
uwb: Use dev_is_pci() to check whether it is pci device
2013-12-08 18:01:56 -08:00
Merge branch 'acpi-modules'
2014-01-17 01:59:38 +01:00
KEYS: Fix multiple key add into associative array
2013-12-02 11:24:18 +00:00
ath9k: Use a separate TX gain table for WZR-HP-G450H
2013-12-09 15:37:58 -05:00
audit: Convert int limit uses to u32
2014-01-14 14:54:00 -05:00
auxvec.h: account for AT_HWCAP2 in AT_VECTOR_SIZE_BASE
2013-12-24 09:35:17 -08:00
memblock, nobootmem: add memblock_virt_alloc_low()
2014-01-27 21:02:38 -08:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
printk/cache: mark printk_once test variable __read_mostly
2014-01-23 16:36:56 -08:00
crypto: ccp - CCP device enabled/disabled changes
2014-01-15 11:33:40 +08:00
cgroup: remove stray references to css_id
2014-01-13 10:48:18 -05:00
net: netprio: rename config to be more consistent with cgroup configs
2014-01-03 23:41:42 +01:00
Merge branch 'clk-next-unregister' into clk-next
2013-12-31 11:35:12 -08:00
clk: Add set_rate_and_parent() op
2014-01-16 12:00:57 -08:00
clk: add clk accuracy retrieval support
2013-12-22 23:14:27 -08:00
clk: Add common __clk_get(), __clk_put() implementations
2013-12-04 17:19:44 +01:00
mm: compaction: encapsulate defer reset logic
2014-01-21 16:19:48 -08:00
crypto: more robust crypto_memneq
2013-12-05 21:28:41 +08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2014-01-23 18:11:00 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2014-01-23 18:11:00 -08:00
drivers/base: provide an infrastructure for componentised subsystems
2014-01-10 16:27:36 -08:00
ACPI / hotplug / driver core: Handle containers in a special way
2013-12-29 15:25:48 +01:00
context_tracking: Wrap static key check into more intuitive function name
2013-12-02 20:43:14 +01:00
context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()
2013-12-02 20:43:15 +01:00
thermal: cpu_cooling: introduce of_cpufreq_cooling_register
2013-12-04 09:33:34 -04:00
cpufreq: Add boost frequency support in core
2014-01-17 02:00:44 +01:00
crash_dump: fix compilation error (on MIPS at least)
2014-01-15 14:19:42 +07:00
dcache: allow word-at-a-time name hashing with big-endian CPUs
2013-12-12 10:39:01 -08:00
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"
2014-01-13 14:05:13 -08:00
dma-debug: introduce debug_dma_assert_idle()
2014-01-21 16:19:41 -08:00
ARM: SoC cleanups for 3.14
2014-01-23 18:36:55 -08:00
EDAC: Add an edac_report parameter to EDAC
2013-12-11 18:06:47 +01:00
Linux 3.13-rc7
2014-01-05 12:34:29 +01:00
etherdevice: Use ether_addr_copy to copy an Ethernet address
2014-01-15 15:39:33 -08:00
export: declare ksymtab symbols
2014-01-16 10:23:02 +10:30
f2fs: add inline_data recovery routine
2014-01-06 16:42:20 +09:00
introduce __fcheck_files() to fix rcu_dereference_check_fdtable(), kill rcu_my_thread_group_empty()
2014-01-25 03:14:36 -05:00
net: filter: let bpf_tell_extensions return SKF_AD_MAX
2014-01-21 18:57:43 -08:00
firmware: Introduce request_firmware_direct()
2013-12-08 18:22:32 -08:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
fs: add a set_acl inode operation
2014-01-25 23:58:17 -05:00
fsnotify: remove .should_send_event callback
2014-01-21 16:19:41 -08:00
tracing: Add generic tracing_lseek() function
2014-01-02 16:17:12 -05:00
tracing: Consolidate event trigger code
2014-01-09 21:20:07 -05:00
include/linux/genalloc.h: spinlock_t needs spinlock_types.h
2014-01-23 16:36:52 -08:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
lib: introduce arch optimized hash library
2013-12-17 14:27:17 -05:00
HID: hid-sensor-hub: Add logical min and max
2013-12-02 21:05:30 +00:00
2nd round of new IIO drivers, features and cleanups for the 3.14 cycle.
2013-12-24 10:30:57 -08:00
mm: thp: optimize compound_trans_huge
2014-01-21 16:19:43 -08:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
i2c: pnx: Use devm_*() functions
2014-01-16 11:15:50 +01:00
i2c: Re-instate body of i2c_parent_is_i2c_adapter()
2014-01-14 17:11:13 +01:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
ieee80211: add definition for SMS4 key len
2014-01-10 20:12:13 +01:00
macvlan: unify macvlan_pcpu_stats and vlan_pcpu_stats
2014-01-04 20:11:33 -05:00
net: unify the pcpu_tstats and br_cpu_netstats as one
2014-01-04 20:10:24 -05:00
8021q: make vlan_pcpu_stats visible without CONFIG_VLAN_8021Q
2014-01-05 20:27:55 -05:00
lro: remove dead code
2013-12-29 16:34:25 -05:00
ipv4: fix wildcard search with inet_confirm_addr()
2013-12-11 14:47:40 -05:00
init.h: add missing initcall variants
2013-12-10 22:58:13 -08:00
Merge git://git.infradead.org/users/eparis/audit
2014-01-23 18:08:10 -08:00
softirq: use const char * const for softirq_to_name, whitespace neatening
2014-01-27 21:02:40 -08:00
ipc: change kern_ipc_perm.deleted type to bool
2014-01-27 21:02:39 -08:00
ipc: delete seq_max field in struct ipc_ids
2014-01-27 21:02:40 -08:00
ipv6: make IPV6_RECVPKTINFO work for ipv4 datagrams
2014-01-19 19:53:18 -08:00
genirq: Add an accessor for IRQ_PER_CPU flag
2013-12-19 17:43:04 +00:00
ACPI / IBFT: Fix incorrect <acpi/acpi.h> inclusion in iSCSI boot firmware module
2013-12-07 01:24:33 +01:00
jump_label: use defined macros instead of hard-coding for better readability
2014-01-08 15:23:53 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
kernfs: add struct dentry declaration in kernfs.h
2014-01-17 11:50:07 -08:00
kexec: add sysctl to disable kexec_load
2014-01-23 16:37:03 -08:00
kernfs: s/sysfs_dirent/kernfs_node/ and rename its friends accordingly
2013-12-11 15:28:36 -08:00
mm/rmap: use rmap_walk() in page_referenced()
2014-01-21 16:19:45 -08:00
kvm: remove dead code
2014-01-08 19:03:00 -02:00
libata: disable LPM for some WD SATA-I devices
2014-01-16 09:49:10 -05:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
math64: Add mul_u64_u32_shr()
2013-12-11 15:52:34 +01:00
mdio: unused ethtool functions
2013-12-26 13:29:35 -05:00
mm: free memblock.memory in free_all_bootmem
2014-01-23 16:36:51 -08:00
memcg, slab: clean up memcg cache initialization/destruction
2014-01-23 16:36:51 -08:00
drivers: base: Add prototype declaration to the header file
2013-12-20 12:20:26 -08:00
mm, mempolicy: remove unneeded functions for UMA configs
2014-01-21 16:19:44 -08:00
micrel: add support for KSZ8041RNLI
2013-12-11 13:54:13 -05:00
mm/migrate: remove unused function, fail_migrate_page()
2014-01-21 16:19:49 -08:00
misc: Reserve minor for VFIO
2013-12-19 10:17:11 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2014-01-27 21:11:26 -08:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
mm: add overcommit_kbytes sysctl variable
2014-01-21 16:19:44 -08:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
mm: numa: limit scope of lock for NUMA migrate rate limiting
2014-01-21 16:19:48 -08:00
module: fix coding style
2014-01-16 10:23:03 +10:30
ipc: whitespace cleanup
2014-01-27 21:02:39 -08:00
PCI: Drop "irq" param from *_restore_msi_irqs()
2013-12-13 08:44:30 -07:00
net: replace macros net_random and net_srandom with direct calls to prandom
2014-01-14 15:15:25 -08:00
rtnetlink: remove ndo_get_slave
2014-01-22 21:57:17 -08:00
netlink: cleanup tap related functions
2014-01-01 23:43:36 -05:00
NFS client bugfixes
2013-12-05 13:05:48 -08:00
nfs: use generic posix ACL infrastructure for v3 Posix ACLs
2014-01-26 08:26:20 -05:00
nls: have register_nls() set ->owner
2014-01-25 03:14:05 -05:00
include/linux/of.h: make for_each_child_of_node() reference its args when CONFIG_OF=n
2014-01-23 16:36:55 -08:00
platform: introduce OF style 'modalias' support for platform bus
2014-01-17 01:59:15 +01:00
powerpc: introduce early_get_first_memblock_info
2014-01-09 17:52:17 -06:00
phylib: Add of_phy_attach
2014-01-13 14:29:49 -08:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
lib/parser.c: add match_wildcard() function
2014-01-23 16:36:55 -08:00
PCI: Removed unused parts of Page Request Interface support
2014-01-10 14:00:47 -07:00
PCI changes for the v3.14 merge window:
2014-01-22 16:39:28 -08:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
percpu: fix spurious sparse warnings from DEFINE_PER_CPU()
2013-12-05 12:59:23 -05:00
mm: dump page when hitting a VM_BUG_ON using VM_BUG_ON_PAGE
2014-01-23 16:36:50 -08:00
perf/x86: Fix active_entry initialization
2014-01-12 10:16:07 +01:00
phylib: Support attaching to generic 10g driver
2014-01-13 14:29:49 -08:00
fuse: fix pipe_buf_operations
2014-01-22 19:36:57 +01:00
Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'
2014-01-12 23:50:03 +01:00
PM / Runtime: Implement the pm_generic_runtime functions for CONFIG_PM
2013-12-22 01:39:58 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-01-28 08:38:04 -08:00
fs: add generic xattr_acl handlers
2014-01-25 23:58:17 -05:00
power_supply: Add power_supply_get_by_phandle
2013-12-23 18:21:11 -08:00
sched/preempt/x86: Fix voluntary preempt for x86
2014-01-23 14:48:35 +01:00
sched/preempt, locking: Rework local_bh_{dis,en}able()
2014-01-13 17:32:27 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
pstore: Don't allow high traffic options on fragile devices
2013-12-20 13:12:01 -08:00
fs/ramfs/file-nommu.c: make ramfs_nommu_get_unmapped_area() and ramfs_nommu_mmap() static
2014-01-23 16:36:58 -08:00
random32: add prandom_u32_max and convert open coded users
2014-01-21 23:17:20 -08:00
rcu: Remove "extern" from function declarations in include/linux/*rcu*.h
2013-12-12 12:34:16 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-01-28 08:38:04 -08:00
rcu: Remove "extern" from function declarations in include/linux/*rcu*.h
2013-12-12 12:34:16 -08:00
rcu: Remove "extern" from function declarations in include/linux/*rcu*.h
2013-12-12 12:34:16 -08:00
kexec: migrate to reboot cpu
2013-12-18 19:04:50 -08:00
reciprocal_divide: update/correction of the algorithm
2014-01-21 23:17:20 -08:00
Merge remote-tracking branch 'regmap/topic/ack' into regmap-next
2014-01-09 14:34:13 +00:00
reset: Silence warning in reset-controller.h
2014-01-16 12:00:56 -08:00
mm/rmap: use rmap_walk() in page_referenced()
2014-01-21 16:19:45 -08:00
rtmutex: Turn the plist into an rb-tree
2014-01-13 13:41:50 +01:00
net: allow netdev_all_upper_get_next_dev_rcu with rtnl lock held
2013-12-17 21:19:08 -08:00
locking: Optimize lock_bh functions
2014-01-13 13:47:36 +01:00
lib/scatterlist: export sg_miter_skip()
2013-12-08 17:56:37 -08:00
exec: kill task_struct->did_exec
2014-01-23 16:37:02 -08:00
sctp: fix missing SCTP mailing list address update
2014-01-19 19:55:50 -08:00
seqlock: Use raw_ prefix instead of _no_lockdep
2014-01-12 10:13:59 +01:00
serial: sh-sci: Remove platform data mapbase and irqs fields
2013-12-24 21:50:54 +09:00
SFI / ACPI: Fix warnings reported during builds with W=1
2013-12-07 01:24:33 +01:00
sh_eth: add PHY IRQ to platform data
2013-12-19 19:09:38 -05:00
ipc: whitespace cleanup
2014-01-27 21:02:39 -08:00
security: shmem: implement kernel private shmem inodes
2013-12-02 11:24:19 +00:00
net: Add skb_get_hash_raw
2014-01-16 16:22:54 -08:00
memcg, slab: RCU protect memcg_params for root caches
2014-01-23 16:36:51 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-01-25 11:17:34 -08:00
net: update comments of "struct msghdr" with the more accurate RFC3542 ones
2014-01-22 21:57:05 -08:00
locking: Add an smp_mb__after_unlock_lock() for UNLOCK+BLOCK barrier
2013-12-16 11:36:13 +01:00
locking: Optimize lock_bh functions
2014-01-13 13:47:36 +01:00
locking: Optimize lock_bh functions
2014-01-13 13:47:36 +01:00
splice: fix unexpected size truncation
2014-01-27 21:02:40 -08:00
mfd: ssbi: Constify buffer in ssbi_write
2014-01-21 08:28:07 +00:00
stmmac: Fix kernel crashes for jumbo frames
2014-01-21 17:05:27 -08:00
sched: Add new scheduler syscalls to support an extended scheduling parameters ABI
2014-01-13 13:41:04 +01:00
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"
2014-01-13 14:05:13 -08:00
ACPI: Clean up inclusions of ACPI header files
2013-12-07 01:03:14 +01:00
tcp: out_of_order_queue do not use its lock
2014-01-06 16:34:34 -05:00
ARM: tegra: fix tegra_powergate_sequence_power_up() inline
2014-01-14 08:01:10 -08:00
thermal: core: introduce thermal_of_cooling_device_register
2013-12-04 09:31:34 -04:00
context_tracking: Wrap static key check into more intuitive function name
2013-12-02 20:43:14 +01:00
tpm: Create a tpm_class_ops structure and use it in the drivers
2014-01-06 14:37:25 +01:00
Merge branch 'master' into for-next
2013-12-19 15:08:32 +01:00
USB patches for 3.14-rc1
2014-01-20 16:13:02 -08:00
tty: Halve flip buffer GFP_ATOMIC memory consumption
2013-12-09 11:09:24 -08:00
tty: Always handle NULL flag ptr
2013-12-08 16:56:05 -08:00
sched/preempt: Take away preempt_enable_no_resched() from modules
2014-01-13 13:47:37 +01:00
usb: core: allow a reference device for new_id
2014-01-10 16:54:35 -08:00
VME: Rename vme_slot_get to avoid confusion with reference counting
2013-12-03 11:15:58 -08:00
context_tracking: Rename context_tracking_active() to context_tracking_cpu_is_enabled()
2013-12-02 20:43:15 +01:00
drivers/w1/masters/w1-gpio.c: add strong pullup emulation
2014-01-23 16:37:04 -08:00
sched: Fix warning on make htmldocs caused by wait.h
2014-01-22 10:25:39 +01:00
