* linux-next: Tree for June 12
@ 2008-06-12 7:53 Stephen Rothwell
2008-06-13 19:56 ` Thomas Meyer
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2008-06-12 7:53 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 8490 bytes --]
Hi all,
Changes since next-20080611:
Dropped trees (temporary): ldp (it is unfetchable - probably something to
do with the new Staging tree), block (it just has too many conflicts and
breaks the powerpc build).
A few patches were removed from the driver-core tree which means some
conflicts with other trees have gone.
The pci tree lost two conflict with the driver-core tree.
The acpi tree gained a trivial conflict with the cpus4096 tree.
The powerpc tree lost seven conflicts with the driver-core tree.
The mmc tree lost its conflict with the driver-core tree.
The firmware tree gained a conflict with the bkl-removal tree. It also
required a build fix patch.
I have applied the following temporary patch for known build problems:
"Fix various 8390 builds" - the net tree broke builds on various
architectures - hopefully this patch will go into the net tree shortly.
"Revert "kbuild: simplify vmlinux link stage"" - this fixed the
powerpc allyesconfig and sparc32 defconfig builds.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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, it is also built with powerpc allnoconfig,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 90 trees (counting Linus' and 13 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 powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging quilt/driver-core
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in kernel/Makefile
Applying ftrace: fix rculist split fallout
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
CONFLICT (content): Merge conflict in include/linux/device.h
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c
CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c
CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c
CONFLICT (content): Merge conflict in drivers/s390/net/claw.c
CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c
CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c
Merging sh/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/acpi/processor_throttling.c
Merging blackfin/for-linus
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
Merging dlm/next
Merging scsi/master
Applying scsi: fix fallout from the class_find_device API change
Applying scsi: fix fallout from KOBJ_NAME_LEN removal
Merging ia64/test
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 lblnet/master
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging sparc/master
Merging galak/powerpc-next
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging mtd/master
CONFLICT (content): Merge conflict in include/asm-avr32/arch-at32ap/board.h
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
Merging sound/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Merging bkl-removal/bkl-removal
Merging trivial/next
Merging ubifs/for_andrew
Merging lsm/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/char/ip2/ip2main.c
CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
CONFLICT (content): Merge conflict in sound/pci/Kconfig
CONFLICT (content): Merge conflict in sound/pci/maestro3.c
CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
Applying firmware: fix ip2 conversion fallout
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig
CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile
Applying Fix various 8390 builds
Created commit 2eaed86: Revert "kbuild: simplify vmlinux link stage"
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for June 12
2008-06-13 19:56 ` Thomas Meyer
@ 2008-06-13 18:28 ` Takashi Iwai
2008-06-13 18:39 ` Thomas Meyer
0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2008-06-13 18:28 UTC (permalink / raw)
To: Thomas Meyer; +Cc: linux-next, LKML
At Fri, 13 Jun 2008 21:56:31 +0200,
Thomas Meyer wrote:
>
> Am Donnerstag, den 12.06.2008, 17:53 +1000 schrieb Stephen Rothwell:
>
> > Changes since next-20080611:
> >
>
> Beginning with next-20080612 i've got no sound!
>
> git bisect told me that, the offending commit is cbc5a5b7d12b4d461bff132f76abc0d4f9f3d8fc (ALSA: hda - Add bdl_pos_adj option):
>
> I need to add the option bdl_pos_adj=0, to make sound work again, which gives this dmesg entry:
>
> [ 64.697747] hda-intel: IRQ timing workaround is activated for card #0. Suggest a bigger bdl_pos_adj.
>
> The sound card is:
>
> $ cat /proc/asound/cards
> 0 [NVidia ]: HDA-Intel - HDA NVidia
> HDA NVidia at 0xfbff0000 irq 21
>
>
> $ /sbin/lspci -vv -s 00:06.1
> 00:06.1 Audio device: nVidia Corporation MCP55 High Definition Audio (rev a2)
> Subsystem: Micro-Star International Co., Ltd. Unknown device 7250
> Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
> Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
> Latency: 0 (500ns min, 1250ns max)
> Interrupt: pin B routed to IRQ 21
> Region 0: Memory at fbff0000 (32-bit, non-prefetchable) [size=16K]
> Capabilities: <access denied>
> Kernel driver in use: HDA Intel
> Kernel modules: snd-hda-intel
>
> What makes me wonder is, that the commit says:
> " The new option adds the size of the delay in frames. As default,
> it's set to 1 -- that is, one sample delay. Even the hardware is
> really correct, one sample delay is relatively harmless in comparison
> with reporting wrong positions."
>
> Maybe my definition of "harmless" is not "no sound".
> Would you please check this problem?
It was harmless for Intel and ATI hardwares :)
We've not tested NVidia ones. Good that you caught it fast.
Could you check whether another value, e.g. bdl_pos_adj=32 works?
Since the warning is shown with bdl_pos_adj=0, any position adjustment
is necessary, but likely Nvidia hardware doesn't allow such a fine
sample resolution like bdl_pos_adj=1.
Thanks,
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for June 12
2008-06-13 18:28 ` Takashi Iwai
@ 2008-06-13 18:39 ` Thomas Meyer
2008-06-13 18:48 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Meyer @ 2008-06-13 18:39 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, LKML
Zitat von Takashi Iwai <tiwai@suse•de>:
> It was harmless for Intel and ATI hardwares :)
> We've not tested NVidia ones. Good that you caught it fast.
>
> Could you check whether another value, e.g. bdl_pos_adj=32 works?
Yes, indeed. bdl_pos_adj=32 works, too.
Thanks for the quick response.
greets
thomas
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for June 12
2008-06-13 18:39 ` Thomas Meyer
@ 2008-06-13 18:48 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2008-06-13 18:48 UTC (permalink / raw)
To: Thomas Meyer; +Cc: linux-next, LKML
At Fri, 13 Jun 2008 20:39:27 +0200,
Thomas Meyer wrote:
>
> Zitat von Takashi Iwai <tiwai@suse•de>:
>
> > It was harmless for Intel and ATI hardwares :)
> > We've not tested NVidia ones. Good that you caught it fast.
> >
> > Could you check whether another value, e.g. bdl_pos_adj=32 works?
>
> Yes, indeed. bdl_pos_adj=32 works, too.
>
> Thanks for the quick response.
Thanks for a quick check!
Looks like bdl_pos_adj=32 except for Intel is safer.
I'll fix it now.
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for June 12
2008-06-12 7:53 linux-next: Tree for June 12 Stephen Rothwell
@ 2008-06-13 19:56 ` Thomas Meyer
2008-06-13 18:28 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Meyer @ 2008-06-13 19:56 UTC (permalink / raw)
To: tiwai; +Cc: linux-next, LKML
Am Donnerstag, den 12.06.2008, 17:53 +1000 schrieb Stephen Rothwell:
> Changes since next-20080611:
>
Beginning with next-20080612 i've got no sound!
git bisect told me that, the offending commit is cbc5a5b7d12b4d461bff132f76abc0d4f9f3d8fc (ALSA: hda - Add bdl_pos_adj option):
I need to add the option bdl_pos_adj=0, to make sound work again, which gives this dmesg entry:
[ 64.697747] hda-intel: IRQ timing workaround is activated for card #0. Suggest a bigger bdl_pos_adj.
The sound card is:
$ cat /proc/asound/cards
0 [NVidia ]: HDA-Intel - HDA NVidia
HDA NVidia at 0xfbff0000 irq 21
$ /sbin/lspci -vv -s 00:06.1
00:06.1 Audio device: nVidia Corporation MCP55 High Definition Audio (rev a2)
Subsystem: Micro-Star International Co., Ltd. Unknown device 7250
Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
Status: Cap+ 66MHz+ UDF- FastB2B+ ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
Latency: 0 (500ns min, 1250ns max)
Interrupt: pin B routed to IRQ 21
Region 0: Memory at fbff0000 (32-bit, non-prefetchable) [size=16K]
Capabilities: <access denied>
Kernel driver in use: HDA Intel
Kernel modules: snd-hda-intel
What makes me wonder is, that the commit says:
" The new option adds the size of the delay in frames. As default,
it's set to 1 -- that is, one sample delay. Even the hardware is
really correct, one sample delay is relatively harmless in comparison
with reporting wrong positions."
Maybe my definition of "harmless" is not "no sound".
Would you please check this problem?
greets
thomas
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: Tree for June 12
@ 2009-06-12 8:56 Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-06-12 8:56 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 11582 bytes --]
Hi all,
Isn't the merge window fun :-)
Changes since 20090611:
New tree: rr-latest-cpumask
Dropped tree: kvm (too many merge conflicts)
This tree fails to build for powerpc allyesconfig.
Linus' tree gained 3 build failures for which I applied patches.
The kvm tree gained merge conflicts in 23 files against Linus' tree so I
dropped it for today.
The rr tree lost its build failure and its conflict, but gained conflicts
against Linus' (1) and the cpufreq (2) trees.
The block tree lost its conflicts.
The tip tree gained a build failure for which I applied a patch.
The asm-generic tree lost its conflict, but gained 2 conflicts against
Linus' tree.
The rr-latest-cpumask tree gained a conflict against the arm tree and a
build failure for which I applied a patch.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 130 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/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 dwmw2/master
Applying: perfcounters: remove powerpc definitions of perf_counter_do_pending
$ git cherry-pick 4504c6d020fc5aec7659bf7746e71b1b904571f8
Merging arm/devel
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 drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
Merging parisc/master
Merging powerpc/next
CONFLICT (content): Merge conflict in arch/powerpc/kernel/asm-offsets.c
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/viper.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging configfs/linux-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 v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/ext4/super.c
CONFLICT (delete/modify): fs/gfs2/ops_super.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of fs/gfs2/ops_super.c left in tree.
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
$ git rm -f fs/gfs2/ops_super.c
Applying: vfs/gfs2: fixup merge for file removal
Merging pci/linux-next
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 ide/for-next
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/ia64/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/ia64/kvm/kvm-ia64.c
CONFLICT (content): Merge conflict in arch/s390/kvm/intercept.c
CONFLICT (content): Merge conflict in arch/s390/kvm/kvm-s390.c
CONFLICT (content): Merge conflict in arch/s390/kvm/sigp.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/x86/kvm/Makefile
CONFLICT (content): Merge conflict in arch/x86/kvm/i8254.c
CONFLICT (add/add): Merge conflict in arch/x86/kvm/kvm_timer.h
CONFLICT (content): Merge conflict in arch/x86/kvm/lapic.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c
CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.h
CONFLICT (content): Merge conflict in arch/x86/kvm/paging_tmpl.h
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (add/add): Merge conflict in arch/x86/kvm/timer.c
CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c
CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c
CONFLICT (content): Merge conflict in arch/x86/kvm/x86_emulate.c
CONFLICT (content): Merge conflict in include/linux/kvm.h
CONFLICT (content): Merge conflict in virt/kvm/ioapic.c
CONFLICT (content): Merge conflict in virt/kvm/irq_comm.c
CONFLICT (content): Merge conflict in virt/kvm/kvm_main.c
$ git reset --hard
Merging dlm/next
Merging scsi/master
CONFLICT (content): Merge conflict in drivers/message/fusion/mptsas.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c
CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h
CONFLICT (content): Merge conflict in net/core/drop_monitor.c
CONFLICT (content): Merge conflict in net/core/net-traces.c
Merging wireless/master
[master 4ba777d] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test"
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/powernow-k8.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in kernel/sched_cpupri.c
Merging cifs/master
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
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
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging uclinux/for-next
Merging md/for-next
CONFLICT (content): Merge conflict in drivers/md/md.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (add/add): Merge conflict in drivers/serial/timbuart.c
CONFLICT (content): Merge conflict in drivers/usb/serial/option.c
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.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 edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in kernel/timer.c
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Applying: tip/x86: temporary hack for irqinit
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in drivers/char/vt.c
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging asm-generic/next
CONFLICT (content): Merge conflict in arch/x86/include/asm/atomic_32.h
CONFLICT (content): Merge conflict in include/asm-generic/atomic.h
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/x86/kernel/microcode_core.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
CONFLICT (content): Merge conflict in drivers/scsi/ibmvscsi/ibmvscsi.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/class/cdc-acm.c
CONFLICT (content): Merge conflict in drivers/usb/serial/cp210x.c
CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.c
CONFLICT (content): Merge conflict in drivers/usb/serial/kobil_sct.c
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/rt2860/common/mlme.c
CONFLICT (content): Merge conflict in drivers/staging/rt2870/common/mlme.c
CONFLICT (content): Merge conflict in drivers/staging/rt3070/common/mlme.c
Merging quilt/rr-latest-cpumask
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
Applying: powerpc: perf_counter fix performance counter event types
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in include/Kbuild
Applying: sparc: replace uses of CPU_MASK_ALL_PTR
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-06-12 8:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-12 7:53 linux-next: Tree for June 12 Stephen Rothwell
2008-06-13 19:56 ` Thomas Meyer
2008-06-13 18:28 ` Takashi Iwai
2008-06-13 18:39 ` Thomas Meyer
2008-06-13 18:48 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2009-06-12 8:56 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox