All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Wolfram Sang <wsa@the-dreams.de>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>,
	Loc Ho <lho@apm.com>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
Date: Wed, 06 Jan 2016 03:15:04 +0100	[thread overview]
Message-ID: <3075970.WbB6DJDsOa@vostro.rjw.lan> (raw)
In-Reply-To: <20160106123911.2fff44b3@canb.auug.org.au>

On Wednesday, January 06, 2016 12:39:11 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   90708ce22b48 ("i2c: designware: Add support for AMD Seattle I2C")
> 
> from the i2c tree and commit:
> 
>   a90410e8ae3f ("i2c: dw: Add APM X-Gene ACPI I2C device support")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good to me and thanks for taking care of this!

Rafael


  reply	other threads:[~2016-01-06  1:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-06  1:39 linux-next: manual merge of the pm tree with the i2c tree Stephen Rothwell
2016-01-06  2:15 ` Rafael J. Wysocki [this message]
2016-01-06  8:20   ` Wolfram Sang
2016-07-15  2:17 Stephen Rothwell
2016-07-15  2:28 ` Stephen Rothwell
2016-07-15 12:19   ` Rafael J. Wysocki
2016-07-15 12:32     ` Wolfram Sang
2016-07-15 12:40       ` Rafael J. Wysocki
2016-07-15 12:59       ` Rafael J. Wysocki
2016-07-17 18:14         ` Wolfram Sang
2016-07-19  2:41           ` Rafael J. Wysocki
2016-07-19  3:48             ` Wolfram Sang
2016-07-19 12:55               ` Rafael J. Wysocki
2016-07-25 12:03               ` Andy Shevchenko
2018-01-11 23:27 Stephen Rothwell
2018-01-12 12:44 ` Rafael J. Wysocki
2018-10-29  2:09 Stephen Rothwell
2018-10-30  7:32 ` Rafael J. Wysocki
2022-02-07 23:11 Stephen Rothwell
2022-09-29 12:18 broonie
2022-10-05  0:18 ` Stephen Rothwell
2022-10-05  7:12   ` Uwe Kleine-König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3075970.WbB6DJDsOa@vostro.rjw.lan \
    --to=rjw@rjwysocki.net \
    --cc=Suravee.Suthikulpanit@amd.com \
    --cc=lho@apm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.