~ubuntu-kernel/ubuntu/+source/linux/+git/wily:flo

Last commit made on 2015-09-03
Get this branch:
git clone -b flo https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/wily
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

f5f624b... by Tim Gardner

UBUNTU: Ubuntu-flo-3.4.0-5.19

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

3f49ff0... by Simon Fels

Bluetooth: close HCI device when user channel socket gets closed

With 9380f9eacfbbee701daa416edd6625efcd3e29e1 the order of unsetting
the HCI_USER_CHANNEL flag of the HCI device was reverted to ensure
the device is first closed before making it available again.

Due to hci_dev_close checking for HCI_USER_CHANNEL being set on the
device it was never really closed and was kept opened. We're now
calling hci_dev_do_close directly to make sure the device is correctly
closed and we keep the correct order to unset the flag on our device
object.

Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Marcel Holtmann <email address hidden>
(cherry picked from bluetooth-next 4c63f83c2c2e16a13ce274ee678e28246bd33645)
BugLink: http://bugs.launchpad.net/bugs/1489327
Signed-off-by: Tim Gardner <email address hidden>

dc5e01b... by Simon Fels

UBUNTU: [Config] Enable bluetooth backports

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

Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

a784ef9... by Simon Fels

UBUNTU: backports: import HCI SMD driver

We need to carry and build the HCI SMD driver from now on as part of the backports tree to
keep the dependency on the right bluetooth layer.

The driver itself copied and modified version of the one still shipped as part of the
older bluetooth stack we have in the tree under net/bluetooth. Code was taken from
drivers/bluetooth/hci_smd.c and adjusted to fit the changed HCI driver API.

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

Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

0b6d2e6... by Simon Fels

UBUNTU: backports: respect already existing redefinitions in the flo tree

As the flo tree isn't a clean 3.4 one without further modifications and backported things
from upstream we need to respect already present symbols from newer upstream kernel
versions and drop them from our compatiblity layer.

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

Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

62e84e1... by Simon Fels

UBUNTU: Import backports 4.2-rc7

backports tree was automatically generated and integrated with the following command:

$ ./gentree.py --integrate --clean --git-revision v4.2-rc7 \
    <path>/linux-next <path>/linux-mako

(we're using a slightly modified backports tree to adjust every export automatically for
 our needs).

See https://backports.wiki.kernel.org/index.php/Documentation/integration for
documentation and https://github.com/ubuntu-phonedations/backports for the used backports
tree.

All uncessary parts (bcma, wifi, nfc etc.) were dropped and just the bluetooth relevant
parts are kept.

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

Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

006184a... by Andrzej Kaczmarek <email address hidden>

hid: Backport hid-generic driver

This patch provides provisional backport of hid-generic driver which
is required for Bluetooth HIDP to work with backports, since hidp
module has its HID driver removed.

This is a backport of the following upstream change:

HID: Create a common generic driver (8215d557e5f3a70e50e07c857d35c250fee62a73)

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

Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

aa3fc97... by asi

crypto: af_alg - properly label AF_ALG socket

Th AF_ALG socket was missing a security label (e.g. SELinux)
which means that socket was in "unlabeled" state.

This was recently demonstrated in the cryptsetup package
(cryptsetup v1.6.5 and later.)
See https://bugzilla.redhat.com/show_bug.cgi?id=1115120

This patch clones the sock's label from the parent sock
and resolves the issue (similar to AF_BLUETOOTH protocol family).

Cc: <email address hidden>
Signed-off-by: Milan Broz <email address hidden>
Acked-by: Paul Moore <email address hidden>
Signed-off-by: Herbert Xu <email address hidden>
(cherry picked from 4c63f83c2c2e16a13ce274ee678e28246bd33645)
BugLink: http://bugs.launchpad.net/bugs/1489327
Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

39b42b6... by Jussi Kivilinna <email address hidden>

crypto: add CMAC support to CryptoAPI

Patch adds support for NIST recommended block cipher mode CMAC to CryptoAPI.

This work is based on Tom St Denis' earlier patch,
 http://marc.info/?l=linux-crypto-vger&m=135877306305466&w=2

Cc: Tom St Denis <email address hidden>
Signed-off-by: Jussi Kivilinna <email address hidden>
Acked-by: David S. Miller <email address hidden>
Signed-off-by: Herbert Xu <email address hidden>
(cherry picked from 93b5e86a6d13c5dec18c6611933fb38d7d80f0d2)
BugLink: http://bugs.launchpad.net/bugs/1489327
Signed-off-by: Simon Fels <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

eb0bf7d... by Tim Gardner

UBUNTU: Start new release

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