~ubuntu-kernel/ubuntu/+source/linux/+git/trusty:sync-U

Last commit made on 2014-06-02
Get this branch:
git clone -b sync-U https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/trusty
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

ca5e8b2... by Dave Chiluk

UBUNTU: [Config] Enable CONFIG_IP_VS_IPV6=y

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

IPv6 virtual servers are no longer able to be used. This affects both ipvs,
and keepalived. This is a regression caused by c28f49fd37b during the
ubuntu-raring development cycle. Re-enabling CONFIG_IP_VS_IPV6=y config setting
resolves this issue.

Signed-off-by: Dave Chiluk <email address hidden>
Acked-by: Brad Figg <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

8f2df89... by Kamal Mostafa

UBUNTU: [Config] add debian/gbp.conf

Defines tag format for 'git buildpackage'.

More details about why I want to add this two-line config file
"debian/gbp.conf" to all the Ubuntu kernel branches:

                [buildpackage]
                debian-tag = Ubuntu-%(version)s

About git-buildpackage
----------------------

There exists a program called 'git-buildpackage'[0] (in an apt-get
package of the same name) which can drive the process of constructing a
Debian package from a git branch, including various pre-validation
steps, running debuild, and automatically adding a correct git tag
constructed from the version number in the changelog.

I have been using[1] git-buildpackage to construct the kernel packages
for upload (and actually a short wrapper script which implements some of
our additional Ubuntu-kernel-specific process steps).

Advantages of using git-buildpackage to do the package construction:

 - Eliminates the very common human-error/typo mistakes that we
frequently make (incorrect git tags like forgetting to insert "-lts",
and generally inconsistent tag syntax).

 - Makes the whole source package build process more consistent, and
allows for us to move towards even more consistency in the future.
Later, we might consider enabling more of git-buildpackages optional
validation steps, or even construct a package-build-bot.

 - Its just a lot easier than trying to follow our complex wiki
instructions, which are mostly valid, but have lots of corner cases and
exceptions -- the places where we often make mistakes.

The two-line gbp.conf file
--------------------------

The purpose of the two-line gbp.conf file is simply to configure
git-buildpackage to create tags with our preferred git tag scheme, on a
per-branch basis. Specifically, the config file to be checked into the
main Ubuntu kernel branches will configure it to create tags of the
format:

 Ubuntu-{versionextractedfromchangelog}

The next step will be that I will want to add a (different) two-line
gbp.conf file to all of our LTS branches, to configure them to be tagged
with:

 Ubuntu-lts-{versionextractedfromchangelog}

Side note: Andy and I have experimented with additional debian/rules
bits that could use the same gbp.conf file in steps like "fdr
insertchanges". It could print out the correct git tag command for you
to cut-n-paste, as some of our other construction scripts do.

So this means that we now must use git-buildpackage???
------------------------------------------------------

No. See [1].

The presence of the gbp.conf file will affect nothing at all, unless you
choose[1] to use git-buildpackage.

You are welcome to keep using your preferred method of constructing
packages and git tagging, if that's what you prefer[1][1][1].

Acked-by: Andy Whitcroft <email address hidden>
Signed-off-by: Kamal Mostafa <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

02acf7b... by Tim Gardner

UBUNTU: [Config] CONFIG_POWERNV_CPUFREQ=y for ppc64el

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

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>
Acked-by: Brad Figg <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

820f073... by Luis Henriques

UBUNTU: Ubuntu-3.13.0-29.52

Signed-off-by: Luis Henriques <email address hidden>

08cc3db... by Tanmay Inamdar

UBUNTU: SAUCE: Add MSI/MSI-X driver for APM PCI bus

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

Signed-off-by: Tanmay Inamdar <email address hidden>
Signed-off-by: Ike Panhc <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>
Signed-off-by: Brad Figg <email address hidden>

3a95d85... by Luis Henriques

UBUNTU: [Config] Normalize AHCI configs on powerpc/ppc64el with the rest of the architectures

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

Signed-off-by: Adam Conrad <adconrad@0c3.net>
Signed-off-by: Luis Henriques <email address hidden>
Signed-off-by: Brad Figg <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

d607364... by Tim Gardner

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <email address hidden>

286a353... by Luis Henriques

UBUNTU: Ubuntu-3.13.0-28.51

Signed-off-by: Luis Henriques <email address hidden>

6b2ed52... by Edward Lin

ACPI: blacklist win8 OSI for Dell Inspiron 7737

BugLink: https://bugs.launchpad.net/bugs/1288161

With win8 capabiltiy, the machine will boot itself immediately after
shutdown command has executed.

Work around this issue by disabling win8 capcability. This workaround
also makes wireless hotkey work.

Signed-off-by: Edward Lin <email address hidden>
Signed-off-by: Rafael J. Wysocki <email address hidden>
(cherry picked from commit b753631b3576bf343151a82513c5d56fcda1e24f)
Acked-by: Andy Whitcroft <email address hidden>
Acked-by: Colin King <email address hidden>
Signed-off-by: Edward Lin <email address hidden>

f6b0c29... by Luis Henriques

UBUNTU: [Config] updateconfigs: CONFIG_HP_WIRELESS=m

Ignore: yes

Signed-off-by: Luis Henriques <email address hidden>