]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Andrew Morton [Thu, 24 Apr 2014 23:03:55 +0000 (09:03 +1000)]
mm/page_io.c: work around gcc bug
gcc-4.4.4 (at least) screws up this initialization.
mm/page_io.c: In function '__swap_writepage':
mm/page_io.c:277: error: unknown field 'bvec' specified in initializer
mm/page_io.c:278: warning: excess elements in struct initializer
mm/page_io.c:278: warning: (near initialization for 'from')
Fixes
f990bbc9bfa3cbd2d ("bio_vec-backed iov_iter").
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Andrew Morton [Thu, 24 Apr 2014 23:03:55 +0000 (09:03 +1000)]
drivers/gpio/gpio-zevio.c: fix build
Unbreak i386 allmodconfig.
This is a hack - please fix properly ;)
Cc: Fabian Vogt <fabian@ritter-vogt.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Stephen Rothwell [Wed, 30 Apr 2014 05:31:24 +0000 (15:31 +1000)]
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
mm/vmacache.c
Stephen Rothwell [Wed, 30 Apr 2014 04:52:29 +0000 (14:52 +1000)]
Merge branch 'rd-docs/master'
Stephen Rothwell [Wed, 30 Apr 2014 04:50:59 +0000 (14:50 +1000)]
Merge remote-tracking branch 'llvmlinux/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:49:42 +0000 (14:49 +1000)]
Merge remote-tracking branch 'aio/master'
Stephen Rothwell [Wed, 30 Apr 2014 04:48:12 +0000 (14:48 +1000)]
Merge remote-tracking branch 'lzo-update/lzo-update'
Stephen Rothwell [Wed, 30 Apr 2014 04:46:57 +0000 (14:46 +1000)]
Merge remote-tracking branch 'clk/clk-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:46:04 +0000 (14:46 +1000)]
Merge remote-tracking branch 'ktest/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:36:44 +0000 (14:36 +1000)]
Merge remote-tracking branch 'userns/for-next'
Conflicts:
fs/dcache.c
fs/namei.c
fs/namespace.c
Stephen Rothwell [Wed, 30 Apr 2014 04:35:44 +0000 (14:35 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:34:13 +0000 (14:34 +1000)]
Merge remote-tracking branch 'gpio/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:32:57 +0000 (14:32 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:32:46 +0000 (14:32 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:26:49 +0000 (14:26 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:25:05 +0000 (14:25 +1000)]
Merge remote-tracking branch 'staging/staging-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:24:11 +0000 (14:24 +1000)]
Merge remote-tracking branch 'usb-gadget/next'
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
Stephen Rothwell [Wed, 30 Apr 2014 04:12:17 +0000 (14:12 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Wed, 30 Apr 2014 04:10:37 +0000 (14:10 +1000)]
Merge remote-tracking branch 'tty/tty-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:59:48 +0000 (13:59 +1000)]
Merge remote-tracking branch 'driver-core/driver-core-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:58:55 +0000 (13:58 +1000)]
Merge remote-tracking branch 'leds/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:57:32 +0000 (13:57 +1000)]
Merge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:57:25 +0000 (13:57 +1000)]
Merge remote-tracking branch 'drivers-x86/linux-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:56:07 +0000 (13:56 +1000)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:45:11 +0000 (13:45 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:44:18 +0000 (13:44 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:43:08 +0000 (13:43 +1000)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:32:13 +0000 (13:32 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Wed, 30 Apr 2014 03:30:23 +0000 (13:30 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:30:21 +0000 (13:30 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:19:22 +0000 (13:19 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Wed, 30 Apr 2014 03:18:10 +0000 (13:18 +1000)]
Merge remote-tracking branch 'spi/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 03:16:25 +0000 (13:16 +1000)]
Merge remote-tracking branch 'audit/master'
Conflicts:
arch/mips/include/asm/syscall.h
arch/mips/kernel/ptrace.c
arch/x86/Kconfig
kernel/audit.c
Stephen Rothwell [Wed, 30 Apr 2014 03:15:19 +0000 (13:15 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Wed, 30 Apr 2014 03:14:27 +0000 (13:14 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Wed, 30 Apr 2014 03:14:21 +0000 (13:14 +1000)]
Merge remote-tracking branch 'selinux/next'
Stephen Rothwell [Wed, 30 Apr 2014 03:04:39 +0000 (13:04 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Wed, 30 Apr 2014 03:03:26 +0000 (13:03 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:58:15 +0000 (12:58 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:57:01 +0000 (12:57 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:55:33 +0000 (12:55 +1000)]
Merge remote-tracking branch 'device-mapper/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:52:41 +0000 (12:52 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:51:42 +0000 (12:51 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Wed, 30 Apr 2014 02:50:38 +0000 (12:50 +1000)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:42:28 +0000 (12:42 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:41:23 +0000 (12:41 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:40:20 +0000 (12:40 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:39:23 +0000 (12:39 +1000)]
Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:37:49 +0000 (12:37 +1000)]
Merge remote-tracking branch 'drm-intel/for-linux-next'
Conflicts:
drivers/gpu/drm/i915/i915_gem_context.c
drivers/gpu/drm/i915/i915_gem_gtt.c
Stephen Rothwell [Wed, 30 Apr 2014 02:07:43 +0000 (12:07 +1000)]
Merge remote-tracking branch 'drm-panel/drm/panel/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:06:41 +0000 (12:06 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
drivers/char/hw_random/Kconfig
drivers/crypto/bfin_crc.h
Stephen Rothwell [Wed, 30 Apr 2014 02:02:52 +0000 (12:02 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 30 Apr 2014 02:01:57 +0000 (12:01 +1000)]
Merge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 02:00:42 +0000 (12:00 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:59:38 +0000 (11:59 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:58:12 +0000 (11:58 +1000)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:47:53 +0000 (11:47 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
drivers/net/ethernet/altera/altera_sgdma.c
net/netlink/af_netlink.c
Stephen Rothwell [Wed, 30 Apr 2014 01:42:27 +0000 (11:42 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Wed, 30 Apr 2014 01:41:31 +0000 (11:41 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 30 Apr 2014 01:39:43 +0000 (11:39 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:38:50 +0000 (11:38 +1000)]
Merge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:37:32 +0000 (11:37 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:36:39 +0000 (11:36 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:35:47 +0000 (11:35 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:33:50 +0000 (11:33 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:29:53 +0000 (11:29 +1000)]
Merge remote-tracking branch 'pci/next'
Stephen Rothwell [Wed, 30 Apr 2014 01:19:22 +0000 (11:19 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Conflicts:
fs/f2fs/file.c
Stephen Rothwell [Wed, 30 Apr 2014 01:18:20 +0000 (11:18 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:17:07 +0000 (11:17 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:15:32 +0000 (11:15 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:14:40 +0000 (11:14 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:13:48 +0000 (11:13 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:12:53 +0000 (11:12 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:12:49 +0000 (11:12 +1000)]
Merge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Wed, 30 Apr 2014 01:11:57 +0000 (11:11 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 30 Apr 2014 01:10:48 +0000 (11:10 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 30 Apr 2014 01:09:52 +0000 (11:09 +1000)]
Merge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Wed, 30 Apr 2014 01:08:57 +0000 (11:08 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 01:08:00 +0000 (11:08 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Wed, 30 Apr 2014 01:07:05 +0000 (11:07 +1000)]
Merge remote-tracking branch 'uml/next'
Conflicts:
arch/um/include/asm/Kbuild
Stephen Rothwell [Wed, 30 Apr 2014 01:06:09 +0000 (11:06 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Wed, 30 Apr 2014 01:04:49 +0000 (11:04 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 30 Apr 2014 00:55:23 +0000 (10:55 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:54:28 +0000 (10:54 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:53:33 +0000 (10:53 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:52:28 +0000 (10:52 +1000)]
Merge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:51:36 +0000 (10:51 +1000)]
Merge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:50:43 +0000 (10:50 +1000)]
Merge remote-tracking branch 'renesas/next'
Stephen Rothwell [Wed, 30 Apr 2014 00:49:38 +0000 (10:49 +1000)]
Merge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:49:34 +0000 (10:49 +1000)]
Merge remote-tracking branch 'keystone/next'
Stephen Rothwell [Wed, 30 Apr 2014 00:48:32 +0000 (10:48 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:48:25 +0000 (10:48 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:47:33 +0000 (10:47 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:46:37 +0000 (10:46 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Wed, 30 Apr 2014 00:44:33 +0000 (10:44 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:43:44 +0000 (10:43 +1000)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Wed, 30 Apr 2014 00:38:36 +0000 (10:38 +1000)]
Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'
Stephen Rothwell [Wed, 30 Apr 2014 00:38:33 +0000 (10:38 +1000)]
Merge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Wed, 30 Apr 2014 00:38:33 +0000 (10:38 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Wed, 30 Apr 2014 00:38:30 +0000 (10:38 +1000)]
Merge remote-tracking branch 'ide/master'