linux-next: Tree for October 18

Previous thread: [PATCH 0/3] Add OMAP hardware spinlock misc driver by Ohad Ben-Cohen on Monday, October 18, 2010 - 12:44 am. (68 messages)

Next thread: [PATCH for 2.6.36] mxc_nand: do not depend on disabling the irq in the interrupt handler by Sascha Hauer on Monday, October 18, 2010 - 1:16 am. (1 message)
From: Stephen Rothwell
Date: Monday, October 18, 2010 - 12:51 am

Hi all,

Changes since 20101015:

Dropped tree: xen (complex conflict)

The davinci tree gained a conflict against the arm tree.

The msm tree gained a conflict against the arm tree.

The s5p tree gained conflicts against the arm tree.

The pci tree gained a build failure so I used the version from
next-20101015.

The net tree lost its build failure but gained another for which I
reverted a commit.

The sound-asoc tree gained a build failure so I used the version from
next-20101015 (also the sound tree which had merged the sound-asoc tree).

The mmc tree gained a build failure for which I reverted a commit.

The xen tree gained a complex conflict against the swiotlb-xen tree, so I
dropped the xen tree for today.

The tip tree gained a conflict against the swiotlb-xen tree.

The oprofile tree lost its conflicts.

The usb tree gained conflicts the mips tree.

The bkl-llseek tree lost a conflict, but gained another against the
wireless 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 ...
Previous thread: [PATCH 0/3] Add OMAP hardware spinlock misc driver by Ohad Ben-Cohen on Monday, October 18, 2010 - 12:44 am. (68 messages)

Next thread: [PATCH for 2.6.36] mxc_nand: do not depend on disabling the irq in the interrupt handler by Sascha Hauer on Monday, October 18, 2010 - 1:16 am. (1 message)