]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Thierry Reding [Fri, 25 Oct 2013 09:31:21 +0000 (11:31 +0200)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
arch/h8300/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
Thierry Reding [Fri, 25 Oct 2013 09:30:48 +0000 (11:30 +0200)]
Merge remote-tracking branch 'slave-dma/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:44 +0000 (11:30 +0200)]
Merge remote-tracking branch 'dlm/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:42 +0000 (11:30 +0200)]
Merge remote-tracking branch 'ubi/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:40 +0000 (11:30 +0200)]
Merge remote-tracking branch 'thermal/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:35 +0000 (11:30 +0200)]
Merge remote-tracking branch 'idle/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:31 +0000 (11:30 +0200)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
drivers/i2c/i2c-core.c
Thierry Reding [Fri, 25 Oct 2013 09:30:24 +0000 (11:30 +0200)]
Merge remote-tracking branch 'libata/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:21 +0000 (11:30 +0200)]
Merge remote-tracking branch 'kbuild/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:19 +0000 (11:30 +0200)]
Merge remote-tracking branch 'v4l-dvb/master'
Thierry Reding [Fri, 25 Oct 2013 09:30:17 +0000 (11:30 +0200)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:15 +0000 (11:30 +0200)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:14 +0000 (11:30 +0200)]
Merge remote-tracking branch 'hid/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:30:12 +0000 (11:30 +0200)]
Merge remote-tracking branch 'pci/next'
Thierry Reding [Fri, 25 Oct 2013 09:30:09 +0000 (11:30 +0200)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/nfs/direct.c
fs/nfs/file.c
Thierry Reding [Fri, 25 Oct 2013 09:29:58 +0000 (11:29 +0200)]
Merge remote-tracking branch 'xfs/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:56 +0000 (11:29 +0200)]
Merge remote-tracking branch 'ubifs/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:53 +0000 (11:29 +0200)]
Merge remote-tracking branch 'v9fs/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:48 +0000 (11:29 +0200)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:47 +0000 (11:29 +0200)]
Merge remote-tracking branch 'nfs/linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:40 +0000 (11:29 +0200)]
Merge remote-tracking branch 'logfs/master'
Thierry Reding [Fri, 25 Oct 2013 09:29:38 +0000 (11:29 +0200)]
Merge remote-tracking branch 'gfs2/master'
Thierry Reding [Fri, 25 Oct 2013 09:29:37 +0000 (11:29 +0200)]
Merge remote-tracking branch 'fuse/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:36 +0000 (11:29 +0200)]
Merge remote-tracking branch 'fscache/fscache'
Thierry Reding [Fri, 25 Oct 2013 09:29:35 +0000 (11:29 +0200)]
Merge remote-tracking branch 'f2fs/dev'
Thierry Reding [Fri, 25 Oct 2013 09:29:34 +0000 (11:29 +0200)]
Merge remote-tracking branch 'ext4/dev'
Thierry Reding [Fri, 25 Oct 2013 09:29:30 +0000 (11:29 +0200)]
Merge remote-tracking branch 'cifs/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:29 +0000 (11:29 +0200)]
Merge remote-tracking branch 'ceph/master'
Thierry Reding [Fri, 25 Oct 2013 09:29:27 +0000 (11:29 +0200)]
Merge remote-tracking branch 'aio-direct/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:29:21 +0000 (11:29 +0200)]
Merge remote-tracking branch 'sh/sh-latest'
Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h
Thierry Reding [Fri, 25 Oct 2013 09:20:17 +0000 (11:20 +0200)]
Merge remote-tracking branch 's390/features'
Thierry Reding [Fri, 25 Oct 2013 09:20:16 +0000 (11:20 +0200)]
Merge remote-tracking branch 'mpc5xxx/next'
Thierry Reding [Fri, 25 Oct 2013 09:20:15 +0000 (11:20 +0200)]
Merge remote-tracking branch 'powerpc/next'
Thierry Reding [Fri, 25 Oct 2013 09:20:14 +0000 (11:20 +0200)]
Merge remote-tracking branch 'parisc-hd/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:20:12 +0000 (11:20 +0200)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Thierry Reding [Fri, 25 Oct 2013 09:20:09 +0000 (11:20 +0200)]
Merge remote-tracking branch 'm68k/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:20:08 +0000 (11:20 +0200)]
Merge remote-tracking branch 'ia64/next'
Thierry Reding [Fri, 25 Oct 2013 09:20:05 +0000 (11:20 +0200)]
Merge remote-tracking branch 'h8300-remove/h8300-remove'
Conflicts:
drivers/parport/Kconfig
Thierry Reding [Fri, 25 Oct 2013 09:19:46 +0000 (11:19 +0200)]
Merge remote-tracking branch 'c6x/for-linux-next'
Conflicts:
arch/arm/Kconfig
Thierry Reding [Fri, 25 Oct 2013 09:19:41 +0000 (11:19 +0200)]
Merge remote-tracking branch 'arm64/upstream'
Thierry Reding [Fri, 25 Oct 2013 09:19:41 +0000 (11:19 +0200)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Thierry Reding [Fri, 25 Oct 2013 09:19:39 +0000 (11:19 +0200)]
Merge remote-tracking branch 'arm/for-next'
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Thierry Reding [Fri, 25 Oct 2013 09:19:28 +0000 (11:19 +0200)]
Merge remote-tracking branch 'arc/for-next'
Thierry Reding [Fri, 25 Oct 2013 09:19:26 +0000 (11:19 +0200)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Thierry Reding [Fri, 25 Oct 2013 09:19:20 +0000 (11:19 +0200)]
Merge remote-tracking branch 'input-current/for-linus'
Thierry Reding [Fri, 25 Oct 2013 09:19:19 +0000 (11:19 +0200)]
Merge remote-tracking branch 'tty.current/tty-linus'
Thierry Reding [Fri, 25 Oct 2013 09:19:18 +0000 (11:19 +0200)]
Merge remote-tracking branch 'wireless/master'
Thierry Reding [Fri, 25 Oct 2013 09:19:18 +0000 (11:19 +0200)]
Merge remote-tracking branch 'sound-current/for-linus'
Thierry Reding [Fri, 25 Oct 2013 09:19:17 +0000 (11:19 +0200)]
Merge remote-tracking branch 'ipsec/master'
Thierry Reding [Fri, 25 Oct 2013 09:19:17 +0000 (11:19 +0200)]
Merge remote-tracking branch 'net/master'
Thierry Reding [Fri, 25 Oct 2013 09:19:16 +0000 (11:19 +0200)]
Merge remote-tracking branch 'arm-current/fixes'
Jaegeuk Kim [Fri, 25 Oct 2013 05:26:31 +0000 (14:26 +0900)]
f2fs: add tracepoint for vm_page_mkwrite
This patch adds a tracepoint for f2fs_vm_page_mkwrite.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Jaegeuk Kim [Thu, 24 Oct 2013 08:53:29 +0000 (17:53 +0900)]
f2fs: add tracepoint for set_page_dirty
This patch adds a tracepoint for set_page_dirty.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Chao Yu [Thu, 24 Oct 2013 07:08:28 +0000 (15:08 +0800)]
f2fs: remove redundant set_page_dirty from write_compacted_summaries
Previously, set_page_dirty is called every time after writting one summary info
into compacted summary page,
To avoid redundant set_page_dirty, we only call set_page_dirty before release
page.
Signed-off-by: Yu Chao <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Jaegeuk Kim [Thu, 24 Oct 2013 06:49:07 +0000 (15:49 +0900)]
f2fs: add reclaiming control by sysfs
This patch adds a control method in sysfs to reclaim prefree segments.
Signed-off-by: Changman Lee <cm224.lee@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Jaegeuk Kim [Thu, 24 Oct 2013 05:19:18 +0000 (14:19 +0900)]
f2fs: introduce f2fs_balance_fs_bg for some background jobs
This patch merges some background jobs into this new function.
Signed-off-by: Changman Lee <cm224.lee@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Jaegeuk Kim [Thu, 24 Oct 2013 04:31:34 +0000 (13:31 +0900)]
f2fs: reclaim prefree segments periodically
Previously, f2fs postpones reclaiming prefree segments into free segments
as much as possible.
However, if user writes and deletes a bunch of data without any sync or fsync
calls, some flash storages can suffer from garbage collections.
So, this patch adds the reclaiming codes to f2fs_write_node_pages and background
GC thread.
If there are a lot of prefree segments, let's do checkpoint so that f2fs
submits discard commands for the prefree regions to the flash storage.
Signed-off-by: Changman Lee <cm224.lee@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Haicheng Li [Wed, 23 Oct 2013 04:39:32 +0000 (12:39 +0800)]
f2fs: use bool for booleans
Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Jaegeuk Kim [Tue, 22 Oct 2013 11:56:10 +0000 (20:56 +0900)]
f2fs: clean up several status-related operations
This patch cleans up improper definitions that update some status information.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Linus Torvalds [Fri, 25 Oct 2013 06:32:01 +0000 (07:32 +0100)]
Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull ecryptfs fixes from Tyler Hicks:
"Two important fixes
- Fix long standing memory leak in the (rarely used) public key
support
- Fix large file corruption on 32 bit architectures"
* tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: fix 32 bit corruption issue
ecryptfs: Fix memory leakage in keystore.c
Vinod Koul [Fri, 25 Oct 2013 05:50:13 +0000 (11:20 +0530)]
Merge branch 'dma_complete' into next
Vinod Koul [Fri, 25 Oct 2013 05:50:05 +0000 (11:20 +0530)]
Merge branch 'fixes' into next
Conflicts:
drivers/dma/edma.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Thu, 17 Oct 2013 01:59:57 +0000 (07:29 +0530)]
dmaengine: remove unused DMA_SUCCESS
after all the users are converted
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:37:39 +0000 (21:07 +0530)]
net: use DMA_COMPLETE for dma completion status
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:36:19 +0000 (21:06 +0530)]
serial: sh: use DMA_COMPLETE for dma completion status
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:35:50 +0000 (21:05 +0530)]
async_tx: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:35:16 +0000 (21:05 +0530)]
dmaengine: txx9: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:34:50 +0000 (21:04 +0530)]
dmaengine: tegra: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:34:24 +0000 (21:04 +0530)]
dmaengine: ste: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:34:06 +0000 (21:04 +0530)]
dmaengine: sh: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:33:47 +0000 (21:03 +0530)]
dmaengine: sa11x0: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:22:38 +0000 (20:52 +0530)]
dmaengine: ppc4xx: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:21:54 +0000 (20:51 +0530)]
dmaengine: omap: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:21:30 +0000 (20:51 +0530)]
dmaengine: mxs-dma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:21:04 +0000 (20:51 +0530)]
dmaengine: mv_xor: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:20:36 +0000 (20:50 +0530)]
dmaengine: mmp_tdma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Zhangfei Gao <zhangfei.gao@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:20:09 +0000 (20:50 +0530)]
dmaengine: k3dma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:19:42 +0000 (20:49 +0530)]
dmaengine: iop: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 15:18:52 +0000 (20:48 +0530)]
dmaengine: ioat: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 10:20:33 +0000 (15:50 +0530)]
dmaengine: intel_mid_dma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:37:06 +0000 (14:07 +0530)]
dmaengine: imx-sdma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:36:24 +0000 (14:06 +0530)]
dmaengine: imx-dma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:12:15 +0000 (13:42 +0530)]
dmaengine: edma: use DMA_COMPLETE for dma completion status
Tested-by: Joel Fernandes <joelf@ti.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:11:15 +0000 (13:41 +0530)]
dmaengine: dw: use DMA_COMPLETE for dma completion status
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:07:27 +0000 (13:37 +0530)]
dmaengine: dmatest: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:06:54 +0000 (13:36 +0530)]
dmaengine: jz4740: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:06:28 +0000 (13:36 +0530)]
dmaengine: cppi41: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:05:45 +0000 (13:35 +0530)]
dmaengine: coh901318: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:04:35 +0000 (13:34 +0530)]
dmaengine: at_hdma: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 08:03:02 +0000 (13:33 +0530)]
dmaengine: amba-pl08x: use DMA_COMPLETE for dma completion status
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Vinod Koul [Wed, 16 Oct 2013 07:59:02 +0000 (13:29 +0530)]
dmaengine: use DMA_COMPLETE for dma completion status
the DMA_SUCCESS is a misnomer as dmaengine indicates the transfer is complete and
gives no guarantee of the transfer success. Hence we should use DMA_COMPLTE
instead of DMA_SUCCESS
Acked-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Rafael J. Wysocki [Thu, 24 Oct 2013 23:59:10 +0000 (01:59 +0200)]
Merge branch 'pm-fixes-next' into linux-next
* pm-fixes-next:
PM / hibernate: Move software_resume to late_initcall_sync
Russ Dill [Thu, 24 Oct 2013 13:25:26 +0000 (14:25 +0100)]
PM / hibernate: Move software_resume to late_initcall_sync
software_resume is being called after deferred_probe_initcall in
drivers base. If the probing of the device that contains the resume
image is deferred, and the system has been instructed to wait for
it to show up, this wait will occur in software_resume. This causes
a deadlock.
Move software_resume into late_initcall_sync so that it happens
after all the other late_initcalls.
Signed-off-by: Russ Dill <Russ.Dill@ti.com>
Acked-by: Pavel Machek <Pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Colin Ian King [Thu, 24 Oct 2013 14:08:07 +0000 (14:08 +0000)]
eCryptfs: fix 32 bit corruption issue
Shifting page->index on 32 bit systems was overflowing, causing
data corruption of > 4GB files. Fix this by casting it first.
https://launchpad.net/bugs/
1243636
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reported-by: Lars Duesing <lars.duesing@camelotsweb.de>
Cc: stable@vger.kernel.org # v3.11+
Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
Vinod Koul [Thu, 24 Oct 2013 16:47:50 +0000 (22:17 +0530)]
dmaengine: edma: fix another memory leak
commit
4b6271a6 fix a menory leak but one more existed in driver so fix that
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Valentin Ilie [Thu, 24 Oct 2013 13:14:22 +0000 (16:14 +0300)]
dma: edma: Fix memory leak
When it fails to allocate a slot, edesc should be free'd before return;
Signed-off-by: Valentin Ilie <valentin.ilie@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Sebastian Ott [Tue, 22 Oct 2013 13:19:24 +0000 (15:19 +0200)]
s390/pci: cleanup function information block
Cleanup function information block used as a modify pci function
parameter. Change reserved members to be anonymous. Fix the size
of the struct and add proper alignment information. Also put the
FIB on the stack.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Sebastian Ott [Tue, 22 Oct 2013 13:18:14 +0000 (15:18 +0200)]
s390/pci: remove CONFIG_PCI_DEBUG dependancy
Add debugfs entries regardless of CONFIG_PCI_DEBUG.
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Sebastian Ott [Tue, 22 Oct 2013 13:17:19 +0000 (15:17 +0200)]
s390/pci: message cleanup
Cleanup arch specific pci messages. Remove unhelpful messages and
replace others with entries in the debugfs.
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Martin Schwidefsky [Thu, 5 Sep 2013 06:58:19 +0000 (08:58 +0200)]
Update default configuration
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>