Hi all,

Changes since next-20080827:

The hid tree lost a conflict.

The net tree gained a conflict against the net-current tree.

The block tree gained 3 conflicts against Linus' tree (2 trivial and
unreported).

The firmware tree gained 2 conflicts against the sound tree.

The creds tree gained a conflict against the net-current tree.

I have also applied the following patches for known problems:

	ftrace: protect the definition of ftrace_release
	revert BUILD_BUG_ON change
	sparseirq: export nr_irqs on m68k/sparc/s390
	VIDEO_SH_MOBILE_CEU should depend on HAS_DMA
	sparc32: Implement smp_call_function_single().
	x86: use x2apic id reported by cpuid during topology discovery, fix

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

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 113 trees (counting Linus' and 14 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 ...
[ message continues ]

On Thu, 28 Aug 2008 18:33:07 +1000

firmware/yamaha/yss225_registers.bin.ihex uses \r\n line termination.
Is that actually required, or can we use plain old \n?

Andy, a checkpatch rule for this would be nice.
--

[ message continues ]

Ahhh, well we do have a check for DOS line endings, but it only applies
to 'source' files.  I guess what we should do is bring ihex in as a
'text' file format and apply limited checks to that.

-apw
--

[ message continues ]

At Thu, 28 Aug 2008 14:39:34 -0700,

No, I just copied the output from objcopy, and that's in DOS style,

Maybe it could have detected.  I didn't check that file before
committing...

Anyway, this patch was already removed from my tree.


thanks,

Takashi
--

[ message continues ]