]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoAdd support for Aspire 1410 BIOS v1.3314. Fixes the following error:
Clay Carpenter [Wed, 3 Aug 2011 00:52:35 +0000 (10:52 +1000)]
Add support for Aspire 1410 BIOS v1.3314.  Fixes the following error:

acerhdf: unknown (unsupported) BIOS version Acer/Aspire 1410/v1.3314,
please report, aborting!

Signed-off-by: Clay Carpenter <claycarpenter@gmail.com>
Signed-off-by: Peter Feuerer <peter@piie.net>
Cc: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoThe parameter's origin type is long. On an i386 architecture, it can
hank [Wed, 3 Aug 2011 00:52:34 +0000 (10:52 +1000)]
The parameter's origin type is long.  On an i386 architecture, it can
easily be larger than 0x80000000, causing this function to convert it to a
sign-extended u64 type.  Change the type to unsigned long so we get the
correct result.

[akpm@linux-foundation.org: build fix]
Signed-off-by: hank <pyu@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <john.stultz@linaro.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoWhen no floppy is found the module code can be released while a timer
Carsten Emde [Wed, 3 Aug 2011 00:52:32 +0000 (10:52 +1000)]
When no floppy is found the module code can be released while a timer
function is pending or about to be executed.

CPU0                                  CPU1
      floppy_init()
timer_softirq()
   spin_lock_irq(&base->lock);
   detach_timer();
   spin_unlock_irq(&base->lock);
   -> Interrupt
del_timer();
        return -ENODEV;
                                      module_cleanup();
   <- EOI
   call_timer_fn();
   OOPS

Use del_timer_sync() to prevent this.

Signed-off-by: Carsten Emde <C.Emde@osadl.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoBecause of x86-implement-strict-user-copy-checks-for-x86_64.patch
KAMEZAWA Hiroyuki [Wed, 3 Aug 2011 00:52:32 +0000 (10:52 +1000)]
Because of x86-implement-strict-user-copy-checks-for-x86_64.patch

When compiling mm/mempolicy.c the following warning is shown.

In file included from arch/x86/include/asm/uaccess.h:572,
                 from include/linux/uaccess.h:5,
                 from include/linux/highmem.h:7,
                 from include/linux/pagemap.h:10,
                 from include/linux/mempolicy.h:70,
                 from mm/mempolicy.c:68:
In function `copy_from_user',
    inlined from `compat_sys_get_mempolicy' at mm/mempolicy.c:1415:
