linux-next: Tree for Jun 4

linux-next: Tree for Jun 4

[Stephen Rothwell]

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

Hi all,

Changes since 20130603:

The pci tree gained a conflict against Linus' tree.

The wireless-next tree gained conflicts against the net and net-next trees.

The staging tree gained a build failure so I disabled a driver.

The msm tree still has its build failure for which I applied a fix patch.

The akpm tree gained a conflict against the percpu tree that caused me to
drop several patches.

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

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/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,
sparc64 and arm 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 227 trees (counting Linus' and 31 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 Randy Dunlap for doing many randconfig builds.  And to Paul
Gortmaker for triage and bug fixes.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

-- 
Stephen Rothwell <sfr@canb.auug.org.au>

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

Re: linux-next: Tree for Jun 4 (pch_phub.c)

[Randy Dunlap]

On 06/04/13 00:41, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20130603:
> 

when CONFIG_NET is not enabled:

ERROR: "mac_pton" [drivers/misc/pch_phub.ko] undefined!


-- 
~Randy

Re: linux-next: Tree for Jun 4 (pch_phub.c)

[Arnd Bergmann]

On Tuesday 04 June 2013, Randy Dunlap wrote:
> 
> On 06/04/13 00:41, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20130603:
> > 
> 
> when CONFIG_NET is not enabled:
> 
> ERROR: "mac_pton" [drivers/misc/pch_phub.ko] undefined!

Andy Shevchenko just posted "[PATCH] net: core: move mac_pton() to
lib/net_utils.c" to fix this.

	Arnd