From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Aleksey Makarov <aleksey.makarov@linaro.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: Re: linux-next: manual merge of the tty tree with the pm tree
Date: Fri, 30 Sep 2016 07:44:41 +0200 [thread overview]
Message-ID: <20160930054441.GC5458@kroah.com> (raw)
In-Reply-To: <20160930134223.4eb0767d@canb.auug.org.au>
On Fri, Sep 30, 2016 at 01:42:23PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
> include/linux/acpi.h
>
> between commit:
>
> 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog")
>
> from the pm tree and commit:
>
> ad1696f6f09d ("ACPI: parse SPCR and enable matching console")
>
> from the tty tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Looks good to me, thanks.
greg k-h
prev parent reply other threads:[~2016-09-30 5:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 3:42 linux-next: manual merge of the tty tree with the pm tree Stephen Rothwell
2016-09-30 5:44 ` Greg KH [this message]
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=20160930054441.GC5458@kroah.com \
--to=greg@kroah.com \
--cc=aleksey.makarov@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/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.