diff options
| author | Jens Axboe <axboe@fb.com> | 2014-02-10 12:52:34 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-02-10 12:52:34 -0700 |
| commit | 9d4cb8e3a5b448d802155688bf2d50ac1b9e1a51 (patch) | |
| tree | 95f3ee193b9f6a248001cee13e1f4ea23704ca45 /net/phonet | |
| parent | 11c94444074f40b479a05f6657d935204e992f2e (diff) | |
| parent | 3661371701e714f0cea4120f6a365340858fb4e4 (diff) | |
| download | talos-obmc-linux-9d4cb8e3a5b448d802155688bf2d50ac1b9e1a51.tar.gz talos-obmc-linux-9d4cb8e3a5b448d802155688bf2d50ac1b9e1a51.zip | |
Merge branch 'stable/for-jens-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into for-linus
Konrad writes:
Please git pull the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git stable/for-jens-3.14
which is based off v3.13-rc6. If you would like me to rebase it on
a different branch/tag I would be more than happy to do so.
The patches are all bug-fixes and hopefully can go in 3.14.
They deal with xen-blkback shutdown and cause memory leaks
as well as shutdown races. They should go to stable tree and if you
are OK with I will ask them to backport those fixes.
There is also a fix to xen-blkfront to deal with unexpected state
transition. And lastly a fix to the header where it was using the
__aligned__ unnecessarily.
Diffstat (limited to 'net/phonet')
0 files changed, 0 insertions, 0 deletions
