All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the devicetree tree with Linus' tree
Date: Fri, 5 Aug 2011 12:13:56 +1000	[thread overview]
Message-ID: <20110805121356.7dc43da10b3a47f3e49bd53a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 488 bytes --]

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/base.c between commit fe55c1844a1c ("Revert "dt: add
of_alias_scan and of_alias_get_id"") from Linus' tree and commit
79787f21b37b ("drivers/of: Fix sparc build failure caused by
of_alias_scan") from the devicetree tree.

Given the discussion on other threads, I used Linus' version.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

             reply	other threads:[~2011-08-05  2:14 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-05  2:13 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-16  3:42 linux-next: manual merge of the devicetree tree with Linus' tree Stephen Rothwell
2022-01-14 23:41 Stephen Rothwell
2020-10-15  3:21 Stephen Rothwell
2019-11-12  2:57 Stephen Rothwell
2019-10-16  1:25 Stephen Rothwell
2019-07-24  3:02 Stephen Rothwell
2019-07-24 19:31 ` Rob Herring
2019-06-24  5:51 Stephen Rothwell
2019-07-08 23:56 ` Stephen Rothwell
2019-02-14  3:02 Stephen Rothwell
2017-09-06  3:01 Stephen Rothwell
2017-09-06  2:55 Stephen Rothwell
2010-07-16  1:15 Stephen Rothwell
2010-07-16  4:27 ` Grant Likely
2010-06-07  2:53 Stephen Rothwell
2010-06-07 17:03 ` Grant Likely

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=20110805121356.7dc43da10b3a47f3e49bd53a@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=grant.likely@secretlab.ca \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /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.