Re: linux-next: some merging notes

Stephen Rothwell writes: > The virtio tree > (git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next) > has a conflict with the net-next tree > (git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master) > that requires the following extra fix up patch: > > diff

Re: linux-next: some merging notes

Stephen Rothwell s...@canb.auug.org.au writes: The virtio tree (git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next) has a conflict with the net-next tree (git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master) that requires the following extra fix up

Re: linux-next: some merging notes

On Wed, 2012-12-12 at 09:15 +1100, Stephen Rothwell wrote: > The powerpc tree > (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) > contains a commit that breaks the building of > lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to > linux-next to disable

linux-next: some merging notes

Hi Linus, Just some notes about the current state of some of the merges in linux-next. The powerpc tree (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) contains a commit that breaks the building of lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to

linux-next: some merging notes

Hi Linus, Just some notes about the current state of some of the merges in linux-next. The powerpc tree (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) contains a commit that breaks the building of lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to

Re: linux-next: some merging notes

On Wed, 2012-12-12 at 09:15 +1100, Stephen Rothwell wrote: The powerpc tree (git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next) contains a commit that breaks the building of lib/pSeries-reconfig-notifier-error-inject.c. I applied a patch to linux-next to disable