arch/x86/include/asm/uaccess_64.h:64: warning: call to `copy_from_user_overflow' declared with attribute warning: copy_from_user() buffer size is not provably correct
  LD      mm/built-in.o

Fix this by passing correct buffer size value.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoOn thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex. It
Vasiliy Kulikov [Wed, 3 Aug 2011 00:52:32 +0000 (10:52 +1000)]
On thread exit shm_exit_ns() is called, it uses shm_ids(ns).rw_mutex.  It
is initialized in shm_init(), but it is not called yet at the moment of
kernel threads exit.  Some kernel threads are created in
do_pre_smp_initcalls(), and shm_init() is called in do_initcalls().

Static initialization of shm_ids(init_ipc_ns).rw_mutex fixes the race.

It fixes a kernel oops:

Unable to handle kernel NULL pointer dereference at virtual address 00000000
...
[<c0320090>] (__down_write_nested+0x88/0xe0) from [<c015da08>] (exit_shm+0x28/0x48)
[<c015da08>] (exit_shm+0x28/0x48) from [<c002e550>] (do_exit+0x59c/0x750)
[<c002e550>] (do_exit+0x59c/0x750) from [<c003eaac>] (____call_usermodehelper+0x13c/0x154)
[<c003eaac>] (____call_usermodehelper+0x13c/0x154) from [<c000f630>] (kernel_thread_exit+0x0/0x8)
Code: 1afffffa e597c00c e58d0000 e587d00c (e58cd000)

Reported-by: Manuel Lauss <manuel.lauss@googlemail.com>
Reported-by: Richard Weinberger <richard@nod.at>
Reported-by: Marc Zyngier <maz@misterjones.org>
Tested-by: Manuel Lauss <manuel.lauss@googlemail.com>
Tested-by: Richard Weinberger <richard@nod.at>
Tested-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoThis patch makes two changes:
Will Drewry [Wed, 3 Aug 2011 00:52:30 +0000 (10:52 +1000)]
This patch makes two changes:
- check for trailing characters after parsing PARTNROFF=%d
- disable root_wait if a syntax error is seen

The former assures that bad input like
  root=PARTUUID=<validuuid>/PARTNROFF=5abc
properly fails by attempting to parse an extra character after the
integer.  If the integer is missing, sscanf will fail, but if it is
present, and there is a trailing non-nul character, then the extra
field will be parsed and the error case will be hit.

The latter assures that if rootwait has been specified, the error
message isn't flooded to the screen during rootwait's loop.  Instead of
adding printk ratelimiting, root_wait was disabled.  This stays true to
the rootwait goal of support asynchronous device arrival while still
providing users with helpful messages.  With ratelimiting or disabling
logging on rootwait, a range of edge cases turn up where the user would
not be informed of an error properly.

Signed-off-by: Will Drewry <wad@chromium.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoExpand root=PARTUUID=UUID syntax to support selecting a root partition by
Will Drewry [Wed, 3 Aug 2011 00:52:30 +0000 (10:52 +1000)]
Expand root=PARTUUID=UUID syntax to support selecting a root partition by
integer offset from a known, unique partition.  This approach provides
similar properties to specifying a device and partition number, but using
the UUID as the unique path prior to evaluating the offset.

For example,
  root=PARTUUID=99DE9194-FC15-4223-9192-FC243948F88B/PARTNROFF=1
selects the partition with UUID 99DE.. then select the next
partition.

This change is motivated by a particular usecase in Chromium OS where the
bootloader can easily determine what partition it is on (by UUID) but
doesn't perform general partition table walking.

That said, support for this model provides a direct mechanism for the user
to modify the root partition to boot without specifically needing to
extract each UUID or update the bootloader explicitly when the root
partition UUID is changed (if it is recreated to be larger, for instance).
 Pinning to a /boot-style partition UUID allows the arbitrary root
partition reconfiguration/modifications with slightly less ambiguity than
just [dev][partition] and less stringency than the specific root partition
UUID.

Signed-off-by: Will Drewry <wad@chromium.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
12 years agoMerge remote-tracking branch 'moduleh/module.h-split'
Stephen Rothwell [Mon, 22 Aug 2011 03:18:46 +0000 (13:18 +1000)]
Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
include/linux/dmaengine.h

12 years agoMerge remote-tracking branch 'writeback/next'
Stephen Rothwell [Mon, 22 Aug 2011 03:16:23 +0000 (13:16 +1000)]
Merge remote-tracking branch 'writeback/next'

12 years agoMerge remote-tracking branch 'tmem/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:11:24 +0000 (13:11 +1000)]
Merge remote-tracking branch 'tmem/linux-next'

12 years agoMerge remote-tracking branch 'regmap/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:09:51 +0000 (13:09 +1000)]
Merge remote-tracking branch 'regmap/for-next'

12 years agoMerge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 22 Aug 2011 03:08:31 +0000 (13:08 +1000)]
Merge remote-tracking branch 'namespace/master'

12 years agoMerge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 22 Aug 2011 03:07:08 +0000 (13:07 +1000)]
Merge remote-tracking branch 'sysctl/master'

12 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:05:41 +0000 (13:05 +1000)]
Merge remote-tracking branch 'percpu/for-next'

12 years agoMerge remote-tracking branch 'edac-amd/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:04:24 +0000 (13:04 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'

12 years agoMerge remote-tracking branch 'xen-two/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 03:02:59 +0000 (13:02 +1000)]
Merge remote-tracking branch 'xen-two/linux-next'

12 years agoMerge remote-tracking branch 'xen/upstream/xen'
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

12 years agoMerge remote-tracking branch 'rcu/rcu/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:55:06 +0000 (12:55 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'

12 years agoMerge remote-tracking branch 'tip/auto-latest'
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

12 years agoMerge remote-tracking branch 'devicetree/devicetree/next'
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

12 years agoMerge remote-tracking branch 'i7300_edac/linux_next'
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

12 years agoMerge remote-tracking branch 'i7core_edac/linux_next'
Stephen Rothwell [Mon, 22 Aug 2011 02:46:02 +0000 (12:46 +1000)]
Merge remote-tracking branch 'i7core_edac/linux_next'

12 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:43:19 +0000 (12:43 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'

12 years agoMerge remote-tracking branch 'pm/linux-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

12 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:32:11 +0000 (12:32 +1000)]
Merge remote-tracking branch 'trivial/for-next'

12 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:30:51 +0000 (12:30 +1000)]
Merge remote-tracking branch 'osd/linux-next'

12 years agoMerge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:29:23 +0000 (12:29 +1000)]
Merge remote-tracking branch 'watchdog/master'

12 years agoMerge remote-tracking branch 'agp/agp-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:28:45 +0000 (12:28 +1000)]
Merge remote-tracking branch 'agp/agp-next'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:26:10 +0000 (12:26 +1000)]
Merge remote-tracking branch 'security/next'

12 years agoMerge remote-tracking branch 'voltage/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:24:51 +0000 (12:24 +1000)]
Merge remote-tracking branch 'voltage/for-next'

12 years agoMerge remote-tracking branch 'viafb/viafb-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:23:27 +0000 (12:23 +1000)]
Merge remote-tracking branch 'viafb/viafb-next'

12 years agoMerge remote-tracking branch 'fbdev/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:22:04 +0000 (12:22 +1000)]
Merge remote-tracking branch 'fbdev/master'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:20:37 +0000 (12:20 +1000)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:20:30 +0000 (12:20 +1000)]
Merge remote-tracking branch 'slab/for-next'

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:20:22 +0000 (12:20 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:19:01 +0000 (12:19 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'

12 years agoMerge remote-tracking branch 'leds/for-mm'
Stephen Rothwell [Mon, 22 Aug 2011 02:18:55 +0000 (12:18 +1000)]
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig

12 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:17:11 +0000 (12:17 +1000)]
Merge remote-tracking branch 'battery/master'

12 years agoMerge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 22 Aug 2011 02:15:44 +0000 (12:15 +1000)]
Merge branch 'quilt/device-mapper'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:14:17 +0000 (12:14 +1000)]
Merge remote-tracking branch 'input/next'

12 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Mon, 22 Aug 2011 02:13:00 +0000 (12:13 +1000)]
Merge branch 'quilt/rr'

12 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 22 Aug 2011 02:11:44 +0000 (12:11 +1000)]
Merge remote-tracking branch 'cpufreq/next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 02:10:17 +0000 (12:10 +1000)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:05:02 +0000 (12:05 +1000)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/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

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 22 Aug 2011 02:02:12 +0000 (12:02 +1000)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless/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

12 years agoMerge remote-tracking branch 'net/master'
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

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 22 Aug 2011 01:42:12 +0000 (11:42 +1000)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:42:05 +0000 (11:42 +1000)]
Merge remote-tracking branch 'ibft/master'

12 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:41:59 +0000 (11:41 +1000)]
Merge remote-tracking branch 'swiotlb/master'

12 years agoMerge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:40:40 +0000 (11:40 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'

12 years agoMerge remote-tracking branch 'cpupowerutils/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:39:27 +0000 (11:39 +1000)]
Merge remote-tracking branch 'cpupowerutils/master'

12 years agoMerge remote-tracking branch 'acpi/test'
Stephen Rothwell [Mon, 22 Aug 2011 01:38:10 +0000 (11:38 +1000)]
Merge remote-tracking branch 'acpi/test'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 22 Aug 2011 01:36:52 +0000 (11:36 +1000)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:36:47 +0000 (11:36 +1000)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:35:28 +0000 (11:35 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:34:13 +0000 (11:34 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 22 Aug 2011 01:33:02 +0000 (11:33 +1000)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Mon, 22 Aug 2011 01:31:50 +0000 (11:31 +1000)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:30:32 +0000 (11:30 +1000)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:29:10 +0000 (11:29 +1000)]
Merge remote-tracking branch 'xfs/master'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:27:58 +0000 (11:27 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:26:47 +0000 (11:26 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:25:27 +0000 (11:25 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:24:15 +0000 (11:24 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:23:02 +0000 (11:23 +1000)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:21:49 +0000 (11:21 +1000)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:20:34 +0000 (11:20 +1000)]
Merge remote-tracking branch 'fuse/for-next'

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 22 Aug 2011 01:19:17 +0000 (11:19 +1000)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:17:59 +0000 (11:17 +1000)]
Merge remote-tracking branch 'ceph/for-next'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 22 Aug 2011 01:16:46 +0000 (11:16 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Mon, 22 Aug 2011 01:15:35 +0000 (11:15 +1000)]
Merge remote-tracking branch 'tile/master'

12 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 22 Aug 2011 01:14:23 +0000 (11:14 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 22 Aug 2011 01:13:10 +0000 (11:13 +1000)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 22 Aug 2011 01:11:54 +0000 (11:11 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch '4xx/next'
Stephen Rothwell [Mon, 22 Aug 2011 01:10:42 +0000 (11:10 +1000)]
Merge remote-tracking branch '4xx/next'

12 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 22 Aug 2011 01:09:29 +0000 (11:09 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:08:13 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:07:01 +0000 (11:07 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:05:49 +0000 (11:05 +1000)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Mon, 22 Aug 2011 01:04:37 +0000 (11:04 +1000)]
Merge remote-tracking branch 'ia64/test'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:03:21 +0000 (11:03 +1000)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 01:02:10 +0000 (11:02 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 01:00:55 +0000 (11:00 +1000)]
Merge remote-tracking branch 's5p/for-next'

12 years agoMerge remote-tracking branch 'msm/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

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
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

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 22 Aug 2011 00:56:57 +0000 (10:56 +1000)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:41 +0000 (10:55 +1000)]
Merge remote-tracking branch 'fbdev-current/fbdev-fixes-for-linus'

12 years agoMerge 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 'rmobile-current/rmobile-fixes-for-linus'

12 years agoMerge remote-tracking branch 'sh-current/sh-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'

12 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:27 +0000 (10:55 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

12 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:25 +0000 (10:55 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'

12 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:24 +0000 (10:55 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

12 years agoMerge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:23 +0000 (10:55 +1000)]
Merge remote-tracking branch 'wireless-current/master'

12 years agoMerge remote-tracking branch 'net-current/master'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:22 +0000 (10:55 +1000)]
Merge remote-tracking branch 'net-current/master'

12 years agoMerge remote-tracking branch 'sparc-current/master'
Stephen Rothwell [Mon, 22 Aug 2011 00:55:21 +0000 (10:55 +1000)]
Merge remote-tracking branch 'sparc-current/master'

12 years agohwmon: Avoid building drivers for powerpc that read/write ISA addresses
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>
12 years agoInput: ep93xx_keypad - add missing include of linux/module.h
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>
12 years agoInput: tnetv107x-ts - add missing include of linux/module.h
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>