Commits · d1ad35891d39522fbf9e8a221bd7b9cca1aa8c13 · nexedi / linux

29 Feb, 2016 39 commits

UBUNTU: SAUCE: leds: lp55xx -- do not force use of the fallback loader · d1ad3589

Andy Whitcroft authored Oct 01, 2015

The lp55xx driver uses the firmware loader to get its firmware. Do not
force us to use the fallback the kernel one should be sufficient.
Signed-off-by: Andy Whitcroft <apw@canonical.com>

d1ad3589

UBUNTU: [Config] apply Device Drivers >> Generic Driver Options >> Userspace... · 9d344a91

Andy Whitcroft authored Oct 01, 2015

UBUNTU: [Config] apply Device Drivers >> Generic Driver Options >> Userspace firmware loading support
Signed-off-by: Andy Whitcroft <apw@canonical.com>

9d344a91

UBUNTU: [Config] apply File systems >> Miscellaneous filesystems >> SquashFS... · 74fc3827

Andy Whitcroft authored Oct 01, 2015

UBUNTU: [Config] apply File systems >> Miscellaneous filesystems >> SquashFS 4.0 - Squashed file system support
Signed-off-by: Andy Whitcroft <apw@canonical.com>

74fc3827

UBUNTU: [Config] apply Device Drivers >> LED Support >> LED Class Support · 4c2d5b4e
Andy Whitcroft authored Oct 01, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
4c2d5b4e
UBUNTU: [Config] annotations -- s390x -- configuration review updates · 7335578a
Andy Whitcroft authored Sep 25, 2015
```
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
7335578a
UBUNTU: [Config] annotations -- s390x -- update to incorporate s390x · 59dfb26a
Andy Whitcroft authored Sep 30, 2015
```
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
59dfb26a
UBUNTU: [Config] annotations -- enable s390 kernel arch · 36fb3bc5
Andy Whitcroft authored Sep 30, 2015
```
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
36fb3bc5

UBUNTU: [Config] annotations -- switch to V2 format · 6f29add9

Andy Whitcroft authored Sep 28, 2015

Simplify the annotation entries now we no longer have the separate
value field.

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

6f29add9

UBUNTU: [Config] annotations -- update to incorporate s390x · e53a439e
Andy Whitcroft authored Sep 23, 2015
```
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
e53a439e
UBUNTU: [Config] annotations -- reorder annotations to v4.2 · 4110cf6b
Andy Whitcroft authored Sep 22, 2015
```
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
4110cf6b
UBUNTU: [Config] s390x -- d-i module exclusions · 59034a9d
Andy Whitcroft authored Sep 08, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
59034a9d
UBUNTU: [Config] s390x -- produce linux-image · c3de1384
Andy Whitcroft authored Sep 04, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
c3de1384

UBUNTU: [Config] s390x -- initial configuration update · 162e3597

Andy Whitcroft authored Sep 09, 2015

Initial updates to get past the annotation checks.

    CONFIG_BLK_DEV_DM=y
    CONFIG_BLK_DEV_RAM_SIZE=65536
    CONFIG_FAT_FS=y
    CONFIG_LSM_MMAP_MIN_ADDR=0
    CONFIG_NETLABEL=y
    CONFIG_SECURITY_SMACK=y
    CONFIG_VFAT_FS=y
    CONFIG_CRASH_DUMP=y
    CONFIG_ECRYPT_FS=y
    CONFIG_CRYPTO_ECB=y
    CONFIG_CRYPTO_CBC=y
    CONFIG_ENCRYPTED_KEYS=y
    CONFIG_DEFAULT_SECURITY_APPARMOR=y
    # CONFIG_OF is not set
Signed-off-by: Andy Whitcroft <apw@canonical.com>

162e3597

UBUNTU: [Config] s390x -- add initial binary image · 5e5941d9
Andy Whitcroft authored Sep 16, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
5e5941d9
UBUNTU: [Config] s390x -- initial configuration · c6797c9b
Andy Whitcroft authored Sep 03, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
c6797c9b

UBUNTU: [Debian] s390x -- add architecture to kernelconfig · 0e1600eb

Andy Whitcroft authored Aug 24, 2015

BugLink: http://bugs.launchpad.net/bugs/1488653Signed-off-by: Andy Whitcroft <apw@canonical.com>
(cherry picked from commit 019499429e25c5845a9ff9019819dc91010374fd)
Signed-off-by: Andy Whitcroft <apw@canonical.com>

0e1600eb

UBUNTU: [Debian] config-check -- handle V2 annotations format · cb64ba1c
Andy Whitcroft authored Sep 28, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
cb64ba1c
UBUNTU: [Debian] config-check -- accumulate multi-line annotations correctly · cd78b65a
Andy Whitcroft authored Sep 25, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
cd78b65a

UBUNTU: [Debian] module-inclusion -- add dependency inclusion for a list · 56848edb

Andy Whitcroft authored Mar 26, 2015

When adding a module via an inclusion list, add any specific dependencies
it lists.
Signed-off-by: Andy Whitcroft <apw@canonical.com>

56848edb

UBUNTU: [Debian] config-check -- improve syntax diagnostics · dcbb8228
Andy Whitcroft authored Sep 07, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
dcbb8228
UBUNTU: [Config] enable CONFIG_CC_STACKPROTECTOR_STRONG=y · b5a91fa2
Andy Whitcroft authored Nov 06, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
b5a91fa2

UBUNTU: [Config] re-enable OSS support and blacklist · 8d30faf4

Andy Whitcroft authored Mar 23, 2015

We are seeing requests for the OSS support to be reenabled, it seems that
it is needed for old games. We do not want it loading by default so use
the new blacklist support to suppress autoloading. This should bring us
into line with other distros where manual loading is required.

BugLink: http://bugs.launchpad.net/bugs/1434842Signed-off-by: Andy Whitcroft <apw@canonical.com>

8d30faf4

UBUNTU: [Config] CONFIG_AUFS_EXPORT=y · ef491ef7

Tim Gardner authored Nov 06, 2015

BugLink: http://bugs.launchpad.net/bugs/1121699Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

ef491ef7

UBUNTU: Start new release · a3fc9a8b
Tim Gardner authored Nov 06, 2015
```
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
a3fc9a8b
UBUNTU: Ubuntu-4.3.0-0.7 · 1f53f5e3
Tim Gardner authored Nov 05, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
1f53f5e3

Revert "UBUNTU: Bypass spl/zfs config" · bf05bcf1

Tim Gardner authored Nov 05, 2015

This reverts commit 2f3a4219e605b5ba4d83f3786abb9dac7148fae0.

Seems like this causes symbol resolution problems.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

bf05bcf1

UBUNTU: [Config] Enable ZFS for powerpc64-smp · a32f8135
Tim Gardner authored Nov 04, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
a32f8135
UBUNTU: Ubuntu-4.3.0-0.6 · 72fbc27b
Tim Gardner authored Nov 03, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
72fbc27b
UBUNTU: [Config] Enabled AUFS · 5bba520b
Tim Gardner authored Nov 03, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
5bba520b

UBUNTU: SAUCE: (no-up) apparmor: fix mount not handling disconnected paths · 1e7328d5

John Johansen authored Oct 01, 2015

upstream: No. This is a fix to an out of tree apparmor 3 patch

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

Mount rules are not honoring the attach_disconnected flag, causing
apparmor to deny mounts for lxc and docker even when the appropriate
rule exists in the profile.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

1e7328d5

UBUNTU: SAUCE: (no-up): apparmor: fix mediation of fs unix sockets · c5e6ac51

John Johansen authored Mar 05, 2015

Fix for out of tree AppArmor 3 patches.

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

Fix 2 issues around the mediation of file base unix domain sockets.
* Add auditing of deleted/shutdown file based unix domains sockets so
  that the denials can be correctly evalated.
* fix the permission request mask so that it is correct for the
  deleted/shutdown socket case.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

c5e6ac51

UBUNTU: apparmor -- follow change to this_cpu_ptr · 53f139d6

Andy Whitcroft authored Jan 02, 2015

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

53f139d6

UBUNTU: SAUCE: (no-up) fix: bad unix_addr_fs macro · 14bc1e20

John Johansen authored Oct 15, 2014

the unix_addr_fs macro should not check for a leading /, instead it
should be checking for the addr not being an abstract socket addr
(leading \0)

BugLink: http://bugs.launchpad.net/bugs/1390223Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

14bc1e20

UBUNTU: SAUCE: Revert: fix: only allow a single threaded process to ... · 9b306795

John Johansen authored Oct 06, 2014

Revert the enforcement of only a single thread tasks using change_onexec.
While this change prevents applications from using change_onexec in
a potentially broken way (it can be done right but the application code
using it needs to be carefully audited), it does restrict historically
allowed behavior. Specifically this change is causes docker to fail, and
needs to be reverted until it can be selectively applied with policy
changes.

BugLink: http://bugs.launchpad.net/bugs/1371310Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

9b306795

UBUNTU: SAUCE: (no-up) apparmor: Sync to apparmor3 - RC1 snapshot · 6bfc18ae

John Johansen authored Jun 08, 2014

This is a sync and squash to the apparmor 3 RC 1 development snapshot.
The set of patches in this squash are available at the apparmor-3.RC1
tag in git://kernel.ubuntu.com/jj/ubuntu-utopic.git.

This cleans up several functions over the alpha6 sync, and includes
multiple bug fixes. In addition it picks up
- new network mediation
- fine grained mediation of all unix socket types

BugLink: http://bugs.launchpad.net/bugs/1362199Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

6bfc18ae

UBUNTU: SAUCE: (no-up) apparmor: add parameter to control whether policy hashing is used · 41689645

John Johansen authored Oct 24, 2014

BugLink: http://bugs.launchpad.net/bugs/1383886Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

41689645

UBUNTU: [Config] Default AppArmor settings · da8c283d
Tim Gardner authored Nov 03, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
da8c283d
UBUNTU: SPL/ZFS: Add Makefiles in order to avoid the lengthy config · e6b18e68
Tim Gardner authored Nov 02, 2015
```
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
```
e6b18e68
UBUNTU: [Debian] add feature interlock with mainline builds · 2ed8da46
Andy Whitcroft authored Oct 26, 2015
```
Signed-off-by: Andy Whitcroft <apw@canonical.com>
```
2ed8da46

26 Feb, 2016 1 commit

UBUNTU: Bypass spl/zfs config · 99c7a6fa

Tim Gardner authored Nov 02, 2015

Depends on UBUNTU: SPL/ZFS: Add Makefiles in order to avoid the lengthy config
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

99c7a6fa