Linus Torvalds
6b5f04b6cf
Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup ...
Pull cgroup updates from Tejun Heo:
"cgroup changes for v4.6-rc1. No userland visible behavior changes in
this pull request. I'll send out a separate pull request for the
addition of cgroup namespace support.
- The biggest change is the revamping of cgroup core task migration
and controller handling logic. There are quite a few places where
controllers and tasks are manipulated. Previously, many of those
places implemented custom operations for each specific use case
assuming specific starting conditions. While this worked, it makes
the code fragile and difficult to follow.
The bulk of this pull request restructures these operations so that
most related operations are performed through common helpers which
implement recursive (subtrees are always processed consistently)
and idempotent (they make cgroup hierarchy converge to the target
state rather than performing operations assuming specific starting
conditions). This makes the code a lot easier to understand,
verify and extend.
- Implicit controller support is added. This is primarily for using
perf_event on the v2 hierarchy so that perf can match cgroup v2
path without requiring the user to do anything special. The kernel
portion of perf_event changes is acked but userland changes are
still pending review.
- cgroup_no_v1= boot parameter added to ease testing cgroup v2 in
certain environments.
- There is a regression introduced during v4.4 devel cycle where
attempts to migrate zombie tasks can mess up internal object
management. This was fixed earlier this week and included in this
pull request w/ stable cc'd.
- Misc non-critical fixes and improvements"
* 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (44 commits)
cgroup: avoid false positive gcc-6 warning
cgroup: ignore css_sets associated with dead cgroups during migration
Documentation: cgroup v2: Trivial heading correction.
cgroup: implement cgroup_subsys->implicit_on_dfl
cgroup: use css_set->mg_dst_cgrp for the migration target cgroup
cgroup: make cgroup[_taskset]_migrate() take cgroup_root instead of cgroup
cgroup: move migration destination verification out of cgroup_migrate_prepare_dst()
cgroup: fix incorrect destination cgroup in cgroup_update_dfl_csses()
cgroup: Trivial correction to reflect controller.
cgroup: remove stale item in cgroup-v1 document INDEX file.
cgroup: update css iteration in cgroup_update_dfl_csses()
cgroup: allocate 2x cgrp_cset_links when setting up a new root
cgroup: make cgroup_calc_subtree_ss_mask() take @this_ss_mask
cgroup: reimplement rebind_subsystems() using cgroup_apply_control() and friends
cgroup: use cgroup_apply_enable_control() in cgroup creation path
cgroup: combine cgroup_mutex locking and offline css draining
cgroup: factor out cgroup_{apply|finalize}_control() from cgroup_subtree_control_write()
cgroup: introduce cgroup_{save|propagate|restore}_control()
cgroup: make cgroup_drain_offline() and cgroup_apply_control_{disable|enable}() recursive
cgroup: factor out cgroup_apply_control_enable() from cgroup_subtree_control_write()
...
2016-03-18 20:25:49 -07:00
drivers/hwtracing: make coresight-* explicitly non-modular
2016-02-20 14:11:01 -08:00
ceph: initial CEPH_FEATURE_FS_FILE_LAYOUT_V2 support
2016-03-04 21:00:37 +01:00
ARM: SoC multiplatform code changes for v4.5
2016-01-20 18:03:56 -08:00
crush: add chooseleaf_stable tunable
2016-02-04 18:25:55 +01:00
gpio: Add devm_ apis for gpiochip_add_data and gpiochip_remove
2016-02-23 19:40:33 +05:30
iio: Fix typos in the struct iio_event_spec documentation comments
2016-02-17 21:11:08 +00:00
Input: cyttsp - switch to using device properties
2016-01-27 14:32:48 -08:00
MIPS: Make smp CMP, CPS and MT use the new generic IPI functions
2016-02-25 10:56:58 +01:00
- New Drivers
2016-03-18 10:15:11 -07:00
IB/mlx4: Add support for the don't trap rule
2016-02-29 17:11:40 -05:00
Initial roundup of 4.6 merge window patches
2016-03-18 09:39:22 -07:00
sound updates for 4.6-rc1
2016-03-18 10:05:46 -07:00
power supply and reset changes for the v4.6 series
2016-03-17 12:50:55 -07:00
raid6/algos.c : bug fix : Add the missing definitions to the pq.h file
2016-01-21 14:47:08 -08:00
Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555', 'regulator/topic/gpio', 'regulator/topic/hi655x' and 'regulator/topic/lp872x' into regulator-next
2016-03-13 15:19:35 +07:00
mm: move max_map_count bits into mm.h
2016-03-17 15:09:34 -07:00
soc: ti: knav_dma: rename pad in struct knav_dma_desc to sw_data
2016-02-21 22:03:15 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2016-03-17 21:51:52 -07:00
sunrpc: Use skcipher and ahash/shash
2016-01-27 20:36:01 +08:00
include/linux/unaligned: force inlining of byteswap operations
2016-03-17 15:09:34 -07:00
USB: core: let USB device know device node
2016-03-05 12:05:01 -08:00
libata: fix HDIO_GET_32BIT ioctl
2016-02-11 10:07:18 -05:00
tty/serial: at91: fix bad offset for UART timeout register
2016-03-07 16:11:14 -08:00
atomic: Export fetch_or()
2016-02-13 15:34:28 +01:00
tty: audit: Handle tty audit enable atomically
2016-01-27 16:41:04 -08:00
autofs4: fix string.h include in auto_dev-ioctl.h
2016-03-15 16:55:16 -07:00
autofs4: coding style fixes
2016-03-15 16:55:16 -07:00
MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure
2016-01-24 03:47:37 +01:00
MIPS: bcm963xx: Update bcm_tag field image_sequence
2016-01-24 03:49:03 +01:00
block: don't optimize for non-cloned bio in bio_get_last_bvec()
2016-03-12 14:12:10 -07:00
blk-mq: dynamic h/w context count
2016-02-09 12:42:17 -07:00
Merge branch 'for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2016-03-18 20:06:46 -07:00
bufferhead: force inlining of buffer head flag operations
2016-03-17 15:09:34 -07:00
arch: Introduce post-init read-only memory
2016-02-22 08:51:38 +01:00
crypto: ccp - CCP versioning support
2016-03-11 21:19:16 +08:00
cgroup: ignore css_sets associated with dead cgroups during migration
2016-03-16 13:31:46 -07:00
include/linux/cleancache.h: Clean up code
2016-01-27 09:10:29 -05:00
clockevents: Rename last parameter of clocks_calc_mult_shift() to maxsec
2016-01-27 12:38:03 +01:00
clocksource: Introduce clocksource_freq2mult()
2016-02-27 08:55:30 +01:00
mm, compaction: introduce kcompactd
2016-03-17 15:09:34 -07:00
Merge commit 'fixes.2015.02.23a' into core/rcu
2016-03-15 09:01:06 +01:00
configfs: switch ->default groups to a linked list
2016-03-06 16:11:24 +01:00
coresight: introducing a global trace ID function
2016-02-20 14:11:01 -08:00
coresight: etb10: implementing AUX API
2016-02-20 14:11:01 -08:00
rcu: Make CPU_DYING_IDLE an explicit call
2016-03-01 20:36:58 +01:00
Merge branch 'pm-cpufreq-governor' into pm-cpufreq
2016-03-10 20:46:03 +01:00
cpu/hotplug: Make wait for dead cpu completion based
2016-03-01 20:36:58 +01:00
kernel/cpu.c: make set_cpu_* static inlines
2016-01-20 17:09:18 -08:00
cpuset: make mm migration asynchronous
2016-01-22 10:22:46 -05:00
crypto: hash - Remove crypto_hash interface
2016-02-06 15:33:20 +08:00
misc: at24: replace memory_accessor with nvmem_device_read
2016-03-01 16:55:48 -08:00
dax: move writeback calls into the filesystems
2016-02-27 10:28:52 -08:00
use ->d_seq to get coherency between ->d_inode and ->d_flags
2016-02-29 12:16:43 -05:00
debugfs: Add stub function for debugfs_create_automount().
2016-02-07 22:26:47 -08:00
dm snapshot: disallow the COW and origin devices from being identical
2016-03-10 17:12:09 -05:00
usb: sysfs: make locking interruptible
2016-02-03 13:29:12 -08:00
pty: make sure super_block is still valid in final /dev/tty close
2016-02-06 23:45:46 -08:00
dma-mapping: always provide the dma_map_ops based implementation
2016-01-20 17:09:18 -08:00
Merge branch 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-14 16:31:41 -07:00
Merge branch 'topic/pl330' into for-linus
2016-03-14 11:18:12 +05:30
misc: eeprom_93xx46: Add support for a GPIO 'select' line.
2016-02-11 19:23:28 -08:00
arm64 updates for 4.6:
2016-03-17 20:03:47 -07:00
staging/lustre: proper support of NFS anonymous dentries
2016-02-25 22:12:26 -08:00
mm: fault-inject take over bootstrap kmem_cache check
2016-03-15 16:55:16 -07:00
fbdev: kill fb_rotate
2016-02-26 13:28:35 +02:00
staging/android: remove struct sync_pt
2016-02-07 17:34:58 -08:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
ima: load policy using path
2016-02-21 09:34:05 -05:00
Revert "fsnotify: destroy marks with call_srcu instead of dedicated thread"
2016-02-18 16:23:24 -08:00
sched/debug: Fix preempt_disable_ip recording for preempt_disable()
2016-02-29 09:53:10 +01:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
Revert "gpio: remove broken irq_to_gpio() interface"
2016-02-20 12:53:31 +01:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
thp: rewrite freeze_page()/unfreeze_page() with generic rmap walkers
2016-03-17 15:09:34 -07:00
Drivers: hv: util: Pass the channel information during the init call
2016-03-01 16:57:20 -08:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
asm-generic: Consolidate mark_rodata_ro()
2016-02-22 08:51:37 +01:00
iommu/vt-d: Clear PPR bit to ensure we get more page request interrupts
2016-02-15 12:42:38 +00:00
x86/ACPI/PCI: Recognize that Interrupt Line 255 means "not connected"
2016-03-09 01:23:35 +01:00
lib/iomap_copy.c: add __ioread32_copy()
2016-01-20 17:09:18 -08:00
iommu: Update struct iommu_ops comments
2016-01-29 12:34:29 +01:00
libnvdimm for 4.6
2016-03-16 17:45:56 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 12:48:48 -07:00
Staging driver patches for 4.6-rc1
2016-03-17 22:13:41 -07:00
iscsi_ibft: Add prefix-len attr and display netmask
2016-03-14 10:30:57 -04:00
isdn: Remove ASYNC_CLOSING
2016-01-28 14:19:12 -08:00
jbd2: unify revoke and tag block checksum handling
2016-02-22 23:19:09 -05:00
kasan: add functions to clear stack poison
2016-03-09 15:43:42 -08:00
lib: move strtobool() to kstrtobool()
2016-03-17 15:09:34 -07:00
kexec: move some memembers and definitions within the scope of CONFIG_KEXEC_FILE
2016-01-20 17:09:18 -08:00
KEYS: Add an alloc flag to convey the builtinness of a key
2016-02-09 16:40:46 +00:00
KVM: Use simple waitqueue for vcpu->wq
2016-02-25 11:27:16 +01:00
sched/debug: Make schedstats a runtime tunable that is disabled by default
2016-02-09 11:54:23 +01:00
leds: core: avoid error message when a USB LED device is unplugged
2016-03-14 09:22:20 +01:00
libata: Align ata_device's id on a cacheline
2016-02-25 16:37:06 -05:00
nfit: disable userspace initiated ars during scrub
2016-03-05 12:24:06 -08:00
Merge branch 'for-4.6/drivers' of git://git.kernel.dk/linux-block
2016-03-18 17:13:31 -07:00
list: kill list_force_poison()
2016-03-09 15:43:42 -08:00
include/linux/list_bl.h: use bool instead of int for boolean functions
2016-03-17 15:09:34 -07:00
mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
2016-01-20 17:09:18 -08:00
livepatch/module: remove livepatch module notifier
2016-03-17 09:45:10 +01:00
kernel/locking/lockdep.c: convert hash tables to hlists
2016-02-11 18:35:48 -08:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
lz4: fix wrong compress buffer size for 64-bits
2016-01-20 17:09:18 -08:00
mbcache: add reusable flag to cache entries
2016-02-22 22:44:04 -05:00
mm: workingset: make shadow node shrinker memcg aware
2016-03-17 15:09:34 -07:00
Char/Misc patches for 4.6-rc1
2016-03-17 13:47:50 -07:00
mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
2016-03-15 16:55:16 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
mm: remove VM_FAULT_MINOR
2016-03-17 15:09:34 -07:00
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
2016-02-18 09:28:03 +01:00
mm, debug: move bad flags printing to bad_page()
2016-03-15 16:55:16 -07:00
mm: scale kswapd watermarks in proportion to memory
2016-03-17 15:09:34 -07:00
modules: fix longstanding /proc/kallsyms vs module insertion race.
2016-02-03 16:58:15 +10:30
fsl-mc: msi: Added FSL-MC-specific member to the msi_desc's union
2016-02-07 19:10:12 -08:00
libnvdimm: async notification support
2016-03-05 12:24:06 -08:00
net: make netdev_for_each_lower_dev safe for device removal
2016-02-19 15:29:26 -05:00
nfs: fix nfs_size_to_loff_t
2016-02-08 15:20:01 -05:00
pnfs/blocklayout: fix a memeory leak when using,vmalloc_to_page
2016-02-17 11:44:45 -05:00
rcu: Make CPU_DYING_IDLE an explicit call
2016-03-01 20:36:58 +01:00
nvmem: Add backwards compatibility support for older EEPROM drivers.
2016-03-01 16:55:48 -08:00
of: drop symbols declared by _OF_DECLARE() from modules
2016-01-25 08:35:50 -06:00
of: earlycon: Move address translation to of_setup_earlycon()
2016-02-06 22:07:37 -08:00
mm: exclude ZONE_DEVICE from GFP_ZONE_TABLE
2016-03-17 15:09:34 -07:00
include/linux/page-flags.h: force inlining of selected page flag modifications
2016-03-17 15:09:34 -07:00
mm, page_owner: track and print last migrate reason
2016-03-15 16:55:16 -07:00
mm, page_owner: dump page owner info from dump_page()
2016-03-15 16:55:16 -07:00
mm/page_ref: add tracepoint to track down page reference manipulation
2016-03-17 15:09:34 -07:00
mm: introduce page reference manipulation functions
2016-03-17 15:09:34 -07:00
PCI: Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h
2016-03-07 11:39:16 -06:00
PCI changes for the v4.6 merge window:
2016-03-16 14:45:55 -07:00
PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
2016-03-15 08:52:28 -05:00
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-14 19:44:38 -07:00
mm: fix pfn_t vs highmem
2016-02-11 18:35:48 -08:00
mm: fix pfn_t vs highmem
2016-02-11 18:35:48 -08:00
pipe: limit the per-user amount of pages allocated in pipes
2016-01-19 19:25:21 -05:00
PM / Domains: remove old power on/off latencies
2016-02-15 23:18:15 +01:00
PM / OPP: Add dev_pm_opp_set_rate()
2016-02-10 01:11:54 +01:00
libnvdimm, pmem: clear poison on write
2016-03-09 15:15:32 -08:00
mm/page_poisoning.c: allow for zero poisoning
2016-03-15 16:55:16 -07:00
timer: convert timer_slack_ns from unsigned long to u64
2016-03-17 15:09:34 -07:00
posix-cpu-timers: Migrate to use new tick dependency mask model
2016-03-02 16:44:27 +01:00
power_supply: Add types for USB Type C and PD chargers
2016-02-15 07:02:32 +01:00
time: Remove duplicated code in ktime_get_raw_and_real()
2016-03-02 17:13:02 -08:00
pstore: Add support for 64 Bit address space
2016-03-10 09:43:36 -08:00
ptp: Add PTP_SYS_OFFSET_PRECISE for driver crosstimestamping
2016-03-03 14:23:43 -08:00
ptrace: use fsuid, fsgid, effective creds for fs access checks
2016-01-20 17:09:18 -08:00
spi: pxa2xx: Add support for both chip selects on Intel Braswell
2016-02-09 19:01:11 +00:00
fix Christoph's email addresses
2016-03-17 15:09:34 -07:00
radix-tree,shmem: introduce radix_tree_iter_next()
2016-03-17 15:09:34 -07:00
drivers: char: random: add get_random_long()
2016-02-27 10:28:52 -08:00
rbtree: use READ_ONCE in RB_EMPTY_ROOT
2016-01-20 17:09:18 -08:00
Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-03-15 13:50:29 -07:00
Merge remote-tracking branch 'regmap/topic/update-bits' into regmap-next
2016-03-05 21:30:41 +09:00
mm: make remove_migration_ptes() beyond mm/migration.c
2016-03-17 15:09:34 -07:00
Input: synaptics-rmi4 - add SPI transport driver
2016-03-10 16:04:24 -08:00
rtc: Add functions to set and read rtc offset
2016-03-14 17:08:15 +01:00
Merge branch 'akpm' (patches from Andrew)
2016-03-18 19:26:54 -07:00
module: replace copy_module_from_fd with kernel version
2016-02-21 09:06:12 -05:00
tty: Add software emulated RS485 support for 8250
2016-02-06 22:23:26 -08:00
of: earlycon: Move address translation to of_setup_earlycon()
2016-02-06 22:07:37 -08:00
ipc/shm.c: is_file_shm_hugepages() can be boolean
2016-01-20 17:09:18 -08:00
make sure that freeing shmem fast symlinks is RCU-delayed
2016-01-22 18:08:52 -05:00
mld, igmp: Fix reserved tailroom calculation
2016-03-03 15:41:07 -05:00
slub: convert SLAB_DEBUG_FREE to SLAB_CONSISTENCY_CHECKS
2016-03-15 16:55:16 -07:00
mm/slab: alternative implementation for DEBUG_SLAB_LEAK
2016-03-15 16:55:16 -07:00
mm/slub: support left redzone
2016-03-15 16:55:16 -07:00
rcu: Document unique-name limitation for DEFINE_STATIC_SRCU()
2016-02-23 19:59:55 -08:00
stm class: Plug stm device's unlink callback
2016-02-20 14:09:14 -08:00
stmmac: Fix 'eth0: No PHY found' regression
2016-03-03 15:02:05 -05:00
lib: move strtobool() to kstrtobool()
2016-03-17 15:09:34 -07:00
wait.[ch]: Introduce the simple waitqueue (swait) implementation
2016-02-25 11:27:16 +01:00
mm: free swap cache aggressively if memcg swap is full
2016-01-20 17:09:18 -08:00
swiotlb: Make linux/swiotlb.h standalone includible
2016-01-20 17:29:52 -05:00
param: convert some "on"/"off" users to strtobool
2016-03-17 15:09:34 -07:00
time: Add history to cross timestamp interface supporting slower devices
2016-03-02 17:13:17 -08:00
time: Add history to cross timestamp interface supporting slower devices
2016-03-02 17:13:17 -08:00
numa: remove stale node_has_online_mem() define
2016-01-18 14:49:33 -05:00
tracepoints: move trace_print_flags definitions to tracepoint-defs.h
2016-03-15 16:55:16 -07:00
tracepoints: move trace_print_flags definitions to tracepoint-defs.h
2016-03-15 16:55:16 -07:00
tracing: Fix check for cpu online when event is disabled
2016-03-09 11:58:41 -05:00
tty: Unify receive_buf() code paths
2016-01-28 14:13:44 -08:00
tty, n_tty: Remove fasync() ldisc notification
2016-01-28 11:58:02 -08:00
lib/ucs2_string: Add ucs2 -> utf8 helper functions
2016-02-10 13:19:03 +00:00
usb: Add USB 3.1 Precision time measurement capability descriptor support
2016-02-14 17:03:23 -08:00
vfio: Add capability chain helpers
2016-02-22 16:10:08 -07:00
thp, vmstats: count deferred split events
2016-03-17 15:09:34 -07:00
VMCI: Use 32bit atomics for queue headers on X86_32
2016-02-07 21:36:02 -08:00
sched/wait: Fix wait_event_freezable() documentation
2016-02-24 09:09:45 +01:00
workqueue: skip flush dependency checks for legacy workqueues
2016-01-29 13:31:10 -05:00
writeback: flush inode cgroup wb switches instead of pinning super_block
2016-03-03 14:42:50 -07:00
