* linux-next: manual merge of the omap tree with Linus' tree
From: Stephen Rothwell @ 2009-10-30 0:46 UTC (permalink / raw)
To: Tony Lindgren, linux-omap; +Cc: linux-next, linux-kernel, Janusz Krzysztofik
Hi all,
Today's linux-next merge of the omap tree got conflicts in
arch/arm/mach-omap2/board-3430sdp.c, arch/arm/mach-omap2/board-ldp.c,
arch/arm/mach-omap2/board-omap3evm.c,
arch/arm/mach-omap2/board-omap3pandora.c,
arch/arm/mach-omap2/board-rx51-peripherals.c,
arch/arm/mach-omap2/board-rx51.c and arch/arm/mach-omap2/board-zoom2.c
between commit 6135434a54719c45fdc6add1ba4965dea89ab069 ("omap: Fix
omap-keypad by restoring old keypad.h without breaking omap2 boards that
use matrix_keypad") from Linus' tree and commit
ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move remaining
headers from include/mach to include/plat") from the omap tree.
I fixed them up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-3430sdp.c
index 0acb556,607845b..0000000
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -30,16 -29,17 +30,16 @@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/usb.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/usb.h>
+ #include <plat/common.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
- #include <mach/control.h>
- #include <mach/gpmc-smc91x.h>
+ #include <plat/control.h>
-#include <plat/keypad.h>
+ #include <plat/gpmc-smc91x.h>
#include "sdram-qimonda-hyb18m512160af-6.h"
#include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-ldp.c
index d57ec2f,5c82560..0000000
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -33,15 -32,16 +33,15 @@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
- #include <mach/mcspi.h>
+ #include <plat/mcspi.h>
#include <mach/gpio.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/gpmc.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
+ #include <plat/gpmc.h>
#include <asm/delay.h>
- #include <mach/control.h>
- #include <mach/usb.h>
+ #include <plat/control.h>
+ #include <plat/usb.h>
-#include <plat/keypad.h>
#include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-omap3evm.c
index 4c4d7f8,5d2310e..0000000
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -33,11 -34,12 +35,11 @@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
- #include <mach/board.h>
- #include <mach/mux.h>
- #include <mach/usb.h>
- #include <mach/common.h>
- #include <mach/mcspi.h>
+ #include <plat/board.h>
+ #include <plat/mux.h>
+ #include <plat/usb.h>
+ #include <plat/common.h>
+ #include <plat/mcspi.h>
-#include <plat/keypad.h>
#include "sdram-micron-mt46h32m32lf-6.h"
#include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-omap3pandora.c
index 5326e0d,d6bcfaa..0000000
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -34,13 -33,14 +34,13 @@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
- #include <mach/board.h>
- #include <mach/common.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
#include <mach/gpio.h>
#include <mach/hardware.h>
- #include <mach/mcspi.h>
- #include <mach/usb.h>
- #include <mach/mux.h>
+ #include <plat/mcspi.h>
+ #include <plat/usb.h>
-#include <plat/keypad.h>
+ #include <plat/mux.h>
#include "sdram-micron-mt46h32m32lf-6.h"
#include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index e34d96a,9e16d90..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -22,14 -21,15 +22,14 @@@
#include <linux/gpio.h>
#include <linux/mmc/host.h>
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
- #include <mach/onenand.h>
- #include <mach/gpmc-smc91x.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
-#include <plat/keypad.h>
+ #include <plat/onenand.h>
+ #include <plat/gpmc-smc91x.h>
#include "mmc-twl4030.h"
diff --cc arch/arm/mach-omap2/board-rx51.c
index 78869a9,060245e..0000000
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@@ -22,13 -22,14 +22,13 @@@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
- #include <mach/mcspi.h>
- #include <mach/mux.h>
- #include <mach/board.h>
- #include <mach/common.h>
- #include <mach/dma.h>
- #include <mach/gpmc.h>
- #include <mach/usb.h>
+ #include <plat/mcspi.h>
+ #include <plat/mux.h>
+ #include <plat/board.h>
+ #include <plat/common.h>
-#include <plat/keypad.h>
+ #include <plat/dma.h>
+ #include <plat/gpmc.h>
+ #include <plat/usb.h>
static struct omap_lcd_config rx51_lcd_config = {
.ctrl_name = "internal",
diff --cc arch/arm/mach-omap2/board-zoom2.c
index ea00486,56f9d84..0000000
--- a/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@@ -21,8 -20,9 +21,8 @@@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
- #include <mach/common.h>
- #include <mach/usb.h>
+ #include <plat/common.h>
+ #include <plat/usb.h>
-#include <plat/keypad.h>
#include "mmc-twl4030.h"
#include "sdram-micron-mt46h32m32lf-6.h"
^ permalink raw reply
* linux-next: manual merge of the net/wireless tree with the staging.current tree
From: Stephen Rothwell @ 2009-10-30 3:18 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Randy Dunlap, Greg Kroah-Hartman,
Larry Finger, John W. Linville
Hi all,
Today's linux-next merge of the net tree got conflicts in
drivers/staging/rtl8187se/Kconfig and drivers/staging/rtl8192e/Kconfig
between commit a26961e914c88e3e2ed46ef67f83a33ad7b57c36 ("Staging: fix
wireless drivers depends") from the staging.current tree and commit
125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper selection
of WIRELESS_EXT and WEXT_PRIV") from the net/wireless tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/rtl8187se/Kconfig
index 203c79b,faf6c60..0000000
--- a/drivers/staging/rtl8187se/Kconfig
+++ b/drivers/staging/rtl8187se/Kconfig
@@@ -1,6 -1,7 +1,7 @@@
config RTL8187SE
tristate "RealTek RTL8187SE Wireless LAN NIC driver"
- depends on PCI
+ depends on PCI && WLAN
- depends on WIRELESS_EXT
+ select WIRELESS_EXT
+ select WEXT_PRIV
default N
---help---
diff --cc drivers/staging/rtl8192e/Kconfig
index 37e4fde,5c077b9..0000000
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@@ -1,6 -1,7 +1,7 @@@
config RTL8192E
tristate "RealTek RTL8192E Wireless LAN NIC driver"
- depends on PCI
+ depends on PCI && WLAN
- depends on WIRELESS_EXT
+ select WIRELESS_EXT
+ select WEXT_PRIV
default N
---help---
^ permalink raw reply
* linux-next: origin tree build warning
From: Stephen Rothwell @ 2009-10-30 3:30 UTC (permalink / raw)
To: Brian King, James E.J. Bottomley
Cc: linux-next, linux-kernel, KOSAKI Motohiro, Andrew Morton,
linux-scsi
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
Hi all,
Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
drivers/scsi/ipr.c: In function 'ipr_log_enhanced_dual_ioa_error':
drivers/scsi/ipr.c:1336: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
drivers/scsi/ipr.c: In function 'ipr_log_dual_ioa_error':
drivers/scsi/ipr.c:1362: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
Exposed by commit 0a1b71b4008d332e57b5605a8228ea7aa96687e8 ("strstrip():
mark as as must_check").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the net/wireless tree with the staging.current tree
From: Greg KH @ 2009-10-30 3:44 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, netdev, linux-next, linux-kernel, Randy Dunlap,
Larry Finger, John W. Linville
In-Reply-To: <20091030141800.eb72e320.sfr@canb.auug.org.au>
On Fri, Oct 30, 2009 at 02:18:00PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got conflicts in
> drivers/staging/rtl8187se/Kconfig and drivers/staging/rtl8192e/Kconfig
> between commit a26961e914c88e3e2ed46ef67f83a33ad7b57c36 ("Staging: fix
> wireless drivers depends") from the staging.current tree and commit
> 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper selection
> of WIRELESS_EXT and WEXT_PRIV") from the net/wireless tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix
> for a while.
Thanks, the fix looks fine to me.
greg k-h
^ permalink raw reply
* linux-next: manual merge of the percpu tree with the kgdb tree
From: Stephen Rothwell @ 2009-10-30 8:20 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Jason Wessel
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
kernel/softlockup.c between commit
b460e1994445b5ebb97aaec0c29f893c246bd830 ("softlockup: add
sched_clock_tick() to avoid kernel warning on kgdb resume") from the kgdb
tree and commit 1871e52c76dd95895caeb772f845a1718dcbcd75 ("percpu: make
percpu symbols under kernel/ and mm/ unique") from the percpu tree.
Just context changes. I fixed it up (see below) and can carry the
changes as necessary.
I do wonder if the local variable name changes in the percpu tree change
were a good idea?
I also needed a further merge fixup (see further below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc kernel/softlockup.c
index a85ace2,d225790..0000000
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@@ -125,15 -117,7 +125,15 @@@ void softlockup_tick(void
return;
}
- if (touch_timestamp == 0) {
+ if (touch_ts == 0) {
+ if (unlikely(softlock_touch_sync[this_cpu])) {
+ /*
+ * If the time stamp was touched atomically
+ * make sure the scheduler tick is up to date.
+ */
+ softlock_touch_sync[this_cpu] = 0;
+ sched_clock_tick();
+ }
__touch_softlockup_watchdog();
return;
}
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Oct 2009 18:58:07 +1100
Subject: [PATCH] percpu: merge fixup for variable renaming
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/softlockup.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 560a01d..57f1295 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -84,7 +84,7 @@ static int softlock_touch_sync[NR_CPUS];
void touch_softlockup_watchdog_sync(void)
{
softlock_touch_sync[raw_smp_processor_id()] = 1;
- __raw_get_cpu_var(touch_timestamp) = 0;
+ __raw_get_cpu_var(softlockup_touch_ts) = 0;
}
void touch_all_softlockup_watchdogs(void)
--
1.6.5.2
^ permalink raw reply related
* linux-next: manual merge of the percpu tree with Linus' tree
From: Stephen Rothwell @ 2009-10-30 8:20 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Jiri Kosina
Hi all,
Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
warnings") from the percpu tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc mm/percpu.c
index d907971,e2e80fc..0000000
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@@ -369,7 -364,8 +367,8 @@@ static struct pcpu_chunk *pcpu_chunk_ad
* RETURNS:
* 0 if noop, 1 if successfully extended, -errno on failure.
*/
-static int pcpu_extend_area_map(struct pcpu_chunk *chunk)
+static int pcpu_extend_area_map(struct pcpu_chunk *chunk, unsigned long *flags)
+ __releases(lock) __acquires(lock)
{
int new_alloc;
int *new;
^ permalink raw reply
* linux-next: manual merge of the percpu tree with the kvm tree
From: Stephen Rothwell @ 2009-10-30 8:20 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Zachary Amsden, Marcelo Tosatti,
Alexander Graf, Avi Kivity
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/x86/kvm/svm.c between commits
41c39c658561cde3e27d3ae38c589598fc22f633 ("KVM: Activate Virtualization
On Demand") and 971ea59279a67136729fda49311f7edb8c2092a1 ("KVM: Fix
printk name error in svm.c") from the kvm tree and commit
0fe1e009541e925adc1748a605d8b66188e4b2ab ("percpu: make percpu symbols in
x86 unique") from the percpu tree.
Just context changes. I fixed them up (see below) and can carry the
changes as necessary.
I do wonder if the local variable name changes in the percpu tree change
were a good idea?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/kvm/svm.c
index 279a2ae,6c79a14..0000000
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@@ -316,46 -316,40 +316,46 @@@ static void svm_hardware_disable(void *
cpu_svm_disable();
}
-static void svm_hardware_enable(void *garbage)
+static int svm_hardware_enable(void *garbage)
{
- struct svm_cpu_data *svm_data;
+ struct svm_cpu_data *sd;
uint64_t efer;
struct descriptor_table gdt_descr;
struct desc_struct *gdt;
int me = raw_smp_processor_id();
+ rdmsrl(MSR_EFER, efer);
+ if (efer & EFER_SVME)
+ return -EBUSY;
+
if (!has_svm()) {
- printk(KERN_ERR "svm_cpu_init: err EOPNOTSUPP on %d\n", me);
- return;
+ printk(KERN_ERR "svm_hardware_enable: err EOPNOTSUPP on %d\n",
+ me);
+ return -EINVAL;
}
- svm_data = per_cpu(svm_data, me);
+ sd = per_cpu(svm_data, me);
- if (!svm_data) {
+ if (!sd) {
- printk(KERN_ERR "svm_cpu_init: svm_data is NULL on %d\n",
+ printk(KERN_ERR "svm_hardware_enable: svm_data is NULL on %d\n",
me);
- return;
+ return -EINVAL;
}
- svm_data->asid_generation = 1;
- svm_data->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;
- svm_data->next_asid = svm_data->max_asid + 1;
+ sd->asid_generation = 1;
+ sd->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;
+ sd->next_asid = sd->max_asid + 1;
kvm_get_gdt(&gdt_descr);
gdt = (struct desc_struct *)gdt_descr.base;
- svm_data->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS);
+ sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS);
wrmsrl(MSR_EFER, efer | EFER_SVME);
wrmsrl(MSR_VM_HSAVE_PA,
- page_to_pfn(svm_data->save_area) << PAGE_SHIFT);
+ page_to_pfn(sd->save_area) << PAGE_SHIFT);
+
+ return 0;
}
static void svm_cpu_uninit(int cpu)
^ permalink raw reply
* linux-next: Tree for October 30
From: Stephen Rothwell @ 2009-10-30 9:09 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8666 bytes --]
Hi all,
Changes since 20091029:
My fixes tree contains a build fix for powerpc/kvm.
The omap tree gained a few conflicts against Linus' tree.
The sh tree lost its conflict.
The net/wireless tree gained 2 conflicts against the staging.current tree.
The percpu tree gained conflicts against Linus' tree and the kgdb and kvm
trees.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 145 trees (counting Linus' and 22 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/davinci-next
Merging omap/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap1/serial.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-3430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ldp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom2.c
Merging pxa/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in drivers/hwmon/it87.c
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree.
CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c
CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/Kconfig
$ git rm -f drivers/net/sfc/sfe4001.c
Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
CONFLICT (content): Merge conflict in Documentation/dontdiff
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in drivers/acpi/video_detect.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Kconfig
CONFLICT (add/add): Merge conflict in drivers/block/drbd/Makefile
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_actlog.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_int.h
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_main.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_nl.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_receiver.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_req.c
CONFLICT (add/add): Merge conflict in drivers/block/drbd/drbd_worker.c
CONFLICT (add/add): Merge conflict in include/linux/drbd.h
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging limits/writable_limits
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in kernel/softlockup.c
CONFLICT (content): Merge conflict in mm/percpu.c
Applying: percpu: merge fixup for variable renaming
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the percpu tree with the kgdb tree
From: Tejun Heo @ 2009-10-30 10:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next,
linux-kernel, Jason Wessel
In-Reply-To: <20091030192038.381eba2d.sfr@canb.auug.org.au>
Hello,
Stephen Rothwell wrote:
> Just context changes. I fixed it up (see below) and can carry the
> changes as necessary.
>
> I do wonder if the local variable name changes in the percpu tree change
> were a good idea?
Yeap, I agree it's not pretty but I couldn't think of better way to do
it. The changes are almost randomly spread over different subsystems
and coordinating pull/push between all those trees and the percpu tree
would be too painful logistically, so I think it would be better to
channel most of them through the percpu tree and react to clashes that
happen (there shouldn't be too many during single devel cycle and
resolution shouldn't be too hard).
percpu#for-next tree won't be rebased and pulling it into the
conflicting tree should resolve the situation. Or if carrying the
fixup isn't too painful for you, doing it this way isn't too bad
either. I can collect the conflict resolutions and send it together
with pull request when the next merge window opens.
> I also needed a further merge fixup (see further below).
Patch looks good to me.
Thanks.
--
tejun
^ permalink raw reply
* Re: linux-next: manual merge of the percpu tree with Linus' tree
From: Tejun Heo @ 2009-10-30 10:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next,
linux-kernel, Jiri Kosina
In-Reply-To: <20091030192050.06a0f706.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
> between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
> pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
> 0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
> warnings") from the percpu tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
I'll pull master into for-next in a few days so that we can do sparse
cleanup pass over the whole tree on the latest tree.
Thanks.
--
tejun
^ permalink raw reply
* Re: linux-next: manual merge of the omap tree with Linus' tree
From: Tony Lindgren @ 2009-10-30 14:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik,
Alexander Shishkin, Ladislav Michl
In-Reply-To: <20091030114642.61bbeb2c.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [091029 17:46]:
> Hi all,
>
> Today's linux-next merge of the omap tree got a conflict in
> arch/arm/mach-omap1/serial.c between commit
> c33da3a80074094303d643a90ef589330b491270 ("omap1: Fix redundant UARTs pin
> muxing that can break other hardware support") from Linus' tree and
> commits 84f90c9cc81d8db172d4f768fc4010f508897366 ("omap: Change low-level
> serial init to use ioremap") and acb1aed4a5f23c545073b0d65302e5949f239fa0
> ("omap: Eliminate OMAP_MAX_NR_PORTS") from the omap tree.
>
> I fixed it up (see below) and can carry the fix for a while.
Thanks, will rebase omap for-next patches today.
Regards,
Tony
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap1/serial.c
> index d23979b,f82f66e..0000000
> --- a/arch/arm/mach-omap1/serial.c
> +++ b/arch/arm/mach-omap1/serial.c
> @@@ -130,7 -120,17 +120,15 @@@ void __init omap_serial_init(void
> serial_platform_data[2].uartclk = OMAP1510_BASE_BAUD * 16;
> }
>
> - for (i = 0; i < OMAP_MAX_NR_PORTS; i++) {
> + for (i = 0; i < ARRAY_SIZE(serial_platform_data) - 1; i++) {
> - unsigned char reg;
> -
> + /* Static mapping, never released */
> + serial_platform_data[i].membase =
> + ioremap(serial_platform_data[i].mapbase, SZ_2K);
> + if (!serial_platform_data[i].membase) {
> + printk(KERN_ERR "Could not ioremap uart%i\n", i);
> + continue;
> + }
> +
> switch (i) {
> case 0:
> uart1_ck = clk_get(NULL, "uart1_ck");
^ permalink raw reply
* Re: linux-next: manual merge of the omap tree with Linus' tree
From: Tony Lindgren @ 2009-10-30 14:46 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik
In-Reply-To: <20091030114659.9afe9765.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> [091029 17:46]:
> Hi all,
>
> Today's linux-next merge of the omap tree got conflicts in
> arch/arm/mach-omap2/board-3430sdp.c, arch/arm/mach-omap2/board-ldp.c,
> arch/arm/mach-omap2/board-omap3evm.c,
> arch/arm/mach-omap2/board-omap3pandora.c,
> arch/arm/mach-omap2/board-rx51-peripherals.c,
> arch/arm/mach-omap2/board-rx51.c and arch/arm/mach-omap2/board-zoom2.c
> between commit 6135434a54719c45fdc6add1ba4965dea89ab069 ("omap: Fix
> omap-keypad by restoring old keypad.h without breaking omap2 boards that
> use matrix_keypad") from Linus' tree and commit
> ce491cf85466c3377228c5a852ea627ec5136956 ("omap: headers: Move remaining
> headers from include/mach to include/plat") from the omap tree.
>
> I fixed them up (see below) and can carry the fix for a while.
Thanks, will clear this too today.
Tony
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-omap2/board-3430sdp.c
> index 0acb556,607845b..0000000
> --- a/arch/arm/mach-omap2/board-3430sdp.c
> +++ b/arch/arm/mach-omap2/board-3430sdp.c
> @@@ -30,16 -29,17 +30,16 @@@
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
>
> - #include <mach/mcspi.h>
> - #include <mach/mux.h>
> - #include <mach/board.h>
> - #include <mach/usb.h>
> - #include <mach/common.h>
> - #include <mach/dma.h>
> - #include <mach/gpmc.h>
> + #include <plat/mcspi.h>
> + #include <plat/mux.h>
> + #include <plat/board.h>
> + #include <plat/usb.h>
> + #include <plat/common.h>
> + #include <plat/dma.h>
> + #include <plat/gpmc.h>
>
> - #include <mach/control.h>
> - #include <mach/gpmc-smc91x.h>
> + #include <plat/control.h>
> -#include <plat/keypad.h>
> + #include <plat/gpmc-smc91x.h>
>
> #include "sdram-qimonda-hyb18m512160af-6.h"
> #include "mmc-twl4030.h"
> diff --cc arch/arm/mach-omap2/board-ldp.c
> index d57ec2f,5c82560..0000000
> --- a/arch/arm/mach-omap2/board-ldp.c
> +++ b/arch/arm/mach-omap2/board-ldp.c
> @@@ -33,15 -32,16 +33,15 @@@
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
>
> - #include <mach/mcspi.h>
> + #include <plat/mcspi.h>
> #include <mach/gpio.h>
> - #include <mach/board.h>
> - #include <mach/common.h>
> - #include <mach/gpmc.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
> + #include <plat/gpmc.h>
>
> #include <asm/delay.h>
> - #include <mach/control.h>
> - #include <mach/usb.h>
> + #include <plat/control.h>
> + #include <plat/usb.h>
> -#include <plat/keypad.h>
>
> #include "mmc-twl4030.h"
>
> diff --cc arch/arm/mach-omap2/board-omap3evm.c
> index 4c4d7f8,5d2310e..0000000
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@@ -33,11 -34,12 +35,11 @@@
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
>
> - #include <mach/board.h>
> - #include <mach/mux.h>
> - #include <mach/usb.h>
> - #include <mach/common.h>
> - #include <mach/mcspi.h>
> + #include <plat/board.h>
> + #include <plat/mux.h>
> + #include <plat/usb.h>
> + #include <plat/common.h>
> + #include <plat/mcspi.h>
> -#include <plat/keypad.h>
>
> #include "sdram-micron-mt46h32m32lf-6.h"
> #include "mmc-twl4030.h"
> diff --cc arch/arm/mach-omap2/board-omap3pandora.c
> index 5326e0d,d6bcfaa..0000000
> --- a/arch/arm/mach-omap2/board-omap3pandora.c
> +++ b/arch/arm/mach-omap2/board-omap3pandora.c
> @@@ -34,13 -33,14 +34,13 @@@
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
>
> - #include <mach/board.h>
> - #include <mach/common.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
> #include <mach/gpio.h>
> #include <mach/hardware.h>
> - #include <mach/mcspi.h>
> - #include <mach/usb.h>
> - #include <mach/mux.h>
> + #include <plat/mcspi.h>
> + #include <plat/usb.h>
> -#include <plat/keypad.h>
> + #include <plat/mux.h>
>
> #include "sdram-micron-mt46h32m32lf-6.h"
> #include "mmc-twl4030.h"
> diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
> index e34d96a,9e16d90..0000000
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@@ -22,14 -21,15 +22,14 @@@
> #include <linux/gpio.h>
> #include <linux/mmc/host.h>
>
> - #include <mach/mcspi.h>
> - #include <mach/mux.h>
> - #include <mach/board.h>
> - #include <mach/common.h>
> - #include <mach/dma.h>
> - #include <mach/gpmc.h>
> - #include <mach/onenand.h>
> - #include <mach/gpmc-smc91x.h>
> + #include <plat/mcspi.h>
> + #include <plat/mux.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
> + #include <plat/dma.h>
> + #include <plat/gpmc.h>
> -#include <plat/keypad.h>
> + #include <plat/onenand.h>
> + #include <plat/gpmc-smc91x.h>
>
> #include "mmc-twl4030.h"
>
> diff --cc arch/arm/mach-omap2/board-rx51.c
> index 78869a9,060245e..0000000
> --- a/arch/arm/mach-omap2/board-rx51.c
> +++ b/arch/arm/mach-omap2/board-rx51.c
> @@@ -22,13 -22,14 +22,13 @@@
> #include <asm/mach/arch.h>
> #include <asm/mach/map.h>
>
> - #include <mach/mcspi.h>
> - #include <mach/mux.h>
> - #include <mach/board.h>
> - #include <mach/common.h>
> - #include <mach/dma.h>
> - #include <mach/gpmc.h>
> - #include <mach/usb.h>
> + #include <plat/mcspi.h>
> + #include <plat/mux.h>
> + #include <plat/board.h>
> + #include <plat/common.h>
> -#include <plat/keypad.h>
> + #include <plat/dma.h>
> + #include <plat/gpmc.h>
> + #include <plat/usb.h>
>
> static struct omap_lcd_config rx51_lcd_config = {
> .ctrl_name = "internal",
> diff --cc arch/arm/mach-omap2/board-zoom2.c
> index ea00486,56f9d84..0000000
> --- a/arch/arm/mach-omap2/board-zoom2.c
> +++ b/arch/arm/mach-omap2/board-zoom2.c
> @@@ -21,8 -20,9 +21,8 @@@
> #include <asm/mach-types.h>
> #include <asm/mach/arch.h>
>
> - #include <mach/common.h>
> - #include <mach/usb.h>
> + #include <plat/common.h>
> + #include <plat/usb.h>
> -#include <plat/keypad.h>
>
> #include "mmc-twl4030.h"
> #include "sdram-micron-mt46h32m32lf-6.h"
^ permalink raw reply
* Re: linux-next: Tree for October 30
From: Gregory Haskins @ 2009-10-30 15:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, LKML
In-Reply-To: <20091030200916.e9331f66.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
Hi Stephen
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20091029:
>
< snip >
> Merging alacrity/linux-next
> CONFLICT (content): Merge conflict in drivers/net/Kconfig
> CONFLICT (content): Merge conflict in lib/Kconfig
So I've noticed this error in your reports for a while now, but I wasn't
quite sure if there was an action-item for me to address it.
Considering no one is complaining that the tree is broken, I assume
these kinds of conflicts are automatically resolved, but I am wondering
if there are steps I should take to prevent the conflict in the future?
Kind Regards,
-Greg
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 267 bytes --]
^ permalink raw reply
* Re: [PATCH -next] ia64/sn: fix percpu warnings
From: Jan Beulich @ 2009-10-30 16:05 UTC (permalink / raw)
To: Tony Luck, Tejun Heo
Cc: Stephen Rothwell, akpm, Randy Dunlap, Sam Ravnborg,
Andreas Gruenbacher, linux-ia64@vger.kernel.org, LKML,
linux-next@vger.kernel.org
In-Reply-To: <4AE9B812.2080307@kernel.org>
>>> Tejun Heo <tj@kernel.org> 29.10.09 16:43 >>>
>So, the problem is that genksyms can't understand the following.
>
> __typeof__(int [10]) my_ar;
> EXPORT_SYMBOL(my_ar);
In fact almost no use of typeof() works with genksyms: Out of
#include <linux/module.h>
extern int x;
#define export(t, n) typeof(t) export_##n; EXPORT_SYMBOL(export_##n)
export(x, a);
export(&x, b);
export(int, c);
export(int*, d);
export(int**, e);
export(int[4], f);
export(typeof(x), g);
export(typeof(&x), h);
export(typeof(x)*, i);
only c and d get a non-zero CRC. This is clearly due to the naive parsing
scripts/genksyms/parse.y does:
type_specifier:
simple_type_specifier
| cvar_qualifier
| TYPEOF_KEYW '(' decl_specifier_seq '*' ')'
| TYPEOF_KEYW '(' decl_specifier_seq ')'
...
>Would it be difficult to teach it how to parse it?
For someone familiar with bison/yacc this would seem not very difficult
a job, but as far as I'm concerned this is not something I would feel
comfortable trying to fix. Of course one could go the simplistic route
and just add the array case here, but imo this wouldn't be the right
way to deal with it.
Jan
^ permalink raw reply
* [PATCH -next] staging: fix wlags49 kconfigs
From: Randy Dunlap @ 2009-10-30 18:01 UTC (permalink / raw)
To: Stephen Rothwell, gregkh; +Cc: linux-next, LKML
In-Reply-To: <20091030200916.e9331f66.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix depends/selects in wlags49 drivers.
ERROR: "wireless_spy_update" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "iw_handler_get_spy" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "iw_handler_set_spy" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_dev_present" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_request_irq" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_register_driver" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_request_configuration" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_request_io" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_error_ret" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_error_func" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_unregister_driver" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_disable_device" [drivers/staging/wlags49_h25/wlags49_h25_cs.ko] undefined!
ERROR: "pcmcia_dev_present" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_request_irq" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_register_driver" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_request_configuration" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_request_io" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_error_ret" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_error_func" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_unregister_driver" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
ERROR: "pcmcia_disable_device" [drivers/staging/wlags49_h2/wlags49_h2_cs.ko] undefined!
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/staging/wlags49_h2/Kconfig | 3 ++-
drivers/staging/wlags49_h25/Kconfig | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--- linux-next-20091030.orig/drivers/staging/wlags49_h2/Kconfig
+++ linux-next-20091030/drivers/staging/wlags49_h2/Kconfig
@@ -1,6 +1,7 @@
config WLAGS49_H2
tristate "Agere Systems HERMES II Wireless PC Card Model 0110"
- depends on WLAN_80211 && WIRELESS_EXT
+ depends on WLAN_80211 && WIRELESS_EXT && PCMCIA
+ select WEXT_SPY
---help---
Driver for wireless cards using Agere's HERMES II chipset
which are identified with Manufacture ID: 0156,0003
--- linux-next-20091030.orig/drivers/staging/wlags49_h25/Kconfig
+++ linux-next-20091030/drivers/staging/wlags49_h25/Kconfig
@@ -1,6 +1,7 @@
config WLAGS49_H25
tristate "Linksys HERMES II.5 WCF54G_Wireless-G_CompactFlash_Card"
- depends on WLAN_80211 && WIRELESS_EXT
+ depends on WLAN_80211 && WIRELESS_EXT && PCMCIA
+ select WEXT_SPY
---help---
Driver for wireless cards using Agere's HERMES II.5 chipset
which are identified with Manufacture ID: 0156,0004
^ permalink raw reply
* Re: linux-next: manual merge of the percpu tree with Linus' tree
From: Stephen Rothwell @ 2009-10-31 4:23 UTC (permalink / raw)
To: Tejun Heo
Cc: Rusty Russell, Christoph Lameter, Ingo Molnar, linux-next,
linux-kernel, Jiri Kosina
In-Reply-To: <4AEAB9B1.4000304@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
HI Tejun,
On Fri, 30 Oct 2009 11:02:25 +0100 Tejun Heo <tj@kernel.org> wrote:
>
> I'll pull master into for-next in a few days so that we can do sparse
> cleanup pass over the whole tree on the latest tree.
Great, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the omap tree with Linus' tree
From: Stephen Rothwell @ 2009-10-31 4:30 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik,
Alexander Shishkin, Ladislav Michl
In-Reply-To: <20091030144517.GS7180@atomide.com>
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
Hi Tony,
On Fri, 30 Oct 2009 07:45:18 -0700 Tony Lindgren <tony@atomide.com> wrote:
>
> Thanks, will rebase omap for-next patches today.
Or you could just do a merge with Linus' tree (or the part of Linus' tree
that you clash with) ...
But thanks either way.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the omap tree with Linus' tree
From: Stephen Rothwell @ 2009-10-31 4:31 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap, linux-next, linux-kernel, Janusz Krzysztofik
In-Reply-To: <20091030144603.GT7180@atomide.com>
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
Hi Tony,
On Fri, 30 Oct 2009 07:46:04 -0700 Tony Lindgren <tony@atomide.com> wrote:
>
> Thanks, will clear this too today.
OK, thanks.
[Please don't quote unnecessary parts of the emails that you respond to]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: [PATCH 9/9] pcmcia: remove pcmcia_get_{first,next}_tuple()
From: Dominik Brodowski @ 2009-11-01 17:49 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Greg KH, devel, linux-next, linux-pcmcia
In-Reply-To: <20091029134640.5e728e30.randy.dunlap@oracle.com>
On Thu, Oct 29, 2009 at 01:46:40PM -0700, Randy Dunlap wrote:
> On Thu, 29 Oct 2009 01:02:50 +0100 Dominik Brodowski wrote:
>
> > On Wed, Oct 28, 2009 at 10:27:00PM +0100, Dominik Brodowski wrote:
> > > On Tue, Oct 27, 2009 at 07:39:23AM -0700, Greg KH wrote:
> > > > On Tue, Oct 27, 2009 at 06:12:24AM +0100, Dominik Brodowski wrote:
> > > > > Randy,
> > > > >
> > > > > On Mon, Oct 26, 2009 at 03:19:58PM -0700, Randy Dunlap wrote:
> > > > > > > Remove the pcmcia_get_{first,next}_tuple() calls no longer needed by
> > > > > > > (current) pcmcia device drivers.
> > > > > >
> > > > > > linux-next 20091026:
> > > > > >
> > > > > > drivers/staging/comedi/drivers/cb_das16_cs.c:155: error: implicit declaration of function 'pcmcia_get_first_tuple'
> > > > > > drivers/staging/comedi/drivers/cb_das16_cs.c:156: error: implicit declaration of function 'pcmcia_get_tuple_data'
> > > > > > drivers/staging/comedi/drivers/cb_das16_cs.c:883: error: implicit declaration of function 'pcmcia_get_next_tuple'
> > > > > >
> > > > > > There are also other comedi/ drivers that this randconfig didn't attempt
> > > > > > to build that are still using these same interfaces.
> > > > >
> > > > > What are the current rules on drivers in staging/ ? Do they need to be
> > > > > updated as well on API changes?
> > > >
> > > > You don't have to do it, no. I'll be glad to do so as long as I get a
> > > > hint as to what needs to be done :)
> > >
> > > These hints are in Documentation/pcmcia/driver-changes.txt . However, I'll
> > > try to get some patches cooked up myself tonight for those drivers. Whom
> > > shall I submit them to, or shall I just add them to the PCMCIA tree?
> >
> > Update all changes (already those not included in linux-next) which are in
> > the queue for 2.6.33 for all comedi PCMCIA drivers. Compile-tested only, and
> > I'll queue it up with the other PCMCIA patches.
> >
>
> Thanks for the update. What is the patch made against?
2.6.32-rc5 and quite a lot of pcmcia patches which I'll submit for
2.6.33-rc1. Will put it into the repository which "next" pulls from soon.
Best,
Dominik
^ permalink raw reply
* linux-next: nfs/nfsd trees fetch failed
From: Stephen Rothwell @ 2009-11-01 21:58 UTC (permalink / raw)
To: Trond Myklebust, J. Bruce Fields; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 501 bytes --]
Hi all,
Today's fetch of the nfs and nfsd trees failed like this:
nfs: git
git.linux-nfs.org[0: 141.212.112.37]: errno=Connection refused
fatal: unable to connect a socket (Connection refused)
nfsd: git
git.linux-nfs.org[0: 141.212.112.37]: errno=Connection refused
fatal: unable to connect a socket (Connection refused)
I will use the version of those trees from next-20091030.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: nfs/nfsd trees fetch failed
From: Trond Myklebust @ 2009-11-01 22:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: J. Bruce Fields, linux-next, linux-kernel
In-Reply-To: <20091102085835.651ddd02.sfr@canb.auug.org.au>
On Mon, 2009-11-02 at 08:58 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's fetch of the nfs and nfsd trees failed like this:
>
> nfs: git
> git.linux-nfs.org[0: 141.212.112.37]: errno=Connection refused
> fatal: unable to connect a socket (Connection refused)
> nfsd: git
> git.linux-nfs.org[0: 141.212.112.37]: errno=Connection refused
> fatal: unable to connect a socket (Connection refused)
>
> I will use the version of those trees from next-20091030.
Hi Stephen,
Yes. It's a known problem: an upgrade+reboot that went awry combined
with a remote console failure. I'm hoping that Bruce might be able to
help out when he returns to the office tomorrow morning...
Cheers
Trond
^ permalink raw reply
* Re: linux-next: nfs/nfsd trees fetch failed
From: Stephen Rothwell @ 2009-11-01 22:41 UTC (permalink / raw)
To: Trond Myklebust; +Cc: J. Bruce Fields, linux-next, linux-kernel
In-Reply-To: <1257113019.3916.6.camel@heimdal.trondhjem.org>
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
Hi Trond,
On Sun, 01 Nov 2009 17:03:38 -0500 Trond Myklebust <trond.myklebust@fys.uio.no> wrote:
>
> Yes. It's a known problem: an upgrade+reboot that went awry combined
> with a remote console failure. I'm hoping that Bruce might be able to
> help out when he returns to the office tomorrow morning...
OK, thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the sound tree with the tree
From: Stephen Rothwell @ 2009-11-02 1:22 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Peter Ujfalusi, Mike Rapoport,
Tony Lindgren, linux-omap
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
arch/arm/mach-omap2/board-omap3evm.c between commit
fa48a99192e3ee862f6d26c5248347c772b33b84 ("omap3: evm: initialize vmmc
and vmmc_aux regulators") from the omap tree and commit
f8d9aad96d0d7b57d0bf2e4de21fdda3a42f4449 ("OMAP: Platform support for
twl4030_codec MFD") from the sound tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-omap2/board-omap3evm.c
index 660ef8c,d9a6103..0000000
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -247,8 -211,7 +255,9 @@@ static struct twl4030_platform_data oma
.madc = &omap3evm_madc_data,
.usb = &omap3evm_usb_data,
.gpio = &omap3evm_gpio_data,
+ .vmmc1 = &omap3evm_vmmc1,
+ .vsim = &omap3evm_vsim,
+ .codec = &omap3evm_codec_data,
};
static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {
^ permalink raw reply
* linux-next: manual merge of the catalin tree with the arm-current tree
From: Stephen Rothwell @ 2009-11-02 3:12 UTC (permalink / raw)
To: Catalin Marinas; +Cc: linux-next, linux-kernel, Philby John, Russell King
Hi Catalin,
Today's linux-next merge of the catalin tree got a conflict in
arch/arm/mach-realview/core.h arch/arm/mach-realview/realview_pb1176.c
between commit 426fcd2a351e4bf662fee9fa2cf2603a48223164 ("ARM: 5774/1:
Fix Realview ARM1176PB board reboot") from the arc-current tree and
commit 35c6a7ecaa2aafd03dd5d62aa11fbc7a12b82520 ("RealView: Add default
memory configuration") from the catalin tree.
Overlapping additions. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-realview/core.h
index 699671f,1398854..0000000
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@@ -61,5 -64,7 +64,7 @@@ extern void realview_timer_init(unsigne
extern int realview_flash_register(struct resource *res, u32 num);
extern int realview_eth_register(const char *name, struct resource *res);
extern int realview_usb_register(struct resource *res);
+ extern void realview_fixup(struct machine_desc *mdesc, struct tag *tags,
+ char **from, struct meminfo *meminfo);
-
+extern void (*realview_reset)(char);
#endif
diff --cc arch/arm/mach-realview/realview_pb1176.c
index a6ba147,b1cdd37..0000000
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@@ -290,16 -290,18 +290,28 @@@ static struct sys_timer realview_pb1176
.init = realview_pb1176_timer_init,
};
+static void realview_pb1176_reset(char mode)
+{
+ void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) +
+ REALVIEW_SYS_RESETCTL_OFFSET;
+ void __iomem *rst_hdr_ctrl = __io_address(REALVIEW_SYS_BASE) +
+ REALVIEW_SYS_LOCK_OFFSET;
+ __raw_writel(REALVIEW_SYS_LOCKVAL_MASK, rst_hdr_ctrl);
+ __raw_writel(REALVIEW_PB1176_SYS_LOCKVAL_RSTCTL, hdr_ctrl);
+}
+
+ static void realview_pb1176_fixup(struct machine_desc *mdesc,
+ struct tag *tags, char **from,
+ struct meminfo *meminfo)
+ {
+ /*
+ * RealView PB1176 only has 128MB of RAM mapped at 0.
+ */
+ meminfo->bank[0].start = 0;
+ meminfo->bank[0].size = SZ_128M;
+ meminfo->nr_banks = 1;
+ }
+
static void __init realview_pb1176_init(void)
{
int i;
^ permalink raw reply
* linux-next: percpu/kvm/tip tree build failure
From: Stephen Rothwell @ 2009-11-02 5:17 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter
Cc: linux-next, linux-kernel, Avi Kivity, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Hi all,
Today's linux-next build (x86_64 allmodconfig) failed like this:
kernel/user-return-notifier.c: In function 'fire_user_return_notifiers':
kernel/user-return-notifier.c:45: error: expected expression before ')' token
Introduced by commit 7c68af6e32c73992bad24107311f3433c89016e2 ("core,
x86: Add user return notifiers") from the tip and kvm trees but revealed
by commit e0fdb0e050eae331046385643618f12452aa7e73 ("percpu: add __percpu
for sparse") from the percpu tree. Before that percpu tree commit,
"put_cpu_var()" would compile without error (even though it really needs
a parameter).
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 Nov 2009 15:54:43 +1100
Subject: [PATCH] x86: fix put_cpu_var invocation in user return notifiers code
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/user-return-notifier.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/user-return-notifier.c b/kernel/user-return-notifier.c
index 530ccb8..03e2d6f 100644
--- a/kernel/user-return-notifier.c
+++ b/kernel/user-return-notifier.c
@@ -42,5 +42,5 @@ void fire_user_return_notifiers(void)
head = &get_cpu_var(return_notifier_list);
hlist_for_each_entry_safe(urn, tmp1, tmp2, head, link)
urn->on_user_return(urn);
- put_cpu_var();
+ put_cpu_var(return_notifier_list);
}
--
1.6.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox