UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: [Config] enforce CONFIG_DEBUG_INFO

Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: SAUCE: intel_pstate -- toggle default to disable

The intel_pstate driver is most unhappy on 3.9 and 3.10, for now disable
it, but do so in such a way we can turn it on for testing on the kernel
command line.

It seems likely we are also expected to have a userspace component for
fan control is we are using pstate_idle.  This seems suboptimal:

    https://01.org/linux-thermal-daemon

BugLink: http://bugs.launchpad.net/bugs/1188647
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: d-i: Add qlcnic to nic-modules

BugLink: http://bugs.launchpad.net/bugs/1196597

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: [Debian] Prepare to build using arch specific compiler

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: Build armhf using gcc-4.7

gcc-4.8 does not produce bootable kernels.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users

This fixes a bug in the current apparmor3 alpha2 sync, where none root
users can not query whether the apparmor module is enabled. It has been
incorporated into the apparmor dev tree and will be integrated as part
of the next sync, at which point this patch will be reverted.

BugLink: http://bugs.launchpad.net/bugs/1199912

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: [Packaging] add accellerators for binary-udeb

Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: SAUCE: ext4: fix ext4_get_group_number() at cluster boundaries

upstreamed

Commit bd86298e60b8 introduced a new optimisation for callers who needed
only the ext4 group number and not the block offset within.  It hand
calculates the group number from the block in the common case, falling
back to the original group offset implementation otherwise.

Clearly the group number returned by this speed optimised block to group
mapping in ext4_get_group_number() must return the same group that
ext4_get_group_no_and_offset() otherwise we get group missmatches when
compared with callers needing the offset.  Currently where the first
block is non-zero we will return differing blocks near cluster boundaries.

This missmatch was uncovered by a multi-lvm test case which builds
systems with a large number of separate filesystems.  It was reliably
triggering the BUG below in ext4_mb_release_group_pa() when trying to
clean up preallocations:

    static noinline_for_stack int ext4_mb_release_group_pa(
	    struct ext4_buddy *e4b, struct ext4_prealloc_space *pa)
    {
	[...]
	    BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
	[...]
    }

This was occuring because the caller uses ext4_get_group_number() to obtain
the buddy information and when that was compared against the group number
locally calculated via ext4_get_group_no_and_offset() from the same block
number it was inconsistant tripping the above BUG.

I pulled these two routines out and fed them the filesystem parameters
for the filesystem triggering the OOPS and a range of block numbers.
Comparing the results I found the following inconsistancies at cluster
boundaries:

    1 != 0 at 8191
    1 != 0 at 8192
    2 != 1 at 16383
    2 != 1 at 16384
    3 != 2 at 24575
    3 != 2 at 24576

We are calculating incorrect block numbers within s_first_data_block blocks
of the boundary (1 block in my failing example).  Fix up the calculations
to match.

BugLink: http://bugs.launchpad.net/bugs/1195710
Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: Ubuntu-3.10.0-2.11

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: PPC-Ubuntu-3.10.0-0.0

Ignore: yes
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: powerpc/pamu: Add driver to initialize PAMU tables

Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Vakul Garg <Vakul@freescale.com>
Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: fsl_qbman: Add drivers for Freescale DPAA Qman & Bman

Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com>
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: fsl_pme2: Add support for DPAA PME

Signed-off-by: Geoff Thorpe <Geoff.Thorpe@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Jeffrey Ladouceur <Jeffrey.Ladouceur@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: fmd: FMD14 integration

FMD14 integration:
    - integration of NetCommSW GA 4.3 LLD
    - FMD wrapper cleanup
    - FMD dynamic resource allocation algorithm
    - Changes to support IXXAT IEEE 1588 stack v1.03
    - Support P3060 FMan

Signed-off-by: Shlomi Gridish <gridish@freescale.com>
Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Ioana Radulescu <ruxandra.radulescu@freescale.com>
Signed-off-by: Sorin Pistirica <sorin.pistirica@freescale.com>
Signed-off-by: Bogdan Hamciuc <bogdan.hamciuc@freescale.com>
Signed-off-by: Stefan Szabo <stefan.szabo@freescale.com>
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: net: Add support for handling queueing in hardware

The QDisc code does a bunch of locking which is unnecessary if
you have hardware which handles all of the queueing.  Add
support for this, and skip over all of the queueing code if
the feature is enabled on a given device. This code breaks
QDisc support on dpaa_eth, and also coopts the FCOE feature
bit.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: net/flow: remove sleeping and deferral mechanism from flow_cache_flush

flow_cache_flush must not sleep as it can be called in atomic context;
removed the schedule_work as the deferred processing lead to the flow
cache gc never being actually run under heavy network load

Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: of_mdio: Add of_phy_attach function

of_phy_connect is useful for most systems, but some drivers will want
finer-grained control over their PHYs, and won't want to use the
PHY Lib state machine or interrupt handlers.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: phylib: Minimum hack to get the generic 10G PHY driver to work with 10G "fixed-link"s

Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>
UBUNTU: SAUCE: phy: Add support for VSC8234

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Ben Collins <ben.c@servergy.com>