Re: linux-next: manual merge of the pm tree with the ia64 tree

2014-07-16 Thread Rafael J. Wysocki
On Wednesday, July 16, 2014 03:06:13 AM Zheng, Lv wrote: > Hi, > > > From: Rafael J. Wysocki [mailto:r...@rjwysocki.net] > > Sent: Tuesday, July 15, 2014 8:15 PM > > > > On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote: > > > > > > --Sig_/Cs291xJCrI1kc_+PiCdNT0M > > > Content-Type: te

RE: linux-next: manual merge of the pm tree with the ia64 tree

2014-07-15 Thread Zheng, Lv
Hi, > From: Rafael J. Wysocki [mailto:r...@rjwysocki.net] > Sent: Tuesday, July 15, 2014 8:15 PM > > On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote: > > > > --Sig_/Cs291xJCrI1kc_+PiCdNT0M > > Content-Type: text/plain; charset=US-ASCII > > Content-Transfer-Encoding: quoted-printable

Re: linux-next: manual merge of the pm tree with the ia64 tree

2014-07-15 Thread Rafael J. Wysocki
On Tuesday, July 15, 2014 01:56:20 PM Stephen Rothwell wrote: > > --Sig_/Cs291xJCrI1kc_+PiCdNT0M > Content-Type: text/plain; charset=US-ASCII > Content-Transfer-Encoding: quoted-printable > > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in > drivers/acpi/acpi_extlog.c be