]>
git.kernelconcepts.de Git - karo-tx-linux.git/log
Stephen Rothwell [Thu, 13 Sep 2012 03:50:43 +0000 (13:50 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 13 Sep 2012 03:50:37 +0000 (13:50 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Thu, 13 Sep 2012 03:46:13 +0000 (13:46 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Thu, 13 Sep 2012 03:44:29 +0000 (13:44 +1000)]
Merge remote-tracking branch 'regulator/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Thu, 13 Sep 2012 03:42:46 +0000 (13:42 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:41:10 +0000 (13:41 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:39:27 +0000 (13:39 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Thu, 13 Sep 2012 03:32:27 +0000 (13:32 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Conflicts:
Documentation/devicetree/bindings/regulator/tps6586x.txt
Stephen Rothwell [Thu, 13 Sep 2012 03:30:44 +0000 (13:30 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:29:06 +0000 (13:29 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:27:28 +0000 (13:27 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:25:51 +0000 (13:25 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:24:05 +0000 (13:24 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Thu, 13 Sep 2012 03:17:35 +0000 (13:17 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:13:19 +0000 (13:13 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:11:23 +0000 (13:11 +1000)]
Merge remote-tracking branch 'input-mt/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:09:42 +0000 (13:09 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 13 Sep 2012 03:03:46 +0000 (13:03 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Thu, 13 Sep 2012 03:02:03 +0000 (13:02 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 03:00:19 +0000 (13:00 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:58:31 +0000 (12:58 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:56:49 +0000 (12:56 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Thu, 13 Sep 2012 02:55:10 +0000 (12:55 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Thu, 13 Sep 2012 02:53:28 +0000 (12:53 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Thu, 13 Sep 2012 02:51:52 +0000 (12:51 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 13 Sep 2012 02:49:53 +0000 (12:49 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Thu, 13 Sep 2012 02:42:35 +0000 (12:42 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
net/socket.c
Stephen Rothwell [Thu, 13 Sep 2012 02:40:57 +0000 (12:40 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Thu, 13 Sep 2012 02:39:17 +0000 (12:39 +1000)]
Merge remote-tracking branch 'isci/all'
Stephen Rothwell [Thu, 13 Sep 2012 02:37:37 +0000 (12:37 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:35:56 +0000 (12:35 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:34:23 +0000 (12:34 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 13 Sep 2012 02:32:49 +0000 (12:32 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:31:12 +0000 (12:31 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Thu, 13 Sep 2012 02:31:05 +0000 (12:31 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Thu, 13 Sep 2012 02:29:20 +0000 (12:29 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Thu, 13 Sep 2012 02:27:41 +0000 (12:27 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Thu, 13 Sep 2012 02:26:01 +0000 (12:26 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:24:18 +0000 (12:24 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:22:18 +0000 (12:22 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Thu, 13 Sep 2012 02:20:45 +0000 (12:20 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:19:20 +0000 (12:19 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Thu, 13 Sep 2012 02:17:56 +0000 (12:17 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:16:31 +0000 (12:16 +1000)]
Merge branch 'quilt/i2c'
Conflicts:
drivers/i2c/busses/i2c-i801.c
Stephen Rothwell [Thu, 13 Sep 2012 02:15:04 +0000 (12:15 +1000)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Stephen Rothwell [Thu, 13 Sep 2012 02:11:46 +0000 (12:11 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/rapidio/devices/tsi721.c
Stephen Rothwell [Thu, 13 Sep 2012 02:07:24 +0000 (12:07 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:05:47 +0000 (12:05 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:04:20 +0000 (12:04 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:02:55 +0000 (12:02 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 02:01:18 +0000 (12:01 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:59:46 +0000 (11:59 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:58:11 +0000 (11:58 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:56:44 +0000 (11:56 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Thu, 13 Sep 2012 01:55:17 +0000 (11:55 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Thu, 13 Sep 2012 01:53:48 +0000 (11:53 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:52:16 +0000 (11:52 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Thu, 13 Sep 2012 01:50:47 +0000 (11:50 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Thu, 13 Sep 2012 01:49:16 +0000 (11:49 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:47:48 +0000 (11:47 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Thu, 13 Sep 2012 01:46:20 +0000 (11:46 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Thu, 13 Sep 2012 01:44:52 +0000 (11:44 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Thu, 13 Sep 2012 01:43:24 +0000 (11:43 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Thu, 13 Sep 2012 01:38:15 +0000 (11:38 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Thu, 13 Sep 2012 01:35:43 +0000 (11:35 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Thu, 13 Sep 2012 01:34:15 +0000 (11:34 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 13 Sep 2012 01:31:45 +0000 (11:31 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Thu, 13 Sep 2012 01:30:17 +0000 (11:30 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Thu, 13 Sep 2012 01:28:44 +0000 (11:28 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:27:15 +0000 (11:27 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:25:51 +0000 (11:25 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:24:27 +0000 (11:24 +1000)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 13 Sep 2012 01:22:55 +0000 (11:22 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:17:49 +0000 (11:17 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 13 Sep 2012 01:16:18 +0000 (11:16 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
Stephen Rothwell [Thu, 13 Sep 2012 01:14:46 +0000 (11:14 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:53 +0000 (11:07 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:52 +0000 (11:07 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:41 +0000 (11:07 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:40 +0000 (11:07 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:39 +0000 (11:07 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:38 +0000 (11:07 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:37 +0000 (11:07 +1000)]
Merge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:35 +0000 (11:07 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:34 +0000 (11:07 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:32 +0000 (11:07 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Thu, 13 Sep 2012 01:07:31 +0000 (11:07 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Michael S. Tsirkin [Thu, 13 Sep 2012 01:03:45 +0000 (11:03 +1000)]
virtio: don't crash when device is buggy
Because of a sanity check in virtio_dev_remove, a buggy device can crash
kernel. And in case of rproc it's userspace so it's not a good idea.
We are unloading a driver so how bad can it be?
Be less aggressive in handling this error: if it's a driver bug,
warning once should be enough.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Alexey Khoroshilov [Sat, 1 Sep 2012 19:49:37 +0000 (23:49 +0400)]
virtio: console: fix error handling in init() function
If register_virtio_driver() fails, virtio-ports class is not destroyed.
The patch adds error handling of register_virtio_driver().
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Acked-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Thu, 13 Sep 2012 01:03:44 +0000 (11:03 +1000)]
virtio: remove CONFIG_VIRTIO_RING
Everyone who selects VIRTIO is also made to select VIRTIO_RING; just make
them synonymous, since we removed the indirection layer some time ago.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell [Thu, 13 Sep 2012 01:03:44 +0000 (11:03 +1000)]
virtio: add help to CONFIG_VIRTIO option.
Trying to enable a virtio driver (eg CONFIG_VIRTIO_BLK) is painful
because it depends on CONFIG_VIRTIO. CONFIG_VIRTIO doesn't tell you
how to turn it on (it's selected from anything which provides a virtio
bus).
This patch at least adds some documentation, visible in menuconfig, as
a hint.
Reported-by: Kent Overstreet <koverstreet@google.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Jens Axboe [Wed, 12 Sep 2012 20:22:20 +0000 (22:22 +0200)]
Merge branch 'for-3.7/drivers' into for-next
David Milburn [Wed, 12 Sep 2012 19:06:12 +0000 (14:06 -0500)]
mtip32xx: fix user_buffer check in exec_drive_command
Current user_buffer check is incorrect and causes hdparm to fail
# hdparm -I /dev/rssda
HDIO_DRIVE_CMD(identify) failed: Input/output error
/dev/rssda:
Patching linux-3.6-rc5 hdparm works as expected
# hdparm -I /dev/rssda
/dev/rssda:
ATA device, with non-removable media
Model Number: DELL_P320h-MTFDGAL350SAH
Serial Number:
00000000121302025F01
Firmware Revision:
B1442808
<snip>
Reported-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: David Milburn <dmilburn@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Jia Hongtao [Tue, 28 Aug 2012 07:44:08 +0000 (15:44 +0800)]
powerpc/fsl-pci: Unify pci/pcie initialization code
We unified the Freescale pci/pcie initialization by changing the fsl_pci
to a platform driver. In previous PCI code architecture the initialization
routine is called at board_setup_arch stage. Now the initialization is done
in probe function which is architectural better. Also It's convenient for
adding PM support for PCI controller in later patch.
Now we registered pci controllers as platform devices. So we combine two
initialization code as one platform driver.
Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Roy Zang [Mon, 3 Sep 2012 09:22:10 +0000 (17:22 +0800)]
powerpc/pci: Use PCIe IP block revision register instead of compatible
Freescale PCIe IP block revision bigger than rev2.2 will also need
redefine the sequence of inbound windows. So change to use IP block
revision instead of compatible for the judgment.
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Roy Zang [Mon, 3 Sep 2012 09:22:09 +0000 (17:22 +0800)]
powerpc/pci: Add IP revision register define for Freescale PCIe controller
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Shaohui Xie [Wed, 12 Sep 2012 10:36:03 +0000 (18:36 +0800)]
powerpc/p5040: fix dtb build warning of p5040ds.dtb
Device node adt7461 was wrongly added in p5040ds.dts, it should be added
into i2c instead of localbus, when build p5040ds.dtb, a warning will dump:
Warning (reg_format): "reg" property in
/localbus@
ffe124000 /nand@2,0/adt7461@4c has invalid length (4 bytes)
(#address-cells == 1, #size-cells == 1)
This was introduced by:
commit
ea6b1ba692bcb5f6e39f409a78cf8b04fdf23baa
Author: Jia Hongtao <B38951@freescale.com>
Date: Tue Aug 28 10:00:55 2012 +0800
powerpc: add adt7461 thermal monitor support to applicable boards
Add thermal monitor support to following boards:
P1022DS, MPC8536DS, P2041RDB, P3041DS, P4080DS, P5020DS, P5040DS
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Wang Dongsheng [Wed, 29 Aug 2012 03:00:49 +0000 (11:00 +0800)]
powerpc/8544ds: add partition table for norflash
create partition table for norflash.
Signed-off-by: Wang Dongsheng <Dongsheng.Wang@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Jia Hongtao [Tue, 28 Aug 2012 02:00:55 +0000 (10:00 +0800)]
powerpc: add adt7461 thermal monitor support to applicable boards
Add thermal monitor support to following boards:
P1022DS, MPC8536DS, P2041RDB, P3041DS, P4080DS, P5020DS, P5040DS
Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Prabhakar Kushwaha [Thu, 16 Aug 2012 03:58:22 +0000 (09:28 +0530)]
powerpc/mpc85xx: Add new ext fields to Integrated FLash Controller
Freescale's Integrated Flash controller(IFC) v1.1.0 supports 40 bit
address bus width.
In case more than 32 bit address is used, the EXT registers should be set.
Add support of ext registers.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: York Sun <yorksun@freescale.com>
Signed-off-by: Prabhakar Kushwaha <prabhakar@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>