]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 22 Mar 2013 02:59:44 +0000 (13:59 +1100)]
Merge remote-tracking branch 'workqueues/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:53:12 +0000 (13:53 +1100)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:51:09 +0000 (13:51 +1100)]
Merge remote-tracking branch 'kvm/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:43:32 +0000 (13:43 +1100)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Fri, 22 Mar 2013 02:35:55 +0000 (13:35 +1100)]
Merge remote-tracking branch 'ftrace/for-next'
Conflicts:
kernel/trace/ftrace.c
Stephen Rothwell [Fri, 22 Mar 2013 02:28:49 +0000 (13:28 +1100)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Fri, 22 Mar 2013 02:27:18 +0000 (13:27 +1100)]
Merge remote-tracking branch 'spi-mb/spi-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:25:33 +0000 (13:25 +1100)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 02:23:30 +0000 (13:23 +1100)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
Documentation/virtual/virtio-spec.txt
Stephen Rothwell [Fri, 22 Mar 2013 01:58:06 +0000 (12:58 +1100)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:56:32 +0000 (12:56 +1100)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:54:53 +0000 (12:54 +1100)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:54:42 +0000 (12:54 +1100)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:53:11 +0000 (12:53 +1100)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:51:37 +0000 (12:51 +1100)]
Merge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:49:51 +0000 (12:49 +1100)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:48:18 +0000 (12:48 +1100)]
Merge remote-tracking branch 'mfd/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:46:39 +0000 (12:46 +1100)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:39:21 +0000 (12:39 +1100)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:39:15 +0000 (12:39 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:37:44 +0000 (12:37 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:35:54 +0000 (12:35 +1100)]
Merge branch 'device-mapper/master'
Stephen Rothwell [Fri, 22 Mar 2013 01:35:45 +0000 (12:35 +1100)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:31:18 +0000 (12:31 +1100)]
Merge remote-tracking branch 'cgroup/for-next'
Conflicts:
include/linux/res_counter.h
Stephen Rothwell [Fri, 22 Mar 2013 01:24:18 +0000 (12:24 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 22 Mar 2013 01:18:51 +0000 (12:18 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:11:17 +0000 (12:11 +1100)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:09:42 +0000 (12:09 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:07:56 +0000 (12:07 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 01:00:35 +0000 (12:00 +1100)]
Merge remote-tracking branch 'drm-intel/drm-intel-next-queued'
Stephen Rothwell [Fri, 22 Mar 2013 00:59:00 +0000 (11:59 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:57:27 +0000 (11:57 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:55:50 +0000 (11:55 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:51:56 +0000 (11:51 +1100)]
Merge remote-tracking branch 'ipsec-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:47:20 +0000 (11:47 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:47:10 +0000 (11:47 +1100)]
Merge remote-tracking branch 'dmaengine/next'
Conflicts:
drivers/dma/ioat/dma_v3.c
Stephen Rothwell [Fri, 22 Mar 2013 00:43:04 +0000 (11:43 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:41:18 +0000 (11:41 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:39:08 +0000 (11:39 +1100)]
Merge remote-tracking branch 'idle/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:37:18 +0000 (11:37 +1100)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:35:48 +0000 (11:35 +1100)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:34:02 +0000 (11:34 +1100)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Fri, 22 Mar 2013 00:33:47 +0000 (11:33 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:31:56 +0000 (11:31 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
drivers/media/platform/Kconfig
Stephen Rothwell [Fri, 22 Mar 2013 00:30:29 +0000 (11:30 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:29:05 +0000 (11:29 +1100)]
Merge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:27:40 +0000 (11:27 +1100)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:26:10 +0000 (11:26 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:24:37 +0000 (11:24 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:23:12 +0000 (11:23 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:21:07 +0000 (11:21 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:19:38 +0000 (11:19 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:17:50 +0000 (11:17 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:16:20 +0000 (11:16 +1100)]
Merge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:14:56 +0000 (11:14 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:13:31 +0000 (11:13 +1100)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 22 Mar 2013 00:12:02 +0000 (11:12 +1100)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 22 Mar 2013 00:10:34 +0000 (11:10 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 22 Mar 2013 00:10:31 +0000 (11:10 +1100)]
Merge remote-tracking branch 'btrfs/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:09:04 +0000 (11:09 +1100)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:07:42 +0000 (11:07 +1100)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 22 Mar 2013 00:06:19 +0000 (11:06 +1100)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Fri, 22 Mar 2013 00:04:56 +0000 (11:04 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 22 Mar 2013 00:02:27 +0000 (11:02 +1100)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Fri, 22 Mar 2013 00:01:04 +0000 (11:01 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:54:10 +0000 (10:54 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:52:45 +0000 (10:52 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:51:22 +0000 (10:51 +1100)]
Merge remote-tracking branch 'metag/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:50:00 +0000 (10:50 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:48:37 +0000 (10:48 +1100)]
Merge remote-tracking branch 'ia64/next'
Stephen Rothwell [Thu, 21 Mar 2013 23:47:04 +0000 (10:47 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 21 Mar 2013 23:47:02 +0000 (10:47 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Conflicts:
arch/arm/mach-zynq/common.c
Stephen Rothwell [Thu, 21 Mar 2013 23:45:32 +0000 (10:45 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:44:09 +0000 (10:44 +1100)]
Merge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:44 +0000 (10:41 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:33 +0000 (10:41 +1100)]
Merge remote-tracking branch 'dwmw2/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:33 +0000 (10:41 +1100)]
Merge remote-tracking branch 'ide/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:31 +0000 (10:41 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:25 +0000 (10:41 +1100)]
Merge remote-tracking branch 'md-current/for-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:21 +0000 (10:41 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:21 +0000 (10:41 +1100)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:20 +0000 (10:41 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:19 +0000 (10:41 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:18 +0000 (10:41 +1100)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:16 +0000 (10:41 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:14 +0000 (10:41 +1100)]
Merge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:13 +0000 (10:41 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 21 Mar 2013 23:41:11 +0000 (10:41 +1100)]
Merge remote-tracking branch 'arc-current/for-curr'
Johan Hovold [Tue, 19 Mar 2013 08:21:26 +0000 (09:21 +0100)]
USB: ti_usb_3410_5052: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:25 +0000 (09:21 +0100)]
USB: ssu100: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:24 +0000 (09:21 +0100)]
USB: spcp8x5: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:23 +0000 (09:21 +0100)]
USB: quatech2: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:22 +0000 (09:21 +0100)]
USB: pl2303: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:21 +0000 (09:21 +0100)]
USB: oti6858: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:20 +0000 (09:21 +0100)]
USB: mos7840: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:19 +0000 (09:21 +0100)]
USB: mos7840: fix broken TIOCMIWAIT
Make sure waiting processes are woken on modem-status changes.
Currently processes are only woken on termios changes regardless of
whether the modem status has changed.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:18 +0000 (09:21 +0100)]
USB: mct_u232: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:17 +0000 (09:21 +0100)]
USB: io_ti: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:16 +0000 (09:21 +0100)]
USB: io_edgeport: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold [Tue, 19 Mar 2013 08:21:15 +0000 (09:21 +0100)]
USB: ftdi_sio: fix use-after-free in TIOCMIWAIT
Use the port wait queue and make sure to check the serial disconnected
flag before accessing private port data after waking up.
This is is needed as the private port data (including the wait queue
itself) can be gone when waking up after a disconnect.
When switching to tty ports, some lifetime assumptions were changed.
Specifically, close can now be called before the final tty reference is
dropped as part of hangup at device disconnect. Even with the ftdi
private-data refcounting this means that the port private data can be
freed while a process is sleeping on modem-status changes and thus
cannot be relied on to detect disconnects when woken up.
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>