fixes and optimizations for fs
cpu-hotplug: Add the function 'cpu_hotplug_inprogress'

Allows a caller to detect whether a cpu hotplug operation
is in progress. This is useful for optimizing code paths
based on this condition.

Signed-off-by: Maya Spivak <mspivak@codeaurora.org>
(cherry picked from commit 9f6cabec8fd0d0cb95084d18ee7cddbcf922ac2d)

Change-Id: I2eae7fbb819e3a776dba77a061eb89f30ac3176d
Signed-off-by: Swetha Basineni <sbasin@codeaurora.org>
printk: Don't allow cpu to get console lock during hotplugging

The flush of the console takes unnecessary time during the cpu
hotplug up operation.  It can delay the rcu synchronize_sched
operation, which in turn delays the hotplug operation. The flush
delays rcu synchronize_sched during scheduling domain creation
by up to 100 ms by interrupting the move to a quiescent state.
This change delays the flush of the console to later in the
notification chain of cpu_online. At the point in the cpu_up
operation where the flush now occurs, other tasks can already
be scheduled on the cpu that just came up.

Signed-off-by: Maya Spivak <mspivak@codeaurora.org>
(cherry picked from commit c7108258d7e44b56842f8215e31d7310f86febaa)

Change-Id: I2986071a5b05760e05d86da2f33ea2a9fe882469
Signed-off-by: Swetha Basineni <sbasin@codeaurora.org>
genirq: fix handle_nested_irq for lazy disable

    When lazy disabling is implemented and an interrupt is disabled the
    genirq code ends up marking it as IRQ_DISABLED in the descriptor.
    The interrupt stays enabled in the controller.  If the interrupt
    fires after disabling, the flow handlers namely handle_level_irq and
    handle_edge_irq mask the interrupt in the controller.

    This is not the case with handle_nested_irq. The interrupt stays enabled in
    the controller and if it were a level interrupt it keeps firing only to be
    ignored by handle_nested_irq.

    Update handle_nested_irq to mask such an interrupt.

    CRs-Fixed: 300931
    Change-Id: Iea5eee19f9b20aed40978fa124308f8cab6ac46f
    Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
once again more updates to net sources and related
s3cfb: add display boot progress

Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	drivers/video/samsung/s3cfb.c
Hz to 300 and user Hz to 150
Signed-off-by: scotthartbti <scott@ubuntu.com>
Fix some compile warnings. Includes:

tracing: Remove boot tracer (Américo Wang)
tracing: Remove kmemtrace ftrace plugin (Li Zefan)
Fix warning: 'calltime.tv64' may be used uninitialized in this function in init/main.c (Kevin Winchester)
Mark do_one_initcall* as __init_or_module (Kevin Winchester)
netfilter: add more values to enum ip_conntrack_info (Eric Dumazet)
netfilter: ctnetlink: fix ctnetlink_parse_tuple() warning (Patrick McHardy)

Signed-off-by: scotthartbti <scott@ubuntu.com>

Conflicts:
	include/linux/netfilter/nf_conntrack_common.h
	init/main.c
set vfs_cache_pressure to 50 to play it safe
Signed-off-by: scotthartbti <scott@ubuntu.com>