1. 16 Jun, 2014 1 commit
  2. 11 Jun, 2014 2 commits
  3. 10 Jun, 2014 15 commits
    • Sebastian Ott's avatar
      s390/airq: silence lockdep warning · 0eb69a0c
      Sebastian Ott authored
      airq_iv_(alloc|free) is called by some users with interrupts enabled
      and by some with interrupts disabled which leads to the following
      lockdep warning:
      
      [ INFO: possible irq lock inversion dependency detected ]
      3.14.0-15249-gbf29b7b-dirty #25 Not tainted
      ---------------------------------------------------------
      insmod/2108 just changed the state of lock:
       (&(&iv->lock)->rlock){+.....}, at: [<000000000046ee3e>] airq_iv_alloc+0x62/0x228
      but this lock was taken by another, HARDIRQ-READ-safe lock in the past:
       (&info->lock){.-.-..}
      
      and interrupts could create inverse lock ordering between them.
      
      other info that might help us debug this:
       Possible interrupt unsafe locking scenario:
      
             CPU0                    CPU1
             ----                    ----
        lock(&(&iv->lock)->rlock);
                                     local_irq_disable();
                                     lock(&info->lock);
                                     lock(&(&iv->lock)->rlock);
        <Interrupt>
          lock(&info->lock);
      
       *** DEADLOCK ***
      
      Although this is a false alarm (since each airq user consistently
      calls these functions from the same context) fix this by ensuring
      that interrupts are disabled when the airq lock is held.
      Reported-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
      Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      0eb69a0c
    • Philipp Hachtmann's avatar
      s390/watchdog: add support for LPAR operation (diag288) · 646f919e
      Philipp Hachtmann authored
      Add the LPAR variant of the diag 288 watchdog to the driver.
      The only available action on timeout for LPAR is a PSW restart.
      Signed-off-by: default avatarPhilipp Hachtmann <phacht@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      646f919e
    • Philipp Hachtmann's avatar
      s390/watchdog: use watchdog API · f7a94db4
      Philipp Hachtmann authored
      Converted the vmwatchdog driver to use the kernel's watchdog API.
      Signed-off-by: default avatarPhilipp Hachtmann <phacht@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      f7a94db4
    • Peter Oberparleiter's avatar
      s390/sclp_vt220: Enable ASCII console per default · f2485f5d
      Peter Oberparleiter authored
      When you want to use the HMC's ASCII console as console device for
      a z/VM guest you have to specify console=ttyS1 on the kernel command
      line. But it won't work until you specify conmode=sclp as well.
      
      This behavior is inconsistent with the use of the ASCII console as
      TTY device which works on z/VM without the need to specify a conmode.
      
      Fix this inconsistency by removing the check for conmode=sclp in the
      ASCII console registration function.
      Signed-off-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      f2485f5d
    • Fabian Frederick's avatar
      s390/qdio: replace shift loop by ilog2 · 92bdae5d
      Fabian Frederick authored
      account_sbals is called by get_inbound_buffer_frontier and
      get_outbound_buffer_frontier with 'count' value > 0 so we can safely
      convert shift loop to ilog2.
      
      Cc: Joe Perches <joe@perches.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
      Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      92bdae5d
    • Sebastian Ott's avatar
      s390/cio: silence lockdep warning · dbe33fc9
      Sebastian Ott authored
      On systems where a ccw based console device is used a lockdep false alarm
      could be triggered when a device driver calls printk while holding a
      subchannels lock (e.g. in it's irq handler). Since this is valid behavior
      fix this by introducing a separate lock class for the console subchannels
      lock.
      
      The lockdep warning was revealed by "printk: enable interrupts before calling
      console_trylock_for_printk()" which changed console_unlock() to be called with
      lockdep enabled.
      
      [ INFO: possible recursive locking detected ]
      3.15.0-rc5-next-20140520 #1 Not tainted
      ---------------------------------------------
      ccwgroup/2239 is trying to acquire lock:
      (&(sch->lock)->rlock){-.-...}, at: [<0000000000642a52>] raw3215_write+0x52/0x200
      
      but task is already holding lock:
      (&(sch->lock)->rlock){-.-...}, at: [<00000000005fd160>] do_cio_interrupt+0x60/0x108
      
      other info that might help us debug this:
      Possible unsafe locking scenario:
      
      CPU0
      ----
      lock(&(sch->lock)->rlock);
      lock(&(sch->lock)->rlock);
      
      *** DEADLOCK ***
      
      May be due to missing lock nesting notation
      
      8 locks held by ccwgroup/2239:
      
      stack backtrace:
      CPU: 3 PID: 2239 Comm: ccwgroup Not tainted 3.15.0-rc5-next-20140520 #1
      0000000036fab518 0000000036fab528 0000000000000002 0000000000000000
      0000000036fab5b8 0000000036fab530 0000000036fab530 00000000001116e8
      0000000000000000 0000000000986ec4 00000000009701b6 000000000000000b
      0000000036fab578 0000000036fab518 0000000000000000 0000000000000000
      0000000000000000 00000000001116e8 0000000036fab518 0000000036fab578
      Call Trace:
      ([<0000000000111626>] show_trace+0x14e/0x158)
      [<000000000011169a>] show_stack+0x6a/0xe8
      [<00000000007c6e72>] dump_stack+0x82/0xb0
      [<00000000001a95f2>] validate_chain.isra.37+0xa4a/0xbb0
      [<00000000001acaca>] __lock_acquire+0x4da/0xcd0
      [<00000000001ada1a>] lock_acquire+0xba/0x218
      [<00000000007cd634>] _raw_spin_lock_irqsave+0x6c/0xb8
      [<0000000000642a52>] raw3215_write+0x52/0x200
      [<0000000000643d16>] con3215_write+0x76/0xf8
      [<00000000001bd87a>] call_console_drivers.constprop.25+0xfa/0x210
      [<00000000001be0b0>] console_unlock+0x3e0/0x4e8
      [<00000000001be450>] vprintk_emit+0x298/0x6e0
      [<00000000005aa210>] dev_vprintk_emit+0xe0/0x1a8
      [<00000000005aa320>] dev_printk_emit+0x48/0x50
      [<00000000005aa390>] __dev_printk+0x68/0xb0
      [<00000000005aa7c2>] _dev_info+0x62/0x70
      [<0000000000657bf0>] qeth_l2_send_setmac_cb+0xd0/0x190
      [<0000000000651a1e>] qeth_send_control_data_cb+0x3a6/0x6a8
      [<0000000000655546>] qeth_irq+0x1a6/0xac0
      [<000000000060a0ac>] ccw_device_call_handler+0xa4/0xc0
      [<0000000000608b62>] ccw_device_irq+0x5a/0x190
      [<00000000005fd1ca>] do_cio_interrupt+0xca/0x108
      [<00000000001c0a2e>] handle_irq_event_percpu+0x5e/0x378
      [<00000000001c46fc>] handle_percpu_irq+0x6c/0x98
      [<00000000001c0066>] generic_handle_irq+0x46/0x68
      [<000000000010b5b6>] do_IRQ+0x5e/0x88
      [<00000000007cf304>] io_call+0x6/0x20
      [<000000000064c63a>] qeth_send_control_data+0x322/0x570
      ([<000000000064c50e>] qeth_send_control_data+0x1f6/0x570)
      [<0000000000651db2>] qeth_send_ipa_cmd+0x92/0x120
      [<000000000065b310>] __qeth_l2_set_online+0x170/0xaa8
      [<000000000060ebb6>] ccwgroup_set_online+0x56/0x90
      [<000000000060ef96>] ccwgroup_online_store+0xd6/0xe0
      [<000000000033d11a>] kernfs_fop_write+0x10a/0x188
      [<00000000002bbd00>] vfs_write+0x98/0x1c0
      [<00000000002bc8a0>] SyS_write+0x60/0xd0
      [<00000000007cee3a>] sysc_nr_ok+0x22/0x28
      [<000003fffd0c3f28>] 0x3fffd0c3f28
      Reported-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      dbe33fc9
    • Martin Schwidefsky's avatar
      s390/uaccess: always load the kernel ASCE after task switch · f8b13505
      Martin Schwidefsky authored
      This patch fixes a problem introduced with git commit beef560b
      "s390/uaccess: simplify control register updates".
      
      The switch_mm function is not called if the next process is a kernel
      thread without an attached mm or is a nop if the mm does not change.
      But CR1 still needs to be loaded with the kernel ASCE in case the
      code returns to a uaccess function that uses the secondary space mode.
      
      In addition move the set_fs call from finish_arch_switch to
      finish_arch_post_lock_switch and then remove finish_arch_switch.
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      f8b13505
    • Michael Veigel's avatar
      s390/ap_bus: Make modules parameters visible in sysfs · c1a42f49
      Michael Veigel authored
      Change the visibility of the module parameters ap_domain_index and
      ap_thread_flag for the owner and the members of the owners group in
      sysfs.
      
      Previously the parameters where invisible due to a value of zero
      as permissions parameter in the module_param_named macro.
      Signed-off-by: default avatarMichael Veigel <veigel@de.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      c1a42f49
    • Linus Torvalds's avatar
      Merge tag 'for-f2fs-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · 64b2d1fb
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, there is no special interesting feature, but we've
        investigated a couple of tuning points with respect to the I/O flow.
        Several major bug fixes and a bunch of clean-ups also have been made.
      
        This patch-set includes the following major enhancement patches:
         - enhance wait_on_page_writeback
         - support SEEK_DATA and SEEK_HOLE
         - enhance readahead flows
         - enhance IO flushes
         - support fiemap
         - add some tracepoints
      
        The other bug fixes are as follows:
         - fix to support a large volume > 2TB correctly
         - recovery bug fix wrt fallocated space
         - fix recursive lock on xattr operations
         - fix some cases on the remount flow
      
        And, there are a bunch of cleanups"
      
      * tag 'for-f2fs-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (52 commits)
        f2fs: support f2fs_fiemap
        f2fs: avoid not to call remove_dirty_inode
        f2fs: recover fallocated space
        f2fs: fix to recover data written by dio
        f2fs: large volume support
        f2fs: avoid crash when trace f2fs_submit_page_mbio event in ra_sum_pages
        f2fs: avoid overflow when large directory feathure is enabled
        f2fs: fix recursive lock by f2fs_setxattr
        MAINTAINERS: add a co-maintainer from samsung for F2FS
        MAINTAINERS: change the email address for f2fs
        f2fs: use inode_init_owner() to simplify codes
        f2fs: avoid to use slab memory in f2fs_issue_flush for efficiency
        f2fs: add a tracepoint for f2fs_read_data_page
        f2fs: add a tracepoint for f2fs_write_{meta,node,data}_pages
        f2fs: add a tracepoint for f2fs_write_{meta,node,data}_page
        f2fs: add a tracepoint for f2fs_write_end
        f2fs: add a tracepoint for f2fs_write_begin
        f2fs: fix checkpatch warning
        f2fs: deactivate inode page if the inode is evicted
        f2fs: decrease the lock granularity during write_begin
        ...
      64b2d1fb
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · b1cce803
      Linus Torvalds authored
      Pull CIFS fixes from Steve French.
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Fix memory leaks in SMB2_open
        cifs: ensure that vol->username is not NULL before running strlen on it
        Clarify SMB2/SMB3 create context and add missing ones
        Do not send ClientGUID on SMB2.02 dialect
        cifs: Set client guid on per connection basis
        fs/cifs/netmisc.c: convert printk to pr_foo()
        fs/cifs/cifs.c: replace seq_printf by seq_puts
        Update cifs version number to 2.03
        fs: cifs: new helper: file_inode(file)
        cifs: fix potential races in cifs_revalidate_mapping
        cifs: new helper function: cifs_revalidate_mapping
        cifs: convert booleans in cifsInodeInfo to a flags field
        cifs: fix cifs_uniqueid_to_ino_t not to ever return 0
      b1cce803
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 1c54fc1e
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This patch consists of the usual driver updates (qla2xxx, qla4xxx,
        lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to
        maintained status of a long neglected driver for older hardware.  In
        addition there are a lot of minor fixes and cleanups and some more
        updates to make scsi mq ready"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits)
        include/scsi/osd_protocol.h: remove unnecessary __constant
        mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
        Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed"
        mptfusion: fix msgContext in mptctl_hp_hostinfo
        acornscsi: remove linked command support
        scsi/NCR5380: dprintk macro
        fusion: Remove use of DEF_SCSI_QCMD
        fusion: Add free msg frames to the head, not tail of list
        mpt2sas: Add free smids to the head, not tail of list
        mpt2sas: Remove use of DEF_SCSI_QCMD
        mpt2sas: Remove uses of serial_number
        mpt3sas: Remove use of DEF_SCSI_QCMD
        mpt3sas: Remove uses of serial_number
        qla2xxx: Use kmemdup instead of kmalloc + memcpy
        qla4xxx: Use kmemdup instead of kmalloc + memcpy
        qla2xxx: fix incorrect debug printk
        be2iscsi: Bump the driver version
        be2iscsi: Fix processing cqe for cxn whose endpoint is freed
        be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed
        be2iscsi: Fix memory corruption in MBX path
        ...
      1c54fc1e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · f4f9b8fc
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "A big update to the Atmel touchscreen driver, devm support for polled
        input devices, several drivers have been converted to using managed
        resources, and assorted driver fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)
        Input: synaptics - fix resolution for manually provided min/max
        Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version
        Input: max8997_haptic - add error handling for regulator and pwm
        Input: elantech - don't set bit 1 of reg_10 when the no_hw_res quirk is set
        Input: elantech - deal with clickpads reporting right button events
        Input: edt-ft5x06 - fix an i2c write for M09 support
        Input: omap-keypad - remove platform data support
        ARM: OMAP2+: remove unused omap4-keypad file and code
        Input: ab8500-ponkey - switch to using managed resources
        Input: max8925_onkey - switch to using managed resources
        Input: 88pm860x-ts - switch to using managed resources
        Input: 88pm860x_onkey - switch to using managed resources
        Input: intel-mid-touch - switch to using managed resources
        Input: wacom - process outbound for newer Cintiqs
        Input: wacom - set stylus_in_proximity when pen is in range
        DTS: ARM: OMAP3-N900: Add tsc2005 support
        Input: tsc2005 - add DT support
        Input: add common DT binding for touchscreens
        Input: jornada680_kbd - switch top using managed resources
        Input: adp5520-keys - switch to using managed resources
        ...
      f4f9b8fc
    • Linus Torvalds's avatar
      Merge tag 'fbdev-omap-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 9894e6d9
      Linus Torvalds authored
      Pull OMAP DT fbdev updates from Tomi Valkeinen:
       "Here are display related device tree data changes for OMAP.  They are
        based on an already merged branch to satisfy the dependencies for the
        dts file changes.
      
        Add OMAP DT data:
         - omap5 display subsystem
         - display data for omap5 uEVM board
         - am43xx display subsystem
         - display data for am43xx ePOS and GP boards (LCD only)
         - display data for GTA04 board
         - display data for overo board
         - display data for duovero-parlor board
         - display data for omap3 evm and ldp boards"
      
      * tag 'fbdev-omap-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        ARM: omap5.dtsi: Add audio related parameters to hdmi node
        ARM: omap4.dtsi: Add audio related parametes to hdmi node
        ARM: dts: duovero-parlor: Add HDMI output
        ARM: dts: overo: Add support for 3.5'' LCD output
        ARM: dts: overo: Add support for 4.3'' LCD output
        ARM: dts: overo: Add support for DVI output
        ARM: dts: Add LCD panel sharp ls037v7dw01 support for omap3-evm and ldp
        ARM: dts: omap3-gta04: Add display support
        ARM: dts: omap5-uevm.dts: add display nodes
        ARM: dts: omap5-uevm.dts: add tca6424a
        ARM: dts: omap5.dtsi: add DSS nodes
        ARM: dts: am43x-epos-evm: add LCD data
        ARM: dts: am437x-gp-evm: add LCD data
        ARM: dts: am4372.dtsi: add DSS information
      9894e6d9
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 82abb273
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       - three fixes for 3.15 that didn't make it in time
       - limited Octeon 3 support.
       - paravirtualization support
       - improvment to platform support for Netlogix SOCs.
       - add support for powering down the Malta eval board in software
       - add many instructions to the in-kernel microassembler.
       - add support for the BPF JIT.
       - minor cleanups of the BCM47xx code.
       - large cleanup of math emu code resulting in significant code size
         reduction, better readability of the code and more accurate
         emulation.
       - improvments to the MIPS CPS code.
       - support C3 power status for the R4k count/compare clock device.
       - improvments to the GIO support for older SGI workstations.
       - increase number of supported CPUs to 256; this can be reached on
         certain embedded multithreaded ccNUMA configurations.
       - various small cleanups, updates and fixes
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (173 commits)
        MIPS: IP22/IP28: Improve GIO support
        MIPS: Octeon: Add twsi interrupt initialization for OCTEON 3XXX, 5XXX, 63XX
        DEC: Document the R4k MB ASIC mini interrupt controller
        DEC: Add self as the maintainer
        MIPS: Add microMIPS MSA support.
        MIPS: Replace calls to obsolete strict_strto call with kstrto* equivalents.
        MIPS: Replace obsolete strict_strto call with kstrto
        MIPS: BFP: Simplify code slightly.
        MIPS: Call find_vma with the mmap_sem held
        MIPS: Fix 'write_msa_##' inline macro.
        MIPS: Fix MSA toolchain support detection.
        mips: Update the email address of Geert Uytterhoeven
        MIPS: Add minimal defconfig for mips_paravirt
        MIPS: Enable build for new system 'paravirt'
        MIPS: paravirt: Add pci controller for virtio
        MIPS: Add code for new system 'paravirt'
        MIPS: Add functions for hypervisor call
        MIPS: OCTEON: Add OCTEON3 to __get_cpu_type
        MIPS: Add function get_ebase_cpunum
        MIPS: Add minimal support for OCTEON3 to c-r4k.c
        ...
      82abb273
    • Linus Torvalds's avatar
      Merge tag 'arc-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 9b651cc2
      Linus Torvalds authored
      Pull ARC updates from Vineet Gupta:
       "Nothing too exciting here, just minor fixes/cleanup.  Only noteworthy
        ones are:
      
         - Moving cache disabling to early boot
         - ARC UART enabled only if earlyprintk setup in cmdline"
      
      * tag 'arc-v3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARC: Disable caches in early boot if so configured
        ARC: [arcfpga] Early ARC UART to be only activated by cmdline
        ARC: [arcfpga] Get rid of legacy BVCI latency unit support
        ARC: remove duplicate header exports
        ARC: arc_local_timer_setup() need not pass own cpu id
        ARC: Fixed spelling errors within comments
        ARC: make start_thread() out-of-line
        ARC: fix mmuv2 warning
        ARC: [SMP] ISS SMP extension bitrot
      9b651cc2
  4. 09 Jun, 2014 6 commits
    • Linus Torvalds's avatar
      Merge tag 'trace-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 214b9313
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "Lots of tweaks, small fixes, optimizations, and some helper functions
        to help out the rest of the kernel to ease their use of trace events.
      
        The big change for this release is the allowing of other tracers, such
        as the latency tracers, to be used in the trace instances and allow
        for function or function graph tracing to be in the top level
        simultaneously"
      
      * tag 'trace-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (44 commits)
        tracing: Fix memory leak on instance deletion
        tracing: Fix leak of ring buffer data when new instances creation fails
        tracing/kprobes: Avoid self tests if tracing is disabled on boot up
        tracing: Return error if ftrace_trace_arrays list is empty
        tracing: Only calculate stats of tracepoint benchmarks for 2^32 times
        tracing: Convert stddev into u64 in tracepoint benchmark
        tracing: Introduce saved_cmdlines_size file
        tracing: Add __get_dynamic_array_len() macro for trace events
        tracing: Remove unused variable in trace_benchmark
        tracing: Eliminate double free on failure of allocation on boot up
        ftrace/x86: Call text_ip_addr() instead of the duplicated code
        tracing: Print max callstack on stacktrace bug
        tracing: Move locking of trace_cmdline_lock into start/stop seq calls
        tracing: Try again for saved cmdline if failed due to locking
        tracing: Have saved_cmdlines use the seq_read infrastructure
        tracing: Add tracepoint benchmark tracepoint
        tracing: Print nasty banner when trace_printk() is in use
        tracing: Add funcgraph_tail option to print function name after closing braces
        tracing: Eliminate duplicate TRACE_GRAPH_PRINT_xx defines
        tracing: Add __bitmask() macro to trace events to cpumasks and other bitmasks
        ...
      214b9313
    • Linus Torvalds's avatar
      Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 14208b0e
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "A lot of activities on cgroup side.  Heavy restructuring including
        locking simplification took place to improve the code base and enable
        implementation of the unified hierarchy, which currently exists behind
        a __DEVEL__ mount option.  The core support is mostly complete but
        individual controllers need further work.  To explain the design and
        rationales of the the unified hierarchy
      
              Documentation/cgroups/unified-hierarchy.txt
      
        is added.
      
        Another notable change is css (cgroup_subsys_state - what each
        controller uses to identify and interact with a cgroup) iteration
        update.  This is part of continuing updates on css object lifetime and
        visibility.  cgroup started with reference count draining on removal
        way back and is now reaching a point where csses behave and are
        iterated like normal refcnted objects albeit with some complexities to
        allow distinguishing the state where they're being deleted.  The css
        iteration update isn't taken advantage of yet but is planned to be
        used to simplify memcg significantly"
      
      * 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (77 commits)
        cgroup: disallow disabled controllers on the default hierarchy
        cgroup: don't destroy the default root
        cgroup: disallow debug controller on the default hierarchy
        cgroup: clean up MAINTAINERS entries
        cgroup: implement css_tryget()
        device_cgroup: use css_has_online_children() instead of has_children()
        cgroup: convert cgroup_has_live_children() into css_has_online_children()
        cgroup: use CSS_ONLINE instead of CGRP_DEAD
        cgroup: iterate cgroup_subsys_states directly
        cgroup: introduce CSS_RELEASED and reduce css iteration fallback window
        cgroup: move cgroup->serial_nr into cgroup_subsys_state
        cgroup: link all cgroup_subsys_states in their sibling lists
        cgroup: move cgroup->sibling and ->children into cgroup_subsys_state
        cgroup: remove cgroup->parent
        device_cgroup: remove direct access to cgroup->children
        memcg: update memcg_has_children() to use css_next_child()
        memcg: remove tasks/children test from mem_cgroup_force_empty()
        cgroup: remove css_parent()
        cgroup: skip refcnting on normal root csses and cgrp_dfl_root self css
        cgroup: use cgroup->self.refcnt for cgroup refcnting
        ...
      14208b0e
    • Linus Torvalds's avatar
      Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 6ea4fa70
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Nothing too interesting - another ahci platform driver variant,
        additional controller support, minor fixes and cleanups"
      
      * 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci: Add Device ID for HighPoint RocketRaid 642L
        ata: ep93xx: use dmaengine_prep_slave_sg api instead of internal callback
        ahci: add PCI ID for Marvell 88SE91A0 SATA Controller
        sata_fsl: remove check for CONFIG_MPC8315_DS
        ahci: add support for Hisilicon sata
        libahci_platform: add host_flags parameter in ahci_platform_init_host()
        ata: ahci: append new hflag AHCI_HFLAG_NO_FBS
        ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
        ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces
        Documentation: dt-bindings: reformat and order list of ahci-platform compatibles
        libata-sff: remove dead code
        ata: SATL compliance for Inquiry Product Revision
        pata_octeon_cf: use devm_kzalloc() to allocate cf_port
      6ea4fa70
    • Linus Torvalds's avatar
      Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · da85d191
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Lai simplified worker destruction path and internal workqueue locking
        and there are some other minor changes.
      
        Except for the removal of some long-deprecated interfaces which
        haven't had any in-kernel user for quite a while, there shouldn't be
        any difference to workqueue users"
      
      * 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info
        workqueue: remove the confusing POOL_FREEZING
        workqueue: rename first_worker() to first_idle_worker()
        workqueue: remove unused work_clear_pending()
        workqueue: remove unused WORK_CPU_END
        workqueue: declare system_highpri_wq
        workqueue: use generic attach/detach routine for rescuers
        workqueue: separate pool-attaching code out from create_worker()
        workqueue: rename manager_mutex to attach_mutex
        workqueue: narrow the protection range of manager_mutex
        workqueue: convert worker_idr to worker_ida
        workqueue: separate iteration role from worker_idr
        workqueue: destroy worker directly in the idle timeout handler
        workqueue: async worker destruction
        workqueue: destroy_worker() should destroy idle workers only
        workqueue: use manager lock only to protect worker_idr
        workqueue: Remove deprecated system_nrt[_freezable]_wq
        workqueue: Remove deprecated flush[_delayed]_work_sync()
        kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info
        workqueue: simplify wq_update_unbound_numa() by jumping to use_dfl_pwq if the target cpumask equals wq's
      da85d191
    • Linus Torvalds's avatar
      Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 68a29ef2
      Linus Torvalds authored
      Pull percpu updates from Tejun Heo:
       "Nothing too exciting.  percpu_ref is going through some interface
        changes and getting new features with more changes in the pipeline but
        given its young age and few users, it's very low impact"
      
      * 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu-refcount: implement percpu_ref_tryget()
        percpu-refcount: rename percpu_ref_tryget() to percpu_ref_tryget_live()
        percpu: Replace __get_cpu_var with this_cpu_ptr
      68a29ef2
    • James Bottomley's avatar
  5. 08 Jun, 2014 16 commits