Linux-Next discussions
 help / color / mirror / Atom feed

* Re: linux-next: manual merge of the davinci tree with the arm tree
From: Kevin Hilman @ 2010-10-19 15:46 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Sekhar Nori, Nicolas Pitre,
	Russell King
In-Reply-To: <20101018103152.33fa12cd.sfr@canb.auug.org.au>

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Hi Kevin,
>
> Today's linux-next merge of the davinci tree got a conflicts in
> arch/arm/mach-davinci/board-da830-evm.c and
> arch/arm/mach-davinci/board-da850-evm.c between commit
> 861bd81ee62a0d6759144c22909a8a3938951656 ("arm: remove
> machine_desc.io_pg_offst and .phys_io") from the arm tree and commit
> 48ea89eabee96019a4a84615af921f8703320abb ("davinci: introduce support for
> AM1x ARM9 microprocessors") from the davinci tree.
>
> Just context changes,  I fixed them up (see below) and can carry the fix
> as necessary.

Hi Stephen,

Thanks for carrying this.

Russell has (temporarily) dropped his version of the patch, but when he
adds it back (today, I believe) I will fix this up in the davinci tree
by pre-merging his branch with mine to handle this conflict.

Kevin

^ permalink raw reply

* Re: swiotlb-xen tree + xen + linux-next
From: Stephen Rothwell @ 2010-10-19 14:58 UTC (permalink / raw)
  To: Konrad Rzeszutek Wilk
  Cc: linux-next, linux-kernel, stefano.stabellini, jeremy
In-Reply-To: <20101019142539.GA5726@dumpdata.com>

[-- Attachment #1: Type: text/plain, Size: 3329 bytes --]

Hi Konrad,

On Tue, 19 Oct 2010 10:25:39 -0400 Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> wrote:
>
> Jeremy and I fixed the mega failures you saw and last night Jeremy's
> got pulled in while mine was silent. I am enabling my tree today, and while
> the previous failure is gone when I do a merge of my tree against linux-next,
> I keep on getting one that I am having trouble solving.

Thanks for fixing this all up.

> The issues is that my patchset touches drivers/pci/Makefile which
> had been changed a bit by a): 350a55e9ff6005032407d3234af800f413b03af5
> (PCI: use new ccflags variable in Makefile) which does this:
> @@ -65,6 +65,4 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
>  
>  obj-$(CONFIG_PCI_STUB) += pci-stub.o
>  
> -ifeq ($(CONFIG_PCI_DEBUG),y)
> -EXTRA_CFLAGS += -DDEBUG
> -endif
> +ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
> 
> And then b) my patch (git commit 956a9202cd1220397933a07beda9f96b3df1fa24
> xen-pcifront: Xen PCI frontend driver.) goes in and tries to add:
> 
> @@ -65,6 +65,8 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
>  
>  obj-$(CONFIG_PCI_STUB) += pci-stub.o
>  
> +obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
> +
>  ifeq ($(CONFIG_PCI_DEBUG),y)
>  EXTRA_CFLAGS += -DDEBUG
>  endif
> 
> I've tried to put a) patch in the branch and rebase my tree on top of that
> and this way, the "ifeq ($(CONFIG_PCI_DEBUG_...)" is gone, but merge still
> complains! The error is:
> 
> diff --cc drivers/pci/Makefile
> index dcd7ace,39c7327..0000000
> --- a/drivers/pci/Makefile
> +++ b/drivers/pci/Makefile
> @@@ -65,4 -65,7 +65,10 @@@ obj-$(CONFIG_PCI_SYSCALL) += syscall.
>   
>   obj-$(CONFIG_PCI_STUB) += pci-stub.o
>   
> ++<<<<<<< HEAD
> ++=======
> + # Xen PCI frontend driver
> + obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
> + 
> ++>>>>>>> stable/xen-pcifront-0.8.3
>   ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
> 
> [That branch with the a) patch is stable/xen-pcifront-0.8.3, which differs
> from #linux-next (which is linked to stable/xen-pcifront-0.8.2) by just
> having the patch a) in it. I am not going to use that for #linux-next as
> it does not seem to make merging automatic].
> 
> Any ideas why it is doing this?

I think that if git sees this as the "ccflags" change on one side of the
merge and "ccflags" change plus your change on the other and decides that
it conflicts.  It considers the two "ccflags" changes to be different
because they are not the same commit (even if they have the same patch).

> In the internim and so that the merge tonight won't be broken, I've
> attached a merge conflict patch instead:
> 
> diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
> index dcd7ace..f01e344 100644
> --- a/drivers/pci/Makefile
> +++ b/drivers/pci/Makefile
> @@ -65,4 +65,6 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
>  
>  obj-$(CONFIG_PCI_STUB) += pci-stub.o
>  
> +obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
> +
>  ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG
> 

Thanks.  You don't need to worry about simple conflicts like this, Linus
and I are both quite happy with fixing them up - though I will still
report them, just so people know what is going on.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* swiotlb-xen tree + xen + linux-next
From: Konrad Rzeszutek Wilk @ 2010-10-19 14:25 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, stefano.stabellini, jeremy

Hey Stephen,

Jeremy and I fixed the mega failures you saw and last night Jeremy's
got pulled in while mine was silent. I am enabling my tree today, and while
the previous failure is gone when I do a merge of my tree against linux-next,
I keep on getting one that I am having trouble solving.

The issues is that my patchset touches drivers/pci/Makefile which
had been changed a bit by a): 350a55e9ff6005032407d3234af800f413b03af5
(PCI: use new ccflags variable in Makefile) which does this:
@@ -65,6 +65,4 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
 
 obj-$(CONFIG_PCI_STUB) += pci-stub.o
 
-ifeq ($(CONFIG_PCI_DEBUG),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

And then b) my patch (git commit 956a9202cd1220397933a07beda9f96b3df1fa24
xen-pcifront: Xen PCI frontend driver.) goes in and tries to add:

@@ -65,6 +65,8 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
 
 obj-$(CONFIG_PCI_STUB) += pci-stub.o
 
+obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
+
 ifeq ($(CONFIG_PCI_DEBUG),y)
 EXTRA_CFLAGS += -DDEBUG
 endif

I've tried to put a) patch in the branch and rebase my tree on top of that
and this way, the "ifeq ($(CONFIG_PCI_DEBUG_...)" is gone, but merge still
complains! The error is:

diff --cc drivers/pci/Makefile
index dcd7ace,39c7327..0000000
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -65,4 -65,7 +65,10 @@@ obj-$(CONFIG_PCI_SYSCALL) += syscall.
  
  obj-$(CONFIG_PCI_STUB) += pci-stub.o
  
++<<<<<<< HEAD
++=======
+ # Xen PCI frontend driver
+ obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
+ 
++>>>>>>> stable/xen-pcifront-0.8.3
  ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

[That branch with the a) patch is stable/xen-pcifront-0.8.3, which differs
from #linux-next (which is linked to stable/xen-pcifront-0.8.2) by just
having the patch a) in it. I am not going to use that for #linux-next as
it does not seem to make merging automatic].

Any ideas why it is doing this?

In the internim and so that the merge tonight won't be broken, I've
attached a merge conflict patch instead:

diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index dcd7ace..f01e344 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -65,4 +65,6 @@ obj-$(CONFIG_PCI_SYSCALL) += syscall.o
 
 obj-$(CONFIG_PCI_STUB) += pci-stub.o
 
+obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o
+
 ccflags-$(CONFIG_PCI_DEBUG) := -DDEBUG

^ permalink raw reply related

* Re: linux-next: manual merge of the msm tree with the arm tree
From: Arnd Bergmann @ 2010-10-19 13:18 UTC (permalink / raw)
  To: Joe Perches
  Cc: Nicolas Pitre, Daniel Walker, Russell King, Stephen Rothwell,
	linux-next, lkml, Jeremy Kerr, Jeff Ohlstein
In-Reply-To: <1287442418.5376.38.camel@Joe-Laptop>

On Tuesday 19 October 2010, Joe Perches wrote:
> This could have been done:
> 
> $ git show 08a610d9ef5394525b0328da0162d7b58c982cc4 | ./scripts/get_maintainer.pl --nogit | wc -l
> 35
> 
> Even then, using 35 CCs is generally silly.
> 
> It might make some sense for a cover letter and a
> patch series where the series made tree-wide changes
> in multiple directories.

Probably not even then: When a single mail header gets too long, you usually land
in some spam filter and get hate mail from the list owners. The lkml limit is 1024
characters (this may come from an official RFC, don't know), which is usually less
than 35 recipients.

	Arnd

^ permalink raw reply

* Re: linux-next: build warning after merge of the cifs tree
From: Jeff Layton @ 2010-10-19 13:13 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Steve French, linux-cifs, linux-next, linux-kernel,
	Shirish Pargaonkar
In-Reply-To: <20101019162120.76e03b4b.sfr@canb.auug.org.au>

On Tue, 19 Oct 2010 16:21:20 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Steve,
> 
> On Fri, 24 Sep 2010 13:55:31 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the irqflags tree, today's linux-next build (powerpc
> > ppc64_defconfig) produced this warning:
> > 
> > fs/cifs/sess.c: In function 'CIFS_SessSetup':
> > fs/cifs/sess.c:595: warning: unused variable 'blob_len'
> > 
> > Introduced by commit 15f6bdfb9914b0c41848f874719911ba053be931 ("cifs
> > NTLMv2/NTLMSSP ntlmv2 within ntlmssp autentication code").
> > CONFIG_CIFS_UPCALL is not set in this build.
> 
> I am still getting this ...
> 

Yep. Looks clearly broken. blob_len is also declared twice in that
function which is just plain wrong. What probably makes the most sense
is to make it a u16 and get rid of the second declaration lower in the
function. But, there's another semi-related problem here too...

blob_len gets assigned the return value of build_ntlmssp_auth_blob.
That function however doesn't have any mechanism to pass back an
error, even though it calls setup_ntlmv2_rsp and that function can
return one.

The whole house of cards needs a bit of rework I think...

Shirish, since you're already doing work in this area, can you fix that
too?

Thanks,
-- 
Jeff Layton <jlayton@samba.org>

^ permalink raw reply

* Re: linux-next: user mode linux build failure (2)
From: Arnd Bergmann @ 2010-10-19  9:18 UTC (permalink / raw)
  To: Richard Weinberger; +Cc: linux-next, linux-kernel@vger.kernel.org, Jeff Dike
In-Reply-To: <201010190200.01496.richard@nod.at>

On Tuesday 19 October 2010, Richard Weinberger wrote:
> Hi!
> 
> 1e3d8715 (uml: kill big kernel lock) breaks um build.
> 
> arch/um/drivers/ubd_kern.c: In function 'ubd_open':
> arch/um/drivers/ubd_kern.c:1104: error: 'ubd_mutex' undeclared (first use in 
> this function)
> arch/um/drivers/ubd_kern.c:1104: error: (Each undeclared identifier is 
> reported only once
> arch/um/drivers/ubd_kern.c:1104: error: for each function it appears in.)
> arch/um/drivers/ubd_kern.c: In function 'ubd_release':
> arch/um/drivers/ubd_kern.c:1131: error: 'ubd_mutex' undeclared (first use in 
> this function)
> make[1]: *** [arch/um/drivers/ubd_kern.o] Error 1
> make: *** [arch/um/drivers] Error 2
> 
> It seems you forgot to define ubd_mutex in ubd_kern.c.

Thanks for the report, I updated the patch now to the version below.

	Arnd

---
Subject: [PATCH] uml: kill big kernel lock

Three uml device drivers still use the big kernel lock,
but all of them can be safely converted to using
a per-driver mutex instead. Most likely this is not
even necessary, so after further review these can
and should be removed as well.

The exec system call no longer requires the BKL either,
so remove it from there, too.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: user-mode-linux-devel@lists.sourceforge.net

diff --git a/arch/um/drivers/harddog_kern.c b/arch/um/drivers/harddog_kern.c
index cfcac1f..8603627 100644
--- a/arch/um/drivers/harddog_kern.c
+++ b/arch/um/drivers/harddog_kern.c
@@ -42,7 +42,7 @@
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include <linux/reboot.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <asm/uaccess.h>
@@ -50,6 +50,7 @@
 
 MODULE_LICENSE("GPL");
 
+static DEFINE_MUTEX(harddog_mutex);
 static DEFINE_SPINLOCK(lock);
 static int timer_alive;
 static int harddog_in_fd = -1;
@@ -66,7 +67,7 @@ static int harddog_open(struct inode *inode, struct file *file)
 	int err = -EBUSY;
 	char *sock = NULL;
 
-	lock_kernel();
+	mutex_lock(&harddog_mutex);
 	spin_lock(&lock);
 	if(timer_alive)
 		goto err;
@@ -83,11 +84,11 @@ static int harddog_open(struct inode *inode, struct file *file)
 
 	timer_alive = 1;
 	spin_unlock(&lock);
-	unlock_kernel();
+	mutex_unlock(&harddog_mutex);
 	return nonseekable_open(inode, file);
 err:
 	spin_unlock(&lock);
-	unlock_kernel();
+	mutex_unlock(&harddog_mutex);
 	return err;
 }
 
@@ -153,9 +154,9 @@ static long harddog_ioctl(struct file *file,
 {
 	long ret;
 
-	lock_kernel();
+	mutex_lock(&harddog_mutex);
 	ret = harddog_ioctl_unlocked(file, cmd, arg);
-	unlock_kernel();
+	mutex_unlock(&harddog_mutex);
 
 	return ret;
 }
diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 0c46e39..d92ff6d 100644
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -8,7 +8,7 @@
 #include "linux/slab.h"
 #include "linux/sound.h"
 #include "linux/soundcard.h"
-#include "linux/smp_lock.h"
+#include "linux/mutex.h"
 #include "asm/uaccess.h"
 #include "init.h"
 #include "os.h"
@@ -67,6 +67,8 @@ MODULE_PARM_DESC(mixer, MIXER_HELP);
 
 #endif
 
+static DEFINE_MUTEX(hostaudio_mutex);
+
 /* /dev/dsp file operations */
 
 static ssize_t hostaudio_read(struct file *file, char __user *buffer,
@@ -202,9 +204,9 @@ static int hostaudio_open(struct inode *inode, struct file *file)
 		w = 1;
 
 	kparam_block_sysfs_write(dsp);
-	lock_kernel();
+	mutex_lock(&hostaudio_mutex);
 	ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
-	unlock_kernel();
+	mutex_unlock(&hostaudio_mutex);
 	kparam_unblock_sysfs_write(dsp);
 
 	if (ret < 0) {
@@ -263,9 +265,9 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
 		w = 1;
 
 	kparam_block_sysfs_write(mixer);
-	lock_kernel();
+	mutex_lock(&hostaudio_mutex);
 	ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
-	unlock_kernel();
+	mutex_unlock(&hostaudio_mutex);
 	kparam_unblock_sysfs_write(mixer);
 
 	if (ret < 0) {
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 1bcd208..0c05360 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -33,7 +33,7 @@
 #include "linux/mm.h"
 #include "linux/slab.h"
 #include "linux/vmalloc.h"
-#include "linux/smp_lock.h"
+#include "linux/mutex.h"
 #include "linux/blkpg.h"
 #include "linux/genhd.h"
 #include "linux/spinlock.h"
@@ -100,6 +100,7 @@ static inline void ubd_set_bit(__u64 bit, unsigned char *data)
 #define DRIVER_NAME "uml-blkdev"
 
 static DEFINE_MUTEX(ubd_lock);
+static DEFINE_MUTEX(ubd_mutex); /* replaces BKL, might not be needed */
 
 static int ubd_open(struct block_device *bdev, fmode_t mode);
 static int ubd_release(struct gendisk *disk, fmode_t mode);
@@ -1099,7 +1100,7 @@ static int ubd_open(struct block_device *bdev, fmode_t mode)
 	struct ubd *ubd_dev = disk->private_data;
 	int err = 0;
 
-	lock_kernel();
+	mutex_lock(&ubd_mutex);
 	if(ubd_dev->count == 0){
 		err = ubd_open_dev(ubd_dev);
 		if(err){
@@ -1118,7 +1119,7 @@ static int ubd_open(struct block_device *bdev, fmode_t mode)
 	        err = -EROFS;
 	}*/
 out:
-	unlock_kernel();
+	mutex_unlock(&ubd_mutex);
 	return err;
 }
 
@@ -1126,10 +1127,10 @@ static int ubd_release(struct gendisk *disk, fmode_t mode)
 {
 	struct ubd *ubd_dev = disk->private_data;
 
-	lock_kernel();
+	mutex_lock(&ubd_mutex);
 	if(--ubd_dev->count == 0)
 		ubd_close_dev(ubd_dev);
-	unlock_kernel();
+	mutex_unlock(&ubd_mutex);
 	return 0;
 }
 
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index cd145ed..460ce86 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -78,13 +78,11 @@ long sys_execve(const char __user *file, char __user *__user *argv,
 	long error;
 	char *filename;
 
-	lock_kernel();
 	filename = getname(file);
 	error = PTR_ERR(filename);
 	if (IS_ERR(filename)) goto out;
 	error = execve1(filename, argv, env);
 	putname(filename);
  out:
-	unlock_kernel();
 	return error;
 }

^ permalink raw reply related

* linux-next: Tree for October 19
From: Stephen Rothwell @ 2010-10-19  7:25 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

[-- Attachment #1: Type: text/plain, Size: 12456 bytes --]

Hi all,

Changes since 20101018:

Undropped tree: xen

The davinci tree lost its conflicts.

The msm tree lost its conflict.

The s5p tree lost its conflicts.

The xfs tree lost its mismerge.

The pci tree lost its build failure.

The net tree lost its build failure and a couple of conflicts.

The v4l-dvb tree gained a build failure for which I applied a patch.

The sound-asoc tree lost its build failure (also the sound tree).

The mmc tree lost its build failure.

The security-testing tree gained a build failure so I used the version
from next-20101018.

The tip tree lost a conflict but gained another against the powerpc
tree.  It also gained a build failure (actually yesterday) for which I
applied a patch.

The xen tree lost its conflicts.

The staging-next tree gained a conflict against the v4l-dvb tree.

----------------------------------------------------------------------------

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 176 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 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/rc-fixes
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 gcl-current/merge
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/include/mach/system.h
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-cpuimx27.c
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Applying: s5p: merge fix for removal of fielda from machine_desc
Merging tegra/for-next
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
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 hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom-peripherals.c
CONFLICT (delete/modify): drivers/ieee1394/eth1394.c deleted in HEAD and modified in net/master. Version net/master of drivers/ieee1394/eth1394.c left in tree.
$ git rm -f drivers/ieee1394/eth1394.c
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Merging sound/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/dev-audio.c
CONFLICT (content): Merge conflict in drivers/video/sh_mobile_hdmi.c
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in drivers/input/keyboard/Kconfig
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Applying: ext4: merge fix for blkdev_issue_zeroout API change
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/net/pcmcia/smc91c92_cs.c
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
CONFLICT (content): Merge conflict in drivers/char/sysrq.c
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/sh_mobile_sdhi.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600_blit_kms.c
Merging viafb/viafb-next
Merging voltage/for-next
Merging security-testing/next
$ git reset --hard HEAD^
Merging refs/next/20101018/security-testing
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 net/irda/irnet/irnet_ppp.c
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c
CONFLICT (content): Merge conflict in arch/arm/mm/flush.c
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
CONFLICT (content): Merge conflict in drivers/spi/Kconfig
CONFLICT (content): Merge conflict in drivers/spi/Makefile
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c
CONFLICT (content): Merge conflict in arch/sh/kernel/perf_event.c
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in net/core/dev.c
Applying: ftrace: Remove recursion between recordmcount and scripts/mod/empty
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in include/linux/percpu.h
CONFLICT (content): Merge conflict in mm/percpu.c
Merging workqueues/for-next
CONFLICT (content): Merge conflict in fs/gfs2/main.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/gadget/rndis.c
CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/host/Makefile
Applying: scsi/sd: update for hw_sector_size rename
Merging staging-next/staging-next
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_core.c
CONFLICT (rename/modify): Merge conflict in drivers/misc/ti-st/st_kim.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/devices.c
CONFLICT (content): Merge conflict in drivers/misc/Makefile
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c
CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio.h
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/Makefile deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/Makefile left in tree.
CONFLICT (delete/modify): drivers/staging/mrst-touchscreen/intel-mid-touch.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/mrst-touchscreen/intel-mid-touch.c left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st.h left in tree.
CONFLICT (delete/modify): drivers/staging/ti-st/st_core.h deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/ti-st/st_core.h left in tree.
$ git rm -f drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
$ git rm -f drivers/staging/ti-st/st.h drivers/staging/ti-st/st_core.h
Applying: staging: ath6kl: Fixing the driver to use modified mmc_host structure
Merging slabh/slabh
Merging bkl-trivial/trivial
CONFLICT (content): Merge conflict in drivers/block/ataflop.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4000_cs.c
CONFLICT (content): Merge conflict in drivers/char/pcmcia/cm4040_cs.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Merging bkl-llseek/llseek
CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/debug.c
Applying: ath9k: fix up for .llseek fop change
Merging bkl-vfs/vfs
CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
Merging bkl-config/config
CONFLICT (content): Merge conflict in fs/compat_ioctl.c
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
Applying: v4l-dvb: using vmalloc needs vmalloc.h in cx231xx-417.c

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* linux-next: build failure after merge of the final tree (v4l-dvb tree related)
From: Stephen Rothwell @ 2010-10-19  7:07 UTC (permalink / raw)
  To: Mauro Carvalho Chehab
  Cc: linux-next, linux-kernel, Palash Bandyopadhyay, Devin Heitmueller,
	Arnd Bergmann

Hi Mauro,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/media/video/cx231xx/cx231xx-417.c: In function 'cx231xx_load_firmware':
drivers/media/video/cx231xx/cx231xx-417.c:943: error: implicit declaration of function 'vmalloc'
drivers/media/video/cx231xx/cx231xx-417.c:943: warning: cast to pointer from integer of different size
drivers/media/video/cx231xx/cx231xx-417.c:950: warning: cast to pointer from integer of different size
drivers/media/video/cx231xx/cx231xx-417.c:1039: error: implicit declaration of function 'vfree'

Caused by commit e0bb3704be9decb10985b0886031e76a228b5f32 ("[media]
cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER").

Also, I don't think Arnd is going to like the new BKL usage also
introduced by the commit.  ;-)

I added the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Oct 2010 18:01:25 +1100
Subject: [PATCH] v4l-dvb: using vmalloc needs vmalloc.h in cx231xx-417.c

Fixes these build errors and warnings:

drivers/media/video/cx231xx/cx231xx-417.c: In function 'cx231xx_load_firmware':
drivers/media/video/cx231xx/cx231xx-417.c:943: error: implicit declaration of function 'vmalloc'
drivers/media/video/cx231xx/cx231xx-417.c:943: warning: cast to pointer from integer of different size
drivers/media/video/cx231xx/cx231xx-417.c:950: warning: cast to pointer from integer of different size
drivers/media/video/cx231xx/cx231xx-417.c:1039: error: implicit declaration of function 'vfree'

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/video/cx231xx/cx231xx-417.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/media/video/cx231xx/cx231xx-417.c b/drivers/media/video/cx231xx/cx231xx-417.c
index e456b97..aab21f3 100644
--- a/drivers/media/video/cx231xx/cx231xx-417.c
+++ b/drivers/media/video/cx231xx/cx231xx-417.c
@@ -32,6 +32,7 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/smp_lock.h>
+#include <linux/vmalloc.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/cx2341x.h>
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

^ permalink raw reply related

* Re: linux-next: manual merge of the staging-next tree with the v4l-dvb tree
From: Stephen Rothwell @ 2010-10-19  6:23 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Ruslan Pisarev, Mauro Carvalho Chehab,
	Gorskin Ilya
In-Reply-To: <20101019171233.9f3e1dad.sfr@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

Hi Greg,

On Tue, 19 Oct 2010 17:12:33 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the staging-next tree got a conflict in
> drivers/staging/cx25821/cx25821-audio-upstream.c between commit
> d6a0215fc954bd16a21bad94a3292f080d9f6f04 ("[media] Staging: cx25821: fix
> braces and space coding style issues") from the v4l-dvb tree and commit
> bb59a4c539140592723e806e852ee171da0eb3eb ("Staging: cx25821: clenup
> warnings found by checkpatch.pl tool in cx25821-audio-upstream.c and
> cx25821-audio.h") from the staging-next tree.
> 
> Basically different versions of the same patch.  I fixed it up.

Fixed conflicts in drivers/staging/cx25821/cx25821-audio.h as well.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* linux-next: manual merge of the staging-next tree with the v4l-dvb tree
From: Stephen Rothwell @ 2010-10-19  6:12 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Ruslan Pisarev, Mauro Carvalho Chehab,
	Gorskin Ilya

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

Hi Greg,

Today's linux-next merge of the staging-next tree got a conflict in
drivers/staging/cx25821/cx25821-audio-upstream.c between commit
d6a0215fc954bd16a21bad94a3292f080d9f6f04 ("[media] Staging: cx25821: fix
braces and space coding style issues") from the v4l-dvb tree and commit
bb59a4c539140592723e806e852ee171da0eb3eb ("Staging: cx25821: clenup
warnings found by checkpatch.pl tool in cx25821-audio-upstream.c and
cx25821-audio.h") from the staging-next tree.

Basically different versions of the same patch.  I fixed it up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* Re: linux-next: build warning after merge of the cifs tree
From: Stephen Rothwell @ 2010-10-19  5:21 UTC (permalink / raw)
  To: Steve French, linux-cifs-u79uwXL29TY76Z2rM5mHXA
  Cc: linux-next-u79uwXL29TY76Z2rM5mHXA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Shirish Pargaonkar
In-Reply-To: <20100924135531.96e5ac72.sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org>

[-- Attachment #1: Type: text/plain, Size: 696 bytes --]

Hi Steve,

On Fri, 24 Sep 2010 13:55:31 +1000 Stephen Rothwell <sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> wrote:
>
> After merging the irqflags tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
> 
> fs/cifs/sess.c: In function 'CIFS_SessSetup':
> fs/cifs/sess.c:595: warning: unused variable 'blob_len'
> 
> Introduced by commit 15f6bdfb9914b0c41848f874719911ba053be931 ("cifs
> NTLMv2/NTLMSSP ntlmv2 within ntlmssp autentication code").
> CONFIG_CIFS_UPCALL is not set in this build.

I am still getting this ...

-- 
Cheers,
Stephen Rothwell                    sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* linux-next: build failure after merge of the tip tree
From: Stephen Rothwell @ 2010-10-19  5:13 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: linux-next, linux-kernel, Andrew Morton

[-- Attachment #1: Type: text/plain, Size: 523 bytes --]

Hi all,

After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

/bin/sh: /scratch/sfr/x86_64_allmodconfig/scripts/recordmcount: No such file or directory

I use O=/scratch/sfr/x86_64_allmodconfig in this build.  The same
happened yesterday, but it fixed itself when I rebuilt for other
reasons.  Andrew has also reported this so I applied the patch you
suggested.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* Re: linux-next: manual merge of the tip tree with the powerpc tree
From: Stephen Rothwell @ 2010-10-19  4:56 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: linux-next, linux-kernel, Paul Mackerras, Benjamin Herrenschmidt,
	linuxppc-dev
In-Reply-To: <20101019154849.126a736a.sfr@canb.auug.org.au>

Hi again,

On Tue, 19 Oct 2010 15:48:49 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in
> arch/powerpc/kernel/time.c between commit
> cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
> timebase rather than PURR") from the powerpc tree and commit
> e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
> context callbacks") from the tip tree.
> 
> Just context changes.  I fixed it up and can carry the fix as necessary.

I forgot the merge diff, sorry:

diff --cc arch/powerpc/kernel/time.c
index 644f918,54888eb..0000000
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@@ -578,9 -585,11 +578,9 @@@ void timer_interrupt(struct pt_regs * r
  	old_regs = set_irq_regs(regs);
  	irq_enter();
  
- 	if (test_perf_event_pending()) {
- 		clear_perf_event_pending();
- 		perf_event_do_pending();
 -	calculate_steal_time();
 -
+ 	if (test_irq_work_pending()) {
+ 		clear_irq_work_pending();
+ 		irq_work_run();
  	}
  
  #ifdef CONFIG_PPC_ISERIES

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply

* linux-next: manual merge of the tip tree with the powerpc tree
From: Stephen Rothwell @ 2010-10-19  4:48 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
  Cc: linux-next, linux-kernel, Paul Mackerras, Benjamin Herrenschmidt,
	linuxppc-dev

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/powerpc/kernel/time.c between commit
cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using
timebase rather than PURR") from the powerpc tree and commit
e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add generic hardirq
context callbacks") from the tip tree.

Just context changes.  I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply

* Re: linux-next: build failure after merge of the security-testing tree
From: Eric Paris @ 2010-10-19  4:09 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: James Morris, linux-next, linux-kernel, Paul Moore,
	Patrick McHardy
In-Reply-To: <20101019145747.f828be03.sfr@canb.auug.org.au>

On Tue, 2010-10-19 at 14:57 +1100, Stephen Rothwell wrote:
> Hi James,
> 
> After merging the security-testing tree, today's linux-next build (powerpc_ppc64_defconfig)
> failed like this:
> 
> net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event':
> net/netfilter/nf_conntrack_netlink.c:585: error: 'struct nf_conn' has no member named 'secmark'
> 
> Caused by commit fd0194de4cf2e64514aec35f40de458fca766656 ("conntrack:
> export lsm context rather than internal secid via netlink").  This build
> has CONFIG_NF_CONNTRACK_SECMARK not set ...
> 
> If you change a dependency on a CONFIG option, it is always worth build
> testing with and without the option set.
> 
> I have used the security-testing tree from next-20101018 for today.

Ohhh, poop.  I didn't think I changed any config options but I see it
now.  Will fix by tomorrow.  Sorry and thanks for catching it.

-Eric

^ permalink raw reply

* linux-next: build failure after merge of the security-testing tree
From: Stephen Rothwell @ 2010-10-19  3:57 UTC (permalink / raw)
  To: James Morris
  Cc: linux-next, linux-kernel, Eric Paris, Paul Moore, Patrick McHardy

[-- Attachment #1: Type: text/plain, Size: 792 bytes --]

Hi James,

After merging the security-testing tree, today's linux-next build (powerpc_ppc64_defconfig)
failed like this:

net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event':
net/netfilter/nf_conntrack_netlink.c:585: error: 'struct nf_conn' has no member named 'secmark'

Caused by commit fd0194de4cf2e64514aec35f40de458fca766656 ("conntrack:
export lsm context rather than internal secid via netlink").  This build
has CONFIG_NF_CONNTRACK_SECMARK not set ...

If you change a dependency on a CONFIG option, it is always worth build
testing with and without the option set.

I have used the security-testing tree from next-20101018 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

^ permalink raw reply

* Re: linux-next: manual merge of the msm tree with the arm tree
From: Nicolas Pitre @ 2010-10-19  2:47 UTC (permalink / raw)
  To: Daniel Walker
  Cc: Russell King, Stephen Rothwell, linux-next, lkml, Jeremy Kerr,
	Jeff Ohlstein
In-Reply-To: <1287445545.5588.158.camel@c-dwalke-linux.qualcomm.com>

On Mon, 18 Oct 2010, Daniel Walker wrote:

> I can say that I know for a fact that people don't read every patch, or
> every email, or keep track of every single thread. I don't think it's
> reasonable to expect people to do that. there's too many email, too many
> threads, too many discussions etc ..

I'm not saying that you should keep track of every threads.  But you 
should at least pay attention to what thread is being discussed, simply 
by looking at the subject line.  Any good MUA will let you sort emails 
and collapse them into thread view.  And scoring those incoming emails 
with "arch/arm/mach-msm" for example is a quick way for you to be 
noticed when a patch might be changing something in your area.  Tools 
are there for you.

> This discussion isn't really about that. It's not about people reading
> every single patch, which we know they don't do. This is about conflicts
> in -next.

Glad to get back to the original issue.

> These patches caused conflicts in -next .. What more could I have done
> to prevent conflicts coming from another tree and patches that appear
> not to effect me? Even if I read all the patches, and threads, it still
> seems unreasonable to expect maintainers to predict conflicts not coming
> from their own tree's.

In this particular case, Stephen did fix the trivial merge conflict.  
Most probably Linus could have done the same.  There is nothing you 
needed to do in that case.  Or you could have waited until RMK's tree 
hits mainline, then you merge that, fixing the issue within that merge, 
before asking Linus to pull.

And if the merge in linux-next turned out not to be that trivial, or you 
have new machine entries in your tree that failed to compile due to the 
missing fixup, well that's fine too because that's _exactly_ what the 
purpose of the linux-next tree is: finding issues like this before the 
real merge in Linus' tree.  So in this case the system did work: the 
conflict was identified by the tool and you were notified.

And the simplest solution to this is simply to merge your stuff into 
RMK's tree in this case, so the generic change affecting all ARM 
machines will cover yours as well.  Incidentally that's what has been 
asked of you.

See?  Nothing to really get excited about.


Nicolas

^ permalink raw reply

* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2010-10-19  0:43 UTC (permalink / raw)
  To: Peter Hsiang
  Cc: Stephen Rothwell, Liam Girdwood, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
In-Reply-To: <B2150E1E4418E1438554A300EA5040E40D471A4297@ITSVLEX06.it.maxim-ic.internal>

On Mon, Oct 18, 2010 at 05:30:39PM -0700, Peter Hsiang wrote:
> On Mon, Oct 18, 2010, Mark Brown wrote:

> > Your patch was apparently not generated against the mainline Makefile or
> > Kconfig and the automated conflict resolution tool I used (which is
> > normally fairly reliable) appears to have misplaced the header.  I've
> > restored the driver with the readdition of the header.

> .../pub/scm/linux/kernel/git/next/linux-next.git  Right?

As previously advised several times you should be submitting against the
latest for-whatever branch of 

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git

for ASoC.  That will *generally* be what's in -next but not always.

^ permalink raw reply

* RE: linux-next: build failure after merge of the sound-asoc tree
From: Peter Hsiang @ 2010-10-19  0:30 UTC (permalink / raw)
  To: Mark Brown
  Cc: Stephen Rothwell, Liam Girdwood, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
In-Reply-To: <20101019000730.GA27248@opensource.wolfsonmicro.com>

On Mon, Oct 18, 2010, Mark Brown wrote:
> On Mon, Oct 18, 2010 at 01:25:12PM -0700, Peter Hsiang wrote:
> 
> > This message seems to be saying that this header file is missing.
> > However, this header file was included in the patch that was submitted,
> > and it did compile fine here before the submit.
> > I don't understand why it's not there after it was applied?
> 
> Your patch was apparently not generated against the mainline Makefile or
> Kconfig and the automated conflict resolution tool I used (which is
> normally fairly reliable) appears to have misplaced the header.  I've
> restored the driver with the readdition of the header.

.../pub/scm/linux/kernel/git/next/linux-next.git  Right?
Thanks!

Peter

^ permalink raw reply

* Re: linux-next: build failure after merge of the sound-asoc tree
From: Mark Brown @ 2010-10-19  0:07 UTC (permalink / raw)
  To: Peter Hsiang
  Cc: Stephen Rothwell, Liam Girdwood, linux-next@vger.kernel.org,
	linux-kernel@vger.kernel.org
In-Reply-To: <B2150E1E4418E1438554A300EA5040E40D47140D97@ITSVLEX06.it.maxim-ic.internal>

On Mon, Oct 18, 2010 at 01:25:12PM -0700, Peter Hsiang wrote:

> This message seems to be saying that this header file is missing.
> However, this header file was included in the patch that was submitted,
> and it did compile fine here before the submit.
> I don't understand why it's not there after it was applied?

Your patch was apparently not generated against the mainline Makefile or
Kconfig and the automated conflict resolution tool I used (which is
normally fairly reliable) appears to have misplaced the header.  I've
restored the driver with the readdition of the header.

^ permalink raw reply

* linux-next: user mode linux build failure (2)
From: Richard Weinberger @ 2010-10-19  0:00 UTC (permalink / raw)
  To: arnd; +Cc: linux-next, linux-kernel@vger.kernel.org

Hi!

1e3d8715 (uml: kill big kernel lock) breaks um build.

arch/um/drivers/ubd_kern.c: In function 'ubd_open':
arch/um/drivers/ubd_kern.c:1104: error: 'ubd_mutex' undeclared (first use in 
this function)
arch/um/drivers/ubd_kern.c:1104: error: (Each undeclared identifier is 
reported only once
arch/um/drivers/ubd_kern.c:1104: error: for each function it appears in.)
arch/um/drivers/ubd_kern.c: In function 'ubd_release':
arch/um/drivers/ubd_kern.c:1131: error: 'ubd_mutex' undeclared (first use in 
this function)
make[1]: *** [arch/um/drivers/ubd_kern.o] Error 1
make: *** [arch/um/drivers] Error 2

It seems you forgot to define ubd_mutex in ubd_kern.c.

Thanks,
//richard

^ permalink raw reply

* Re: linux-next: manual merge of the msm tree with the arm tree
From: Daniel Walker @ 2010-10-18 23:45 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Russell King, Stephen Rothwell, linux-next, lkml, Jeremy Kerr,
	Jeff Ohlstein
In-Reply-To: <alpine.LFD.2.00.1010181923450.2764@xanadu.home>

On Mon, 2010-10-18 at 19:32 -0400, Nicolas Pitre wrote:
> On Mon, 18 Oct 2010, Daniel Walker wrote:
> 
> > On Mon, 2010-10-18 at 18:35 -0400, Nicolas Pitre wrote:
> > 
> > > > git show 08a610d9ef5394525b0328da0162d7b58c982cc4 | ./scripts/get_maintainer.pl | wc
> > > >      58     163    2169
> > > > 
> > > > That's the patch we're actually discussing too. It's about one CC per
> > > > file modified.
> > > 
> > > What is a mailing list for, then?  Why are you subscribed?
> > 
> > I'm subscribes to review code .. Do you read every patch that cross the
> > arm list?
> 
> No, But I do read every email subject, and most patch messages.  Only 
> those subjects I know for sure I have no interest in I do delete right 
> away.
> 
> And being a human I sometimes screw up and let something I should have 
> paid attention fall through the cracks.  When that happens I simply fix 
> the issue after the fact and send a patch, and then life goes on.
> 
> If you don't want to actually follow the mailing list traffic, you can 
> at least filter it by flagging those messages that contain a patch which 
> touches one of those files you do care about.

I can say that I know for a fact that people don't read every patch, or
every email, or keep track of every single thread. I don't think it's
reasonable to expect people to do that. there's too many email, too many
threads, too many discussions etc ..

This discussion isn't really about that. It's not about people reading
every single patch, which we know they don't do. This is about conflicts
in -next.

These patches caused conflicts in -next .. What more could I have done
to prevent conflicts coming from another tree and patches that appear
not to effect me? Even if I read all the patches, and threads, it still
seems unreasonable to expect maintainers to predict conflicts not coming
from their own tree's.

Daniel

^ permalink raw reply

* linux-next: user mode linux build failure
From: Richard Weinberger @ 2010-10-18 23:41 UTC (permalink / raw)
  To: dhowells; +Cc: linux-kernel@vger.kernel.org, linux-next

[-- Attachment #1: Type: Text/Plain, Size: 104 bytes --]

Hi!

df9ee292 (Fix IRQ flag handling naming) breaks um build.
Build log is attached.

Thanks,
//richard

[-- Attachment #2: build.log --]
[-- Type: text/x-log, Size: 60469 bytes --]

make[1]: `arch/um/sys-i386/user-offsets.s' is up to date.
  CHK     include/linux/version.h
  CHK     include/generated/utsrelease.h
  CALL    scripts/checksyscalls.sh
  CHK     include/generated/compile.h
  CC      init/version.o
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
/media/data1/linux-next/arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
include/linux/irqflags.h:143:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
/media/data1/linux-next/arch/um/include/asm/system.h:13:1: warning: "local_irq_restore" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
include/linux/irqflags.h:142:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
/media/data1/linux-next/arch/um/include/asm/system.h:16:1: warning: "local_irq_save" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
include/linux/irqflags.h:138:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
/media/data1/linux-next/arch/um/include/asm/system.h:19:1: warning: "local_irq_enable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
include/linux/irqflags.h:136:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
/media/data1/linux-next/arch/um/include/asm/system.h:20:1: warning: "local_irq_disable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
include/linux/irqflags.h:137:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
/media/data1/linux-next/arch/um/include/asm/system.h:22:1: warning: "irqs_disabled" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/stat.h:60,
                 from include/linux/module.h:10,
                 from init/version.c:10:
include/linux/irqflags.h:144:1: warning: this is the location of the previous definition
  LD      init/built-in.o
  CC      arch/um/kernel/physmem.o
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
include/linux/irqflags.h:143:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:13:1: warning: "local_irq_restore" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
include/linux/irqflags.h:142:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:16:1: warning: "local_irq_save" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
include/linux/irqflags.h:138:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:19:1: warning: "local_irq_enable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
include/linux/irqflags.h:136:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:20:1: warning: "local_irq_disable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
include/linux/irqflags.h:137:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:22:1: warning: "irqs_disabled" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/mmzone.h:7,
                 from include/linux/bootmem.h:7,
                 from arch/um/kernel/physmem.c:6:
include/linux/irqflags.h:144:1: warning: this is the location of the previous definition
  CC      arch/um/kernel/process.o
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
/media/data1/linux-next/arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
include/linux/irqflags.h:143:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
/media/data1/linux-next/arch/um/include/asm/system.h:13:1: warning: "local_irq_restore" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
include/linux/irqflags.h:142:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
/media/data1/linux-next/arch/um/include/asm/system.h:16:1: warning: "local_irq_save" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
include/linux/irqflags.h:138:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
/media/data1/linux-next/arch/um/include/asm/system.h:19:1: warning: "local_irq_enable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
include/linux/irqflags.h:136:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
/media/data1/linux-next/arch/um/include/asm/system.h:20:1: warning: "local_irq_disable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
include/linux/irqflags.h:137:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
/media/data1/linux-next/arch/um/include/asm/system.h:22:1: warning: "irqs_disabled" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/hardirq.h:4,
                 from arch/um/kernel/process.c:9:
include/linux/irqflags.h:144:1: warning: this is the location of the previous definition
  CC      arch/um/kernel/ptrace.o
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
include/linux/irqflags.h:143:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:13:1: warning: "local_irq_restore" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
include/linux/irqflags.h:142:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:16:1: warning: "local_irq_save" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
include/linux/irqflags.h:138:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:19:1: warning: "local_irq_enable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
include/linux/irqflags.h:136:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:20:1: warning: "local_irq_disable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
include/linux/irqflags.h:137:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:22:1: warning: "irqs_disabled" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from include/linux/audit.h:362,
                 from arch/um/kernel/ptrace.c:6:
include/linux/irqflags.h:144:1: warning: this is the location of the previous definition
  CC      arch/um/kernel/reboot.o
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
include/linux/irqflags.h:143:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:13:1: warning: "local_irq_restore" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
include/linux/irqflags.h:142:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:16:1: warning: "local_irq_save" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
include/linux/irqflags.h:138:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:19:1: warning: "local_irq_enable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
include/linux/irqflags.h:136:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:20:1: warning: "local_irq_disable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
include/linux/irqflags.h:137:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:22:1: warning: "irqs_disabled" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/spinlock.h:50,
                 from include/linux/seqlock.h:29,
                 from include/linux/time.h:8,
                 from include/linux/timex.h:56,
                 from include/linux/sched.h:56,
                 from arch/um/kernel/reboot.c:6:
include/linux/irqflags.h:144:1: warning: this is the location of the previous definition
  CC      arch/um/kernel/sigio.o
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:11:1: warning: "local_save_flags" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
include/linux/irqflags.h:143:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:13:1: warning: "local_irq_restore" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
include/linux/irqflags.h:142:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:16:1: warning: "local_irq_save" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
include/linux/irqflags.h:138:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:19:1: warning: "local_irq_enable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
include/linux/irqflags.h:136:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:20:1: warning: "local_irq_disable" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
include/linux/irqflags.h:137:1: warning: this is the location of the previous definition
In file included from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
/media/data1/linux-next/arch/um/include/asm/system.h:22:1: warning: "irqs_disabled" redefined
In file included from /media/data1/linux-next/arch/um/sys-i386/shared/sysdep/system.h:11,
                 from /media/data1/linux-next/arch/um/include/asm/system.h:4,
                 from /media/data1/linux-next/arch/um/include/asm/fixmap.h:5,
                 from /media/data1/linux-next/arch/um/include/shared/um_uaccess.h:10,
                 from /media/data1/linux-next/arch/um/include/asm/uaccess.h:41,
                 from /media/data1/linux-next/arch/um/include/asm/thread_info.h:13,
                 from include/linux/thread_info.h:56,
                 from include/linux/preempt.h:9,
                 from include/linux/interrupt.h:8,
                 from arch/um/kernel/sigio.c:6:
include/linux/irqflags.h:144:1: warning: this is the location of the previous definition
arch/um/kernel/sigio.c: In function 'sigio_interrupt':
arch/um/kernel/sigio.c:19: error: 'SIGIO_WRITE_IRQ' undeclared (first use in this function)
arch/um/kernel/sigio.c:19: error: (Each undeclared identifier is reported only once
arch/um/kernel/sigio.c:19: error: for each function it appears in.)
arch/um/kernel/sigio.c: In function 'write_sigio_irq':
arch/um/kernel/sigio.c:27: error: 'SIGIO_WRITE_IRQ' undeclared (first use in this function)
make[1]: *** [arch/um/kernel/sigio.o] Error 1
make: *** [arch/um/kernel] Error 2

^ permalink raw reply

* Re: linux-next: manual merge of the msm tree with the arm tree
From: Nicolas Pitre @ 2010-10-18 23:32 UTC (permalink / raw)
  To: Daniel Walker
  Cc: Russell King, Stephen Rothwell, linux-next, lkml, Jeremy Kerr,
	Jeff Ohlstein
In-Reply-To: <1287443346.5588.120.camel@c-dwalke-linux.qualcomm.com>

On Mon, 18 Oct 2010, Daniel Walker wrote:

> On Mon, 2010-10-18 at 18:35 -0400, Nicolas Pitre wrote:
> 
> > > git show 08a610d9ef5394525b0328da0162d7b58c982cc4 | ./scripts/get_maintainer.pl | wc
> > >      58     163    2169
> > > 
> > > That's the patch we're actually discussing too. It's about one CC per
> > > file modified.
> > 
> > What is a mailing list for, then?  Why are you subscribed?
> 
> I'm subscribes to review code .. Do you read every patch that cross the
> arm list?

No, But I do read every email subject, and most patch messages.  Only 
those subjects I know for sure I have no interest in I do delete right 
away.

And being a human I sometimes screw up and let something I should have 
paid attention fall through the cracks.  When that happens I simply fix 
the issue after the fact and send a patch, and then life goes on.

If you don't want to actually follow the mailing list traffic, you can 
at least filter it by flagging those messages that contain a patch which 
touches one of those files you do care about.


Nicolas

^ permalink raw reply

* Re: linux-next: manual merge of the msm tree with the arm tree
From: Daniel Walker @ 2010-10-18 23:09 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Russell King, Stephen Rothwell, linux-next, lkml, Jeremy Kerr,
	Jeff Ohlstein
In-Reply-To: <alpine.LFD.2.00.1010181833440.2764@xanadu.home>

On Mon, 2010-10-18 at 18:35 -0400, Nicolas Pitre wrote:

> > git show 08a610d9ef5394525b0328da0162d7b58c982cc4 | ./scripts/get_maintainer.pl | wc
> >      58     163    2169
> > 
> > That's the patch we're actually discussing too. It's about one CC per
> > file modified.
> 
> What is a mailing list for, then?  Why are you subscribed?

I'm subscribes to review code .. Do you read every patch that cross the
arm list?


Daniel

^ permalink raw reply

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