linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for April 10
@ 2008-04-10  8:14 Stephen Rothwell
  2008-04-10 10:24 ` [BUG] linux-next: Tree for April 10 - kernel panic while loading ata driver on powermac Kamalesh Babulal
                   ` (5 more replies)
  0 siblings, 6 replies; 31+ messages in thread
From: Stephen Rothwell @ 2008-04-10  8:14 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

[I have been asked to provide a summary of changes before the biolerplate
so here goes (please tell me if this is what you want or not).  I am not
going to try to describe the changes in the individual trees, just the
interactions between them.]

Changes since next-20080410:

I no longer revert "x86: phase out forced inlining".
There is a new conflict in arch/s390/lib/uaccess_pt.c between the s390 and
	kvm trees.
There is a new trivial white space conflict in arch/ia64/kernel/mca.c.
I no longer need to revert "wusb: add the wireless usb stack to Linux".

Today's Next/Trees file is lying: the x86-latest and sched-latest trees
did not merge/build correctly so have not been included.

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

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(tar balls at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/).

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.

There were a few merge conflicts (fairly trivial) and couple of build
failures (notified).  There is a know build failure with powerpc
allyesconfig.  Below is a summary of the state of the merge.

We are up to 55 trees, 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/ and the guys at http://test.kernel.org/.

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

Merging origin/master
Merging x86-fixes/for-linus
Merging sched-fixes/for-linus
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging quilt/driver-core
Merging quilt/pci
Merging quilt/usb
Merging x86/for-akpm
Merging sched/for-akpm
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in Documentation/ide/ide.txt
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in drivers/ide/ide.c
CONFLICT (content): Merge conflict in include/asm-x86/ide.h
CONFLICT (content): Merge conflict in include/linux/Kbuild
Merging libata/NEXT
Applying libata-fix-1
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
CONFLICT (content): Merge conflict in drivers/infiniband/hw/amso1100/c2_provider.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/cxgb3/iwch_provider.c
CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_verbs.c
Applying infiniband-fix-2
Merging acpi/test
CONFLICT (content): Merge conflict in arch/x86/kernel/setup_64.c
CONFLICT (delete/modify): arch/x86/kernel/smpboot_64.c deleted in HEAD and modified in acpi/test. Version acpi/test of arch/x86/kernel/smpboot_64.c left in tree.
CONFLICT (delete/modify): include/asm-x86/smp_64.h deleted in HEAD and modified in acpi/test. Version acpi/test of include/asm-x86/smp_64.h left in tree.
$ git rm arch/x86/kernel/smpboot_64.c include/asm-x86/smp_64.h
Applying acpi-fix-1
Applying acpi-fix-2
Merging blackfin/for-linus
Merging nfsd/nfsd-next
Merging ieee1394/for-next
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
CONFLICT (content): Merge conflict in arch/s390/lib/uaccess_pt.c
CONFLICT (add/add): Merge conflict in include/asm-s390/sysinfo.h
CONFLICT (content): Merge conflict in include/asm-x86/kvm_host.h
Merging dlm/next
Merging scsi/master
Merging ia64/test
CONFLICT (content): Merge conflict in arch/ia64/kernel/mca.c
CONFLICT (content): Merge conflict in arch/ia64/mm/tlb.c
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
Merging hrt/mm
Merging lblnet/master
Merging ext4/next
CONFLICT (content): Merge conflict in fs/jbd2/journal.c
CONFLICT (content): Merge conflict in fs/jbd2/revoke.c
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in MAINTAINERS
Merging galak/powerpc-next
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_ioctl.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_ialloc.c
CONFLICT (content): Merge conflict in fs/xfs/xfs_sb.h
Merging semaphore/semaphore
CONFLICT (delete/modify): include/asm-x86/semaphore_32.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_32.h left in tree.
CONFLICT (delete/modify): include/asm-x86/semaphore_64.h deleted in semaphore/semaphore and modified in HEAD. Version HEAD of include/asm-x86/semaphore_64.h left in tree.
$ git rm include/asm-x86/semaphore_32.h include/asm-x86/semaphore_64.h
Merging quilt/ldp
Applying parport_pc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying nsc-ircc: wrap PNP probe code in #ifdef CONFIG_PNP
Applying smsc-ircc2: wrap PNP probe code in #ifdef CONFIG_PNP

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

^ permalink raw reply	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2008-04-14 22:29 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-10  8:14 linux-next: Tree for April 10 Stephen Rothwell
2008-04-10 10:24 ` [BUG] linux-next: Tree for April 10 - kernel panic while loading ata driver on powermac Kamalesh Babulal
2008-04-10 10:45   ` Jeff Garzik
2008-04-10 11:02     ` Kamalesh Babulal
2008-04-10 11:32     ` Alan Cox
2008-04-10 12:14       ` Jeff Garzik
2008-04-10 12:03   ` Bartlomiej Zolnierkiewicz
2008-04-10 17:14     ` Bartlomiej Zolnierkiewicz
2008-04-10 18:25       ` Kamalesh Babulal
2008-04-10 19:16         ` Bartlomiej Zolnierkiewicz
2008-04-10 17:42 ` linux-next: Tree for April 10 Greg KH
2008-04-10 18:07 ` [BUG] linux-next: April 10 - kernel oops at kmem_cache_alloc () regression from April 9 kernel Kamalesh Babulal
2008-04-11 17:56   ` Suresh Siddha
2008-04-14 13:14     ` Kamalesh Babulal
2008-04-10 19:34 ` linux-next: Tree for April 10: generic pci_enable_resources() strikes again Mariusz Kozlowski
2008-04-14  1:48   ` Stephen Rothwell
2008-04-14  4:28     ` Greg KH
2008-04-14  4:49       ` Stephen Rothwell
2008-04-10 22:07 ` linux-next: Tree for April 10 (ftrace) Randy Dunlap
2008-04-10 22:09 ` linux-next: Tree for April 10 (arch/x86) Randy Dunlap
2008-04-11  7:46   ` Ingo Molnar
2008-04-11 15:19     ` Randy Dunlap
2008-04-11 15:26       ` Al Viro
2008-04-14  8:12         ` Ingo Molnar
2008-04-14  8:22           ` Al Viro
2008-04-14  8:34             ` Ingo Molnar
2008-04-14  8:43               ` Jakub Jelinek
2008-04-14  9:30                 ` Al Viro
2008-04-14  9:37                   ` David Miller
2008-04-14  8:40       ` Jakub Jelinek
2008-04-14 22:28         ` Randy Dunlap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).