linux-next: manual merge of the target-updates tree with the tree

From: Stephen Rothwell
Date: Mon Jun 01 2015 - 07:22:38 EST

Next message: Eric W. Biederman: "Re: [PATCH 1/1] /proc/$PID/status : show list NSpid data based on current process namespace."
Previous message: Stephen Rothwell: "linux-next: manual merge of the target-updates tree with Linus' tree"
Next in thread: Nicholas A. Bellinger: "Re: linux-next: manual merge of the target-updates tree with the tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Nicholas,

Today's linux-next merge of the target-updates tree got so many
conflicts against Linus' tree that I just gave up and dropped it
completely. Please fix up this mess.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpo3kjrnSEuN.pgp
Description: OpenPGP digital signature

Next message: Eric W. Biederman: "Re: [PATCH 1/1] /proc/$PID/status : show list NSpid data based on current process namespace."
Previous message: Stephen Rothwell: "linux-next: manual merge of the target-updates tree with Linus' tree"
Next in thread: Nicholas A. Bellinger: "Re: linux-next: manual merge of the target-updates tree with the tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]