linux-next.vger.kernel.org archive mirror
 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 Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Phil Reid <preid@electromag.com.au>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
Date: Fri, 12 Jan 2018 13:44:21 +0100	[thread overview]
Message-ID: <1560882.YLD57UpMaU@aspire.rjw.lan> (raw)
In-Reply-To: <20180112102729.1868451c@canb.auug.org.au>

On Friday, January 12, 2018 12:27:29 AM CET Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c
> 
> between commit:
> 
>   0326f9f801b2 ("i2c: designware: rename i2c_dw_plat_prepare_clk to i2c_dw_prepare_clk")
> 
> from the i2c tree and commit:
> 
>   02e45646d53b ("PM: i2c-designware-platdrv: Optimize power management")
> 
> from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix looks good to me.

Thanks!

  reply	other threads:[~2018-01-12 12:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-11 23:27 linux-next: manual merge of the pm tree with the i2c tree Stephen Rothwell
2018-01-12 12:44 ` Rafael J. Wysocki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-09-29 12:18 broonie
2022-10-05  0:18 ` Stephen Rothwell
2022-10-05  7:12   ` Uwe Kleine-König
2022-02-07 23:11 Stephen Rothwell
2018-10-29  2:09 Stephen Rothwell
2018-10-30  7:32 ` Rafael J. Wysocki
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
2016-01-06  1:39 Stephen Rothwell
2016-01-06  2:15 ` Rafael J. Wysocki
2016-01-06  8:20   ` Wolfram Sang

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=1560882.YLD57UpMaU@aspire.rjw.lan \
    --to=rjw@rjwysocki.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=preid@electromag.com.au \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).