Last commit made on 2015-12-15
Get this branch:
git clone -b bluetooth-3.4 https://git.launchpad.net/~bluetooth/+git/linux-bluetooth
Members of Bluetooth can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

7b6b29f... by Simon Fels

UBUNTU: SAUCE: 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

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>

2c780cc... 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

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>

76e10d1... by Linus Torvalds <email address hidden>

Linux 3.4

d6c7797... by Linus Torvalds <email address hidden>

Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

Pull PA-RISC fixes from James Bottomley:
 "This is a set of three bug fixes that gets parisc running again on
  systems with PA1.1 processors.

  Two fix regressions introduced in 2.6.39 and one fixes a prefetch bug
  that only affects PA7300LC processors. We also have another pending
  fix to do with the sectional arrangement of vmlinux.lds, but there's a
  query on it during testing on one particular system type, so I'll hold
  off sending it in for now."

* tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
  [PARISC] fix panic on prefetch(NULL) on PA7300LC
  [PARISC] fix crash in flush_icache_page_asm on PA1.1
  [PARISC] fix PA1.1 oops on boot

5d12045... by Linus Torvalds <email address hidden>

Merge branch 'x86/ld-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 linker bug workarounds from Peter Anvin.

GNU ld-[12] (*) has an unfortunate bug where it incorrectly
turns certain relocation entries absolute. Section-relative symbols
that are part of otherwise empty sections are silently changed them to
absolute. We rely on section-relative symbols staying section-relative,
and actually have several sections in the linker script solely for this

See for example


We could just black-list the buggy linker, but it appears that it got
shipped in at least F17, and possibly other distros too, so it's sadly
not some rare unusual case.

This backports the workaround from the x86/trampoline branch, and as
Peter says: "This is not a minimal fix, not at all, but it is a tested
code base."

* 'x86/ld-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, relocs: When printing an error, say relative or absolute
  x86, relocs: Workaround for binutils section bug
  x86, realmode: 16-bit real-mode code support for relocs tool

(*) That's a manly release numbering system. Stupid, sure. But manly.

14e931a... by Linus Torvalds <email address hidden>

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block layer fixes from Jens Axboe:
 "A few small, but important fixes. Most of them are marked for stable
  as well

   - Fix failure to release a semaphore on error path in mtip32xx.
   - Fix crashable condition in bio_get_nr_vecs().
   - Don't mark end-of-disk buffers as mapped, limit it to i_size.
   - Fix for build problem with CONFIG_BLOCK=n on arm at least.
   - Fix for a buffer overlow on UUID partition printing.
   - Trivial removal of unused variables in dac960."

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: fix buffer overflow when printing partition UUIDs
  Fix blkdev.h build errors when BLOCK=n
  bio allocation failure due to bio_get_nr_vecs()
  block: don't mark buffers beyond end of disk as mapped
  mtip32xx: release the semaphore on an error path
  dac960: Remove unused variables from DAC960_CreateProcEntries()

a2ae978... by Linus Torvalds <email address hidden>

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull one more networking bug-fix from David Miller:
 "One last straggler.

  Eric Dumazet's pktgen unload oops fix was not entirely complete, but
  all the cases should be handled properly now.... fingers crossed."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  pktgen: fix module unload for good

62ade86... by Hugh Dickins <email address hidden>

memcg,thp: fix res_counter:96 regression

Occasionally, testing memcg's move_charge_at_immigrate on rc7 shows
a flurry of hundreds of warnings at kernel/res_counter.c:96, where
res_counter_uncharge_locked() does WARN_ON(counter->usage < val).

The first trace of each flurry implicates __mem_cgroup_cancel_charge()
of mc.precharge, and an audit of mc.precharge handling points to
mem_cgroup_move_charge_pte_range()'s THP handling in commit 12724850e806
("memcg: avoid THP split in task migration").

Checking !mc.precharge is good everywhere else, when a single page is to
be charged; but here the "mc.precharge -= HPAGE_PMD_NR" likely to
follow, is liable to result in underflow (a lot can change since the
precharge was estimated).

Simply check against HPAGE_PMD_NR: there's probably a better
alternative, trying precharge for more, splitting if unsuccessful; but
this one-liner is safer for now - no kernel/res_counter.c:96 warnings
seen in 26 hours.

Signed-off-by: Hugh Dickins <email address hidden>
Signed-off-by: Linus Torvalds <email address hidden>

24ab82b... by "H. Peter Anvin" <email address hidden>

x86, relocs: When printing an error, say relative or absolute

When the relocs tool throws an error, let the error message say if it
is an absolute or relative symbol. This should make it a lot more
clear what action the programmer needs to take and should help us find
the reason if additional symbol bugs show up.

Signed-off-by: H. Peter Anvin <email address hidden>
Cc: <email address hidden>

a3e854d... by "H. Peter Anvin" <email address hidden>

x86, relocs: Workaround for binutils section bug

GNU ld has a bug that it blindly changes symbols from
section-relative to absolute if they are in a section of zero length.
This turns the symbols __init_begin and __init_end into absolute
symbols. Let the relocs program know that those should be treated as
relative symbols.

Reported-by: Ingo Molnar <email address hidden>
Signed-off-by: H. Peter Anvin <email address hidden>
Cc: H.J. Lu <email address hidden>
Cc: <email address hidden>
Cc: Jarkko Sakkinen <email address hidden>