* linux-next: no release for Sept 22
From: Stephen Rothwell @ 2009-09-22 2:21 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
Hi all,
There will be no linux-next again today as I am still a bit under the
weather (which means "ill" not "diving" or "skiing" :-)).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: rr tree build failure
From: Rusty Russell @ 2009-09-22 5:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Siarhei Liakh, Xuxian Jiang,
Arjan van de Ven, Linus Torvalds
In-Reply-To: <20090915132748.18662dc9.sfr@canb.auug.org.au>
On Tue, 15 Sep 2009 12:57:48 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> On Wed, 9 Sep 2009 13:47:52 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next build (powerpc ppc64_defconfig) failed like this:.
>
> Still happening ... Siarhei posted a replacement patch on Sept 11.
Sorry, was on leave for 3 weeks. I hope Linus will be flexible; many of these
patches have been in linux-next for months now, it'd be nice to unload.
Thanks,
Rusty.
^ permalink raw reply
* Re: [PATCH v6] RO/NX protection for loadable kernel modules
From: Siarhei Liakh @ 2009-09-22 15:49 UTC (permalink / raw)
To: Dave Jones, Siarhei Liakh, linux-kernel, linux-security-module,
linux-next, Arjan
In-Reply-To: <20090921214046.GA17243@redhat.com>
> Hi Siarhei,
> I tried out this patch on 2.6.31, and got the following trace during bootup..
>
> ------------[ cut here ]------------
> WARNING: at kernel/trace/ftrace.c:1003 ftrace_bug+0x198/0x27e() (Not tainted)
> Hardware name: VGN-Z540N
...
> ---[ end trace 95b33ebf87286ae6 ]---
> ftrace faulted on writing [<ffffffffa0000193>] video_output_register+0x11/0x10a [output]
>
>
> I guess ftrace is trying to NOP out something in the modules which
> are marked read-only ?
Entirely possible. I will review ftrace and make sure the patch
accounts for this.
Thank you.
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH v6] RO/NX protection for loadable kernel modules
From: Siarhei Liakh @ 2009-09-22 15:50 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-kernel, linux-security-module, linux-next, Arjan van de Ven,
James Morris, Andrew Morton, Andi Kleen, Thomas Gleixner,
H. Peter Anvin, Ingo Molnar, Stephen Rothwell
In-Reply-To: <200909220929.32301.rusty@rustcorp.com.au>
> This is usually considered a bad idea. Make a new config option,
> CONFIG_HAVE_SET_MEMORY_PROTECTION, select it in arch/x86/Kconfig.
> Then wrap the entire functions in one #ifdef CONFIG_HAVE_....
> and put empty versions in the #else.
Ok, will do.
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* linux-next: failed to fetch md-current and md trees
From: Stephen Rothwell @ 2009-09-22 23:08 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
Hi Neil,
Today's linux-next fetch of the md{,-curent} trees failed like this:
md-current: git
fatal: The remote end hung up unexpectedly
I will use the version that I have previously fetched.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the ocfs2 tree with Linus' tree
From: Stephen Rothwell @ 2009-09-23 0:45 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel
Hi Joel,
Today's linux-next merge of the ocfs2 tree got conflicts in
arch/x86/ia32/ia32entry.S, arch/x86/include/asm/unistd_32.h,
arch/x86/include/asm/unistd_64.h and arch/x86/kernel/syscall_table_32.S
between various commits from Linus' tree and commit
25767b48501de19421ae86c406b2dd42df37baf3 ("fs: Add the reflink()
operation and reflinkat(2) system call") from the ocfs2 tree.
I fixed it up (see below) and can carry the fix for a short while. Given
the ongoing discussions about this patch with Linus, however, it may be
worth dropping for now?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/ia32/ia32entry.S
index 74619c4,5fede3e..0000000
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@@ -831,5 -831,6 +831,6 @@@ ia32_sys_call_table
.quad compat_sys_preadv
.quad compat_sys_pwritev
.quad compat_sys_rt_tgsigqueueinfo /* 335 */
- .quad sys_perf_counter_open
+ .quad sys_perf_event_open
+ .quad sys_reflinkat
ia32_syscall_end:
diff --cc arch/x86/include/asm/unistd_32.h
index 6fb3c20,a7924e9..0000000
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@@ -341,12 -341,11 +341,13 @@@
#define __NR_preadv 333
#define __NR_pwritev 334
#define __NR_rt_tgsigqueueinfo 335
-#define __NR_perf_counter_open 336
+#define __NR_perf_event_open 336
+ #define __NR_reflinkat 337
#ifdef __KERNEL__
- #define NR_syscalls 337
++#define NR_syscalls 338
+
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
#define __ARCH_WANT_OLD_STAT
diff --cc arch/x86/include/asm/unistd_64.h
index 8d3ad0a,b8df7a2..0000000
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@@ -659,8 -659,10 +659,10 @@@ __SYSCALL(__NR_preadv, sys_preadv
__SYSCALL(__NR_pwritev, sys_pwritev)
#define __NR_rt_tgsigqueueinfo 297
__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open 298
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+#define __NR_perf_event_open 298
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
+ #define __NR_reflinkat 299
+ __SYSCALL(__NR_reflinkat, sys_reflinkat)
#ifndef __NO_STUBS
#define __ARCH_WANT_OLD_READDIR
diff --cc arch/x86/kernel/syscall_table_32.S
index 0157cd2,d3b6ebe..0000000
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@@ -335,4 -335,5 +335,5 @@@ ENTRY(sys_call_table
.long sys_preadv
.long sys_pwritev
.long sys_rt_tgsigqueueinfo /* 335 */
- .long sys_perf_counter_open
+ .long sys_perf_event_open
+ .long sys_reflinkat
^ permalink raw reply
* linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree
From: Stephen Rothwell @ 2009-09-23 1:42 UTC (permalink / raw)
To: Jean Delvare
Cc: linux-next, linux-kernel, Rudolf Marek, Michael Riepe,
Andrew Morton
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
Hi Jean,
Today's linux-next merge of the jdelvare-hwmon tree got a conflict in
drivers/hwmon/coretemp.c between commit
0bf41d9f414a5cf558aff234a0ff486257537574 ("drivers/hwmon/coretemp.c:
enable the Intel Atom") from Linus' tree and commit
af663ff4d88e09c4e45661251e3c1eeff147ffc1 ("hwmon: (coretemp) Add support
for Atom CPUs") from the jdelvare-hwmon tree.
I used the version from the jdelvare-hwmon for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the ocfs2 tree with Linus' tree
From: Joel Becker @ 2009-09-23 3:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20090923104537.2885f67a.sfr@canb.auug.org.au>
On Wed, Sep 23, 2009 at 10:45:37AM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the ocfs2 tree got conflicts in
> arch/x86/ia32/ia32entry.S, arch/x86/include/asm/unistd_32.h,
> arch/x86/include/asm/unistd_64.h and arch/x86/kernel/syscall_table_32.S
> between various commits from Linus' tree and commit
> 25767b48501de19421ae86c406b2dd42df37baf3 ("fs: Add the reflink()
> operation and reflinkat(2) system call") from the ocfs2 tree.
>
> I fixed it up (see below) and can carry the fix for a short while. Given
> the ongoing discussions about this patch with Linus, however, it may be
> worth dropping for now?
The syscall is dropping while it's reworked. I should have a
tree up shortly without the syscall.
Joel
--
Life's Little Instruction Book #15
"Own a great stereo system."
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127
^ permalink raw reply
* linux-next: block tree build failure
From: Stephen Rothwell @ 2009-09-23 4:51 UTC (permalink / raw)
To: Jens Axboe
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, Philipp Reisner,
linux-next-u79uwXL29TY76Z2rM5mHXA, Lars Ellenberg,
Christoph Hellwig, drbd-dev-cunTk1MwBs8qoQakbn7OcQ
[-- Attachment #1.1: Type: text/plain, Size: 733 bytes --]
Hi Jens,
Today's linux-next build (x86_64 allmodconfig) failed like this:
drivers/block/drbd/drbd_tracing.c:29:26: error: linux/marker.h: No such file or directory
Caused by commit 95eaef1cbc63f73df4ff8559dd66b1d29b462535 ("Replaced our
own tracing stuff with Linux's tracepoints") from the block/drbd trees
interacting with commit fc5377668c3d808e1d53c4aee152c836f55c3490
("tracing: Remove markers") from Linus' tree.
I have no idea what the correct thing to do is here, so I have reverted
the merge of the drbd tree into the block tree and will have to drop the
drbd tree for today.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
http://www.canb.auug.org.au/~sfr/
[-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
drbd-dev mailing list
drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org
http://lists.linbit.com/mailman/listinfo/drbd-dev
^ permalink raw reply
* Re: linux-next: manual merge of the ocfs2 tree with Linus' tree
From: Stephen Rothwell @ 2009-09-23 5:25 UTC (permalink / raw)
To: Joel Becker; +Cc: linux-next, linux-kernel
In-Reply-To: <20090923031450.GB29799@mail.oracle.com>
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
Hi Joel,
On Tue, 22 Sep 2009 20:14:50 -0700 Joel Becker <Joel.Becker@oracle.com> wrote:
>
> The syscall is dropping while it's reworked. I should have a
> tree up shortly without the syscall.
OK, thanks. I will pick it up tomorrow.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: manual merge of the usb tree with Linus' tree
From: Stephen Rothwell @ 2009-09-23 6:38 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jan Beulich, Jason Wessel
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/x86/kernel/early_printk.c between commit
414128bd33fef3242747154dfa444970bc5caf4c ("x86: Increase timeout for EHCI
debug port reset completion in early printk") from Linus' tree and commit
bd965307ef6b7a56219f8883d5038f6573a94f6e ("USB: ehci,dbgp,early_printk:
split ehci debug driver from early_printk.c") from the usb tree.
The latter moved the code that the former modified. A later USB patch
used an even longer loop delay.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: block tree build failure
From: Lars Ellenberg @ 2009-09-23 7:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jens Axboe, linux-next, linux-kernel, Philipp Reisner, drbd-dev,
Christoph Hellwig
In-Reply-To: <20090923145100.1917fdd8.sfr@canb.auug.org.au>
On Wed, Sep 23, 2009 at 02:51:00PM +1000, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next build (x86_64 allmodconfig) failed like this:
>
> drivers/block/drbd/drbd_tracing.c:29:26: error: linux/marker.h: No such file or directory
>
> Caused by commit 95eaef1cbc63f73df4ff8559dd66b1d29b462535 ("Replaced our
> own tracing stuff with Linux's tracepoints") from the block/drbd trees
> interacting with commit fc5377668c3d808e1d53c4aee152c836f55c3490
> ("tracing: Remove markers") from Linus' tree.
>
> I have no idea what the correct thing to do is here, so I have reverted
> the merge of the drbd tree into the block tree and will have to drop the
> drbd tree for today.
We'll have a look.
A quick fix should be to just disable CONFIG_DRBD_TRACE.
--
: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com
DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.
^ permalink raw reply
* Re: linux-next: block tree build failure
From: Stephen Rothwell @ 2009-09-23 7:32 UTC (permalink / raw)
To: Lars Ellenberg
Cc: Jens Axboe, linux-next, linux-kernel, Philipp Reisner, drbd-dev,
Christoph Hellwig
In-Reply-To: <20090923071152.GA8000@barkeeper1-xen.linbit>
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
Hi Lars,
On Wed, 23 Sep 2009 09:11:52 +0200 Lars Ellenberg <lars.ellenberg@linbit.com> wrote:
>
> We'll have a look.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* linux-next: Tree for September 23
From: Stephen Rothwell @ 2009-09-23 7:43 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 9924 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090918:
Dropped tree: drbd (effectively (by reversion) due to a build problem).
We are seeing conflicts resolved and move from one tree to another as
Linus merges them.
I added the obvious fix for the kmemcheck warning.
The input-current tree lost its build failure.
The ocfs2 tree gained a conflict against Linus tree.
The jdelvare-hwmon gained a conflict against Linus' tree.
The rr tree lost its build failure.
The block tree gained a build failure due to on interaction between the
drbd tree (which has been merged into the block tree) and Linus' tree so
I reverted the drbd tree for today.
The usb tree gained a conflict against Linus' 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 140 trees (counting Linus' and 21 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
CONFLICT (content): Merge conflict in MAINTAINERS
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (delete/modify): drivers/staging/cpc-usb/TODO deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/TODO left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc-usb_drv.c deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc-usb_drv.c left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc_int.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc_int.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpcusb.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpcusb.h left in tree.
$ git rm -f drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
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
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
$ git checkout HEAD arch/mips/Kconfig arch/mips/bcm63xx/Makefile arch/mips/bcm63xx/boards/board_bcm963xx.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Applying: kmemcheck: fix build warning
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
CONFLICT (content): Merge conflict in fs/nilfs2/super.c
$ git checkout HEAD fs/nilfs2/super.c
Merging ocfs2/linux-next
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
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 quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in drivers/hwmon/coretemp.c
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
CONFLICT (content): Merge conflict in scripts/basic/fixdep.c
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
[master 0bd997b] Revert "Merge branch 'drbd' of git://git.drbd.org/linux-2.6-drbd into for-linus"
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
CONFLICT (content): Merge conflict in MAINTAINERS
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in arch/x86/kernel/early_printk.c
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the jdelvare-hwmon tree with Linus' tree
From: Jean Delvare @ 2009-09-23 8:51 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Rudolf Marek, Michael Riepe,
Andrew Morton
In-Reply-To: <20090923114257.e6e101cf.sfr@canb.auug.org.au>
Hi Stephen,
On Wed, 23 Sep 2009 11:42:57 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the jdelvare-hwmon tree got a conflict in
> drivers/hwmon/coretemp.c between commit
> 0bf41d9f414a5cf558aff234a0ff486257537574 ("drivers/hwmon/coretemp.c:
> enable the Intel Atom") from Linus' tree and commit
> af663ff4d88e09c4e45661251e3c1eeff147ffc1 ("hwmon: (coretemp) Add support
> for Atom CPUs") from the jdelvare-hwmon tree.
>
> I used the version from the jdelvare-hwmon for today.
Thanks for the heads up. Apparently someone managed to sneak in broken
Atom support into coretemp, while I have a working version in my hwmon
tree, which I intend to push to Linus today. I'll rebase my patch on
upstream so that it applies again, and I'll send it quickly.
--
Jean Delvare
^ permalink raw reply
* Re: linux-next: block tree build failure
From: Lars Ellenberg @ 2009-09-23 11:12 UTC (permalink / raw)
To: Stephen Rothwell, Jens Axboe, linux-next-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Philipp Reisner, dr
In-Reply-To: <20090923071152.GA8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
On Wed, Sep 23, 2009 at 09:11:52AM +0200, Lars Ellenberg wrote:
> On Wed, Sep 23, 2009 at 02:51:00PM +1000, Stephen Rothwell wrote:
> > Hi Jens,
> >
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> >
> > drivers/block/drbd/drbd_tracing.c:29:26: error: linux/marker.h: No such file or directory
> >
> > Caused by commit 95eaef1cbc63f73df4ff8559dd66b1d29b462535 ("Replaced our
> > own tracing stuff with Linux's tracepoints") from the block/drbd trees
> > interacting with commit fc5377668c3d808e1d53c4aee152c836f55c3490
> > ("tracing: Remove markers") from Linus' tree.
> >
> > I have no idea what the correct thing to do is here, so I have reverted
> > the merge of the drbd tree into the block tree and will have to drop the
> > drbd tree for today.
>
> We'll have a look.
Sorry that it took me so long to have that look.
We can simply drop that include, we don't even use it.
diff --git a/drivers/block/drbd/drbd_tracing.c
b/drivers/block/drbd/drbd_tracing.c
index aefe986..d18d4f7 100644
--- a/drivers/block/drbd/drbd_tracing.c
+++ b/drivers/block/drbd/drbd_tracing.c
@@ -26,7 +26,6 @@
#include <linux/module.h>
#include <linux/drbd.h>
#include <linux/ctype.h>
-#include <linux/marker.h>
#include "drbd_int.h"
#include "drbd_tracing.h"
#include <linux/drbd_tag_magic.h>
Will be visible in our tree shortly.
Thanks,
Lars
^ permalink raw reply related
* Re: linux-next: block tree build failure
From: Stephen Rothwell @ 2009-09-23 11:56 UTC (permalink / raw)
To: Lars Ellenberg
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA, Philipp Reisner,
linux-next-u79uwXL29TY76Z2rM5mHXA, Jens Axboe, Christoph Hellwig,
drbd-dev-cunTk1MwBs8qoQakbn7OcQ
In-Reply-To: <20090923111225.GC8000-pI6ZZpWkm2Ob3Om96lsyHpni2hclXnRB@public.gmane.org>
[-- Attachment #1.1: Type: text/plain, Size: 429 bytes --]
Hi Lars,
On Wed, 23 Sep 2009 13:12:25 +0200 Lars Ellenberg <lars.ellenberg-63ez5xqkn6Bhl2p70BpVqQ@public.gmane.orgm> wrote:
>
> Sorry that it took me so long to have that look.
> We can simply drop that include, we don't even use it.
OK, great. I guess Jens needs to remerge your tree.
--
Cheers,
Stephen Rothwell sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org
http://www.canb.auug.org.au/~sfr/
[-- Attachment #1.2: Type: application/pgp-signature, Size: 198 bytes --]
[-- Attachment #2: Type: text/plain, Size: 169 bytes --]
_______________________________________________
drbd-dev mailing list
drbd-dev-cunTk1MwBs8qoQakbn7OcQ@public.gmane.org
http://lists.linbit.com/mailman/listinfo/drbd-dev
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Jason Wessel @ 2009-09-23 12:38 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH; +Cc: linux-next, linux-kernel, Jan Beulich
In-Reply-To: <20090923163817.44bcebb8.sfr@canb.auug.org.au>
Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/x86/kernel/early_printk.c between commit
> 414128bd33fef3242747154dfa444970bc5caf4c ("x86: Increase timeout for EHCI
> debug port reset completion in early printk") from Linus' tree and commit
> bd965307ef6b7a56219f8883d5038f6573a94f6e ("USB: ehci,dbgp,early_printk:
> split ehci debug driver from early_printk.c") from the usb tree.
>
> The latter moved the code that the former modified. A later USB patch
> used an even longer loop delay.
>
>
Please, let me know if there is something I need to do here.
Simply changing the context of the patch in Greg's branch should be
enough. There are many more fixes beyond just the timing loop in the
dbgp series which cover, cold and warm restarts and various errata with
the ehci debug controllers.
Hopefully we can get the dbgp series merged soon because this particular
errata was fixed several months ago. :-)
Thanks,
Jason.
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Stephen Rothwell @ 2009-09-23 12:50 UTC (permalink / raw)
To: Jason Wessel; +Cc: Greg KH, linux-next, linux-kernel, Jan Beulich
In-Reply-To: <4ABA16BF.4020504@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 674 bytes --]
Hi Jason,
On Wed, 23 Sep 2009 07:38:23 -0500 Jason Wessel <jason.wessel@windriver.com> wrote:
>
> Please, let me know if there is something I need to do here.
>
> Simply changing the context of the patch in Greg's branch should be
> enough. There are many more fixes beyond just the timing loop in the
> dbgp series which cover, cold and warm restarts and various errata with
> the ehci debug controllers.
Yeah, I think Greg just needs to rebase his series on to a more recent
version of Linus' tree. (and then test and submit it, of course :-))
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Greg KH @ 2009-09-23 13:20 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jason Wessel, linux-next, linux-kernel, Jan Beulich
In-Reply-To: <20090923225026.c03c84c6.sfr@canb.auug.org.au>
On Wed, Sep 23, 2009 at 10:50:26PM +1000, Stephen Rothwell wrote:
> Hi Jason,
>
> On Wed, 23 Sep 2009 07:38:23 -0500 Jason Wessel <jason.wessel@windriver.com> wrote:
> >
> > Please, let me know if there is something I need to do here.
> >
> > Simply changing the context of the patch in Greg's branch should be
> > enough. There are many more fixes beyond just the timing loop in the
> > dbgp series which cover, cold and warm restarts and various errata with
> > the ehci debug controllers.
>
> Yeah, I think Greg just needs to rebase his series on to a more recent
> version of Linus' tree. (and then test and submit it, of course :-))
It was a simple merge, I've now refreshed my tree with this change
locally, and will push it out in a bit.
thanks,
greg k-h
^ permalink raw reply
* PATCH 0/1: rt2x00dev.c / rt2x00lib.h fixes build breakage
From: Ken Lewis @ 2009-09-23 20:58 UTC (permalink / raw)
To: linux-next, LKML, netdev
The headers in drivers/net/wireless/rt2x00/rt2x00lib.h don't match the
use of the function in rt2x00dev.c The build fails as a result.
This has been a problem in linux-next since early September. I've
e-mailed a patch to linux-next and to linux-net, but the 2.6.32 merge
window has brought the problem to the mainline and so I'm re-sending
my patch. I've opened a bug on bugzilla:
http://bugzilla.kernel.org/show_bug.cgi?id=14217
Take care.
Ken
^ permalink raw reply
* PATCH 1/1: rt2x00dev.c / rt2x00lib.h fixes build breakage
From: Ken Lewis @ 2009-09-23 20:59 UTC (permalink / raw)
To: LKML, linux-next, netdev
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
The headers in drivers/net/wireless/rt2x00/rt2x00lib.h don't match the
use of the function in rt2x00dev.c The build fails as a result.
This has been a problem in linux-next since early September. I've
e-mailed a patch to linux-next and to linux-net, but the 2.6.32 merge
window has brought the problem to the mainline and so I'm re-sending
my patch. I've opened a bug on bugzilla:
http://bugzilla.kernel.org/show_bug.cgi?id=14217
Take care.
Ken
[-- Attachment #2: diff-fix-for-rt2x00lib.h.patch --]
[-- Type: text/x-diff, Size: 544 bytes --]
diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h
index 5462cb5..567f029 100644
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
@@ -380,7 +380,7 @@ static inline void rt2x00crypto_tx_insert_iv(struct sk_buff *skb,
{
}
-static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb, bool l2pad,
+static inline void rt2x00crypto_rx_insert_iv(struct sk_buff *skb,
unsigned int header_length,
struct rxdone_entry_desc *rxdesc)
{
^ permalink raw reply related
* linux-next: manual merge of the tip tree with Linus' tree
From: Stephen Rothwell @ 2009-09-24 4:07 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Heiko Carstens, Stefani Seibold
Hi all,
Today's linux-next merge of the tip tree got a conflict in
fs/proc/array.c between commit d899bf7b55f503ba7d3d07ed27c3a37e270fa7db
("procfs: provide stack information for threads") from Linus' tree and
commit d01d4827858cdc2e1c437c87ab65ec0a00fd40f8 ("sched: Always show
Cpus_allowed field in /proc/<pid>/status") from the tip tree.
Just overlapping additions. I fixed it up (see below) and can cay the
fix for a while. This appears to be fixed the same way in tip:master.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/proc/array.c
index 0c6bc60,762aea9..0000000
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@@ -322,87 -321,16 +322,97 @@@ static inline void task_context_switch_
p->nivcsw);
}
+struct stack_stats {
+ struct vm_area_struct *vma;
+ unsigned long startpage;
+ unsigned long usage;
+};
+
+static int stack_usage_pte_range(pmd_t *pmd, unsigned long addr,
+ unsigned long end, struct mm_walk *walk)
+{
+ struct stack_stats *ss = walk->private;
+ struct vm_area_struct *vma = ss->vma;
+ pte_t *pte, ptent;
+ spinlock_t *ptl;
+ int ret = 0;
+
+ pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl);
+ for (; addr != end; pte++, addr += PAGE_SIZE) {
+ ptent = *pte;
+
+#ifdef CONFIG_STACK_GROWSUP
+ if (pte_present(ptent) || is_swap_pte(ptent))
+ ss->usage = addr - ss->startpage + PAGE_SIZE;
+#else
+ if (pte_present(ptent) || is_swap_pte(ptent)) {
+ ss->usage = ss->startpage - addr + PAGE_SIZE;
+ pte++;
+ ret = 1;
+ break;
+ }
+#endif
+ }
+ pte_unmap_unlock(pte - 1, ptl);
+ cond_resched();
+ return ret;
+}
+
+static inline unsigned long get_stack_usage_in_bytes(struct vm_area_struct *vma,
+ struct task_struct *task)
+{
+ struct stack_stats ss;
+ struct mm_walk stack_walk = {
+ .pmd_entry = stack_usage_pte_range,
+ .mm = vma->vm_mm,
+ .private = &ss,
+ };
+
+ if (!vma->vm_mm || is_vm_hugetlb_page(vma))
+ return 0;
+
+ ss.vma = vma;
+ ss.startpage = task->stack_start & PAGE_MASK;
+ ss.usage = 0;
+
+#ifdef CONFIG_STACK_GROWSUP
+ walk_page_range(KSTK_ESP(task) & PAGE_MASK, vma->vm_end,
+ &stack_walk);
+#else
+ walk_page_range(vma->vm_start, (KSTK_ESP(task) & PAGE_MASK) + PAGE_SIZE,
+ &stack_walk);
+#endif
+ return ss.usage;
+}
+
+static inline void task_show_stack_usage(struct seq_file *m,
+ struct task_struct *task)
+{
+ struct vm_area_struct *vma;
+ struct mm_struct *mm = get_task_mm(task);
+
+ if (mm) {
+ down_read(&mm->mmap_sem);
+ vma = find_vma(mm, task->stack_start);
+ if (vma)
+ seq_printf(m, "Stack usage:\t%lu kB\n",
+ get_stack_usage_in_bytes(vma, task) >> 10);
+
+ up_read(&mm->mmap_sem);
+ mmput(mm);
+ }
+}
+
+ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+ {
+ seq_printf(m, "Cpus_allowed:\t");
+ seq_cpumask(m, &task->cpus_allowed);
+ seq_printf(m, "\n");
+ seq_printf(m, "Cpus_allowed_list:\t");
+ seq_cpumask_list(m, &task->cpus_allowed);
+ seq_printf(m, "\n");
+ }
+
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
^ permalink raw reply
* linux-next: tree build failure
From: Stephen Rothwell @ 2009-09-24 5:21 UTC (permalink / raw)
To: ppc-dev
Cc: Hollis Blanchard, linux-kernel, kvm-ppc, linux-next, Jan Beulich,
Andrew Morton
Hi all,
Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
In file included from arch/powerpc/kvm/booke.c:31:
arch/powerpc/kvm/timing.h: In function 'kvmppc_account_exit_stat':
arch/powerpc/kvm/timing.h:51: error: bit-field '<anonymous>' width not an integer constant
In file included from arch/powerpc/kvm/booke.h:26,
from arch/powerpc/kvm/booke_emulate.c:23:
arch/powerpc/kvm/timing.h: In function 'kvmppc_account_exit_stat':
arch/powerpc/kvm/timing.h:51: error: bit-field '<anonymous>' width not an integer constant
Presumably caused by commit 8c87df457cb58fe75b9b893007917cf8095660a0
("BUILD_BUG_ON(): fix it and a couple of bogus uses of it").
I applied the following patch for today. This inline function is
only called from one place in one file ...
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 24 Sep 2009 15:13:20 +1000
Subject: [PATCH] powerpc/kvm: build fix for new BUILD_BUG_ON
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/kvm/timing.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/kvm/timing.h b/arch/powerpc/kvm/timing.h
index bb13b1f..4c34099 100644
--- a/arch/powerpc/kvm/timing.h
+++ b/arch/powerpc/kvm/timing.h
@@ -48,7 +48,7 @@ static inline void kvmppc_set_exit_type(struct kvm_vcpu *vcpu, int type) {}
static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type)
{
/* type has to be known at build time for optimization */
- BUILD_BUG_ON(__builtin_constant_p(type));
+ //BUILD_BUG_ON(__builtin_constant_p(type));
switch (type) {
case EXT_INTR_EXITS:
vcpu->stat.ext_intr_exits++;
--
1.6.4.3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply related
* linux-next: Tree for September 24
From: Stephen Rothwell @ 2009-09-24 6:25 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 9251 bytes --]
Hi all,
Please do not add code destined for 2.6.33 into linux-next trees until
(at least) 2.6.32-rc1 is out. This will hopefully give those who have
stuff destined for just after -rc1 a chance.
Changes since 20090923:
Undropped tree: drbd
We are seeing conflicts resolved and move from one tree to another as
Linus merges them.
The ocfs2 tree lost its conflicts.
The jdelvare-hwmon tree lost its conflicts.
The block and drbd trees lost their build failure.
The battery tree lost its conflict.
The tip tree gained a conflict against Linus' tree.
The usb tree lost its conflict.
I applied a patch for a build failure in Linus' 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 139 trees (counting Linus' and 21 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
CONFLICT (content): Merge conflict in MAINTAINERS
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (delete/modify): drivers/staging/cpc-usb/TODO deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/TODO left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc-usb_drv.c deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc-usb_drv.c left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc_int.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc_int.h left in tree.
CONFLICT (delete/modify): drivers/staging/cpc-usb/cpcusb.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpcusb.h left in tree.
$ git rm -f drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-hcd.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-mem.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci-ring.c
CONFLICT (content): Merge conflict in drivers/usb/host/xhci.h
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/Kconfig
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile
CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c
CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree.
CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree.
$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c
Merging parisc/next
CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h
CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S
CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-rx.c
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
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
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging drbd/drbd
Merging kmemleak/kmemleak
Merging tip/auto-latest
CONFLICT (content): Merge conflict in fs/proc/array.c
Merging oprofile/for-next
Merging percpu/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/scsi/Makefile
CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c
CONFLICT (content): Merge conflict in kernel/sysctl.c
Applying: powerpc/kvm: build fix for new BUILD_BUG_ON
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ 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