]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 22 Aug 2011 03:08:31 +0000 (13:08 +1000)]
Merge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 22 Aug 2011 03:07:08 +0000 (13:07 +1000)]
Merge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 22 Aug 2011 03:05:41 +0000 (13:05 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:04:24 +0000 (13:04 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:02:59 +0000 (13:02 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:01:43 +0000 (13:01 +1000)]
Merge remote-tracking branch 'xen/upstream/xen'
Conflicts:
arch/x86/xen/Makefile
Stephen Rothwell [Mon, 22 Aug 2011 02:55:06 +0000 (12:55 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:49:24 +0000 (12:49 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/mm/fault.c
Stephen Rothwell [Mon, 22 Aug 2011 02:49:06 +0000 (12:49 +1000)]
Merge remote-tracking branch 'devicetree/devicetree/next'
Conflicts:
drivers/of/base.c
Stephen Rothwell [Mon, 22 Aug 2011 02:47:46 +0000 (12:47 +1000)]
Merge remote-tracking branch 'i7300_edac/linux_next'
Conflicts:
arch/x86/kernel/cpu/mcheck/mce.c
Stephen Rothwell [Mon, 22 Aug 2011 02:46:02 +0000 (12:46 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Mon, 22 Aug 2011 02:43:19 +0000 (12:43 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:36:59 +0000 (12:36 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Conflicts:
arch/s390/include/asm/thread_info.h
Stephen Rothwell [Mon, 22 Aug 2011 02:32:11 +0000 (12:32 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:30:51 +0000 (12:30 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:29:23 +0000 (12:29 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:28:45 +0000 (12:28 +1000)]
Merge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:26:10 +0000 (12:26 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:24:51 +0000 (12:24 +1000)]
Merge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:23:27 +0000 (12:23 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:22:04 +0000 (12:22 +1000)]
Merge remote-tracking branch 'fbdev/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:20:37 +0000 (12:20 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:20:30 +0000 (12:20 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:20:22 +0000 (12:20 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:19:01 +0000 (12:19 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:18:55 +0000 (12:18 +1000)]
Merge remote-tracking branch 'leds/for-mm'
Conflicts:
drivers/leds/Kconfig
Stephen Rothwell [Mon, 22 Aug 2011 02:17:11 +0000 (12:17 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:15:44 +0000 (12:15 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 22 Aug 2011 02:14:17 +0000 (12:14 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:13:00 +0000 (12:13 +1000)]
Merge branch 'quilt/rr'
Stephen Rothwell [Mon, 22 Aug 2011 02:11:44 +0000 (12:11 +1000)]
Merge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:10:17 +0000 (12:10 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:05:02 +0000 (12:05 +1000)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:03:37 +0000 (12:03 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Conflicts:
drivers/mtd/maps/lantiq-flash.c
Stephen Rothwell [Mon, 22 Aug 2011 02:02:12 +0000 (12:02 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:00:37 +0000 (12:00 +1000)]
Merge remote-tracking branch 'wireless/master'
Conflicts:
drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c
drivers/staging/ath6kl/os/linux/ar6000_drv.c
Stephen Rothwell [Mon, 22 Aug 2011 01:50:57 +0000 (11:50 +1000)]
Merge remote-tracking branch 'net/master'
Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
Stephen Rothwell [Mon, 22 Aug 2011 01:42:12 +0000 (11:42 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 22 Aug 2011 01:42:05 +0000 (11:42 +1000)]
Merge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:41:59 +0000 (11:41 +1000)]
Merge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:40:40 +0000 (11:40 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:39:27 +0000 (11:39 +1000)]
Merge remote-tracking branch 'cpupowerutils/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:38:10 +0000 (11:38 +1000)]
Merge remote-tracking branch 'acpi/test'
Stephen Rothwell [Mon, 22 Aug 2011 01:36:52 +0000 (11:36 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 22 Aug 2011 01:36:47 +0000 (11:36 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:35:28 +0000 (11:35 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:34:13 +0000 (11:34 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:33:02 +0000 (11:33 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 22 Aug 2011 01:31:50 +0000 (11:31 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 22 Aug 2011 01:30:32 +0000 (11:30 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:29:10 +0000 (11:29 +1000)]
Merge remote-tracking branch 'xfs/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:27:58 +0000 (11:27 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:26:47 +0000 (11:26 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:25:27 +0000 (11:25 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:24:15 +0000 (11:24 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:23:02 +0000 (11:23 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:21:49 +0000 (11:21 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:20:34 +0000 (11:20 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:19:17 +0000 (11:19 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 22 Aug 2011 01:17:59 +0000 (11:17 +1000)]
Merge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:16:46 +0000 (11:16 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 22 Aug 2011 01:15:35 +0000 (11:15 +1000)]
Merge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:14:23 +0000 (11:14 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 22 Aug 2011 01:13:10 +0000 (11:13 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 22 Aug 2011 01:11:54 +0000 (11:11 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 22 Aug 2011 01:10:42 +0000 (11:10 +1000)]
Merge remote-tracking branch '4xx/next'
Stephen Rothwell [Mon, 22 Aug 2011 01:09:29 +0000 (11:09 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 22 Aug 2011 01:08:13 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:07:01 +0000 (11:07 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:05:49 +0000 (11:05 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:04:37 +0000 (11:04 +1000)]
Merge remote-tracking branch 'ia64/test'
Stephen Rothwell [Mon, 22 Aug 2011 01:03:21 +0000 (11:03 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:02:10 +0000 (11:02 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 01:00:55 +0000 (11:00 +1000)]
Merge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 00:59:39 +0000 (10:59 +1000)]
Merge remote-tracking branch 'msm/for-next'
Conflicts:
arch/arm/mach-msm/io.c
Stephen Rothwell [Mon, 22 Aug 2011 00:58:14 +0000 (10:58 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
Stephen Rothwell [Mon, 22 Aug 2011 00:56:57 +0000 (10:56 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:41 +0000 (10:55 +1000)]
Merge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:39 +0000 (10:55 +1000)]
Merge remote-tracking branch 'rmobile-current/rmobile-fixes-for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:39 +0000 (10:55 +1000)]
Merge remote-tracking branch 'sh-current/sh-fixes-for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:27 +0000 (10:55 +1000)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:25 +0000 (10:55 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:24 +0000 (10:55 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:23 +0000 (10:55 +1000)]
Merge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:22 +0000 (10:55 +1000)]
Merge remote-tracking branch 'net-current/master'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:21 +0000 (10:55 +1000)]
Merge remote-tracking branch 'sparc-current/master'
Dean Nelson [Mon, 22 Aug 2011 00:41:50 +0000 (10:41 +1000)]
hwmon: Avoid building drivers for powerpc that read/write ISA addresses
A modprobe of hwmon drivers that read/write ISA addresses on a powerpc results
in a kernel Oops. These reads/writes are being done via the inb()/in_8() and
outb()/out_8() macros.
Prevent these drivers from being built for powerpc.
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Axel Lin [Sun, 21 Aug 2011 19:48:08 +0000 (12:48 -0700)]
Input: ep93xx_keypad - add missing include of linux/module.h
ep93xx_keypad.c uses interfaces from linux/module.h,
so it should include that file. This patch fixes build errors.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Axel Lin [Sun, 21 Aug 2011 19:48:04 +0000 (12:48 -0700)]
Input: tnetv107x-ts - add missing include of linux/module.h
tnetv107x-ts.c uses interfaces from linux/module.h,
so it should include that file. This patch fixes build errors.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Josef Bacik [Sat, 20 Aug 2011 12:29:51 +0000 (08:29 -0400)]
Btrfs: fix 64 bit divide problem
This fixes a regression introduced by commit
cdcb725c05fe ("Btrfs: check
if there is enough space for balancing smarter"). We can't do 64-bit
divides on 32-bit architectures.
In cases where we need to divide/multiply by 2 we should just left/right
shift respectively, and in cases where theres N number of devices use
do_div. Also make the counters u64 to match up with rw_devices.
Thanks,
Signed-off-by: Josef Bacik <josef@redhat.com>
Acked-and-tested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Sun, 21 Aug 2011 13:59:41 +0000 (06:59 -0700)]
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: flush any pending end_io requests before DIO reads w/dioread_nolock
ext4: fix nomblk_io_submit option so it correctly converts uninit blocks
ext4: Resolve the hang of direct i/o read in handling EXT4_IO_END_UNWRITTEN.
ext4: call ext4_ioend_wait and ext4_flush_completed_IO in ext4_evict_inode
ext4: Fix ext4_should_writeback_data() for no-journal mode
Linus Torvalds [Sun, 21 Aug 2011 13:59:02 +0000 (06:59 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
ALSA: hda - Don't spew too many ELD errors
ALSA: usb-audio - Fix missing mixer dB information
ALSA: hda - Add "PCM" volume to vmaster slave list
ALSA: hda - Fix duplicated capture-volume creation for ALC268 models
ALSA: ac97: Add HP Compaq dc5100 SFF(PT003AW) to Headphone Jack Sense whitelist
ALSA: snd_usb_caiaq: track submitted output urbs
Takashi Iwai [Sun, 21 Aug 2011 13:42:48 +0000 (15:42 +0200)]
Merge branch 'topic/asoc' into for-next
Randy Dunlap [Sat, 20 Aug 2011 18:49:43 +0000 (11:49 -0700)]
pci: fix new kernel-doc warning in pci.c
Fix new kernel-doc warning in pci.c:
Warning(drivers/pci/pci.c:3259): No description found for parameter 'mps'
Warning(drivers/pci/pci.c:3259): Excess function parameter 'rq' description in 'pcie_set_mps'
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
David S. Miller [Sun, 21 Aug 2011 00:25:36 +0000 (17:25 -0700)]
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
David S. Miller [Sun, 21 Aug 2011 00:14:54 +0000 (17:14 -0700)]
sparc: Allow handling signals when stack is corrupted.
If we can't push the pending register windows onto the user's stack,
we disallow signal delivery even if the signal would be delivered on a
valid seperate signal stack.
Add a register window save area in the signal frame, and store any
unsavable windows there.
On sigreturn, if any windows are still queued up in the signal frame,
try to push them back onto the stack and if that fails we kill the
process immediately.
This allows the debug/tst-longjmp_chk2 glibc test case to pass.
Signed-off-by: David S. Miller <davem@davemloft.net>
Jiejing Zhang [Sat, 20 Aug 2011 21:38:01 +0000 (14:38 -0700)]
Input: max11801_ts - correct license statement
The original license statement was confusing since it was unclear if
the license was pure GPLv2 or GPLv2+ and did not match the license
of the driver max11801_ts was derived from. The license is GPLv2+.
Signed-off-by: Jiejing Zhang <jiejing.zhang@freescale.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Changli Gao [Fri, 19 Aug 2011 04:44:18 +0000 (04:44 +0000)]
net: Preserve ooo_okay when copying skb header
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Vladimir Zapolskiy [Sat, 20 Aug 2011 21:15:55 +0000 (14:15 -0700)]
dm9000: define debug level as a module parameter
This change allows to get driver specific debug messages output
providing a module parameter. As far as the maximum level of verbosity
is too high, it is demoted by default.
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Daniel Schwierzeck [Fri, 19 Aug 2011 12:04:20 +0000 (12:04 +0000)]
atm: br2684: Fix oops due to skb->dev being NULL
This oops have been already fixed with commit
27141666b69f535a4d63d7bc6d9e84ee5032f82a
atm: [br2684] Fix oops due to skb->dev being NULL
It happens that if a packet arrives in a VC between the call to open it on
the hardware and the call to change the backend to br2684, br2684_regvcc
processes the packet and oopses dereferencing skb->dev because it is
NULL before the call to br2684_push().
but have been introduced again with commit
b6211ae7f2e56837c6a4849316396d1535606e90
atm: Use SKB queue and list helpers instead of doing it by-hand.
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>