linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Russell King <rmk@arm.linux.org.uk>
Cc: linux-next@vger.kernel.org, Felipe Balbi <felipe.balbi@nokia.com>,
	Wim Van Sebroeck <wim@iguana.be>,
	Syed Mohammed Khasim <khasim@ti.com>,
	Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the arm tree
Date: Tue, 14 Oct 2008 13:27:45 +1100	[thread overview]
Message-ID: <20081014132745.051f6418.sfr@canb.auug.org.au> (raw)

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

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/plat-omap/devices.c between commit
2817142f31bfbf26c216bf4f9192540c81b2d071 ("[WATCHDOG] omap_wdt.c: sync
linux-omap changes") from Linus' tree and commit
cc26b3b01bc96a8b8c36671b0dc4898b2a152ea8 ("ARM: OMAP3: Add minimal
omap3430 support") from the arm tree.

The former removed code that the latter modified.  I fixed it up
by just removing the section of code as the former patch seems to take
account of what the latter is trying to do (but it may not be correct).
You can fix it by merging Linus' tree and doing this or a similar (maybe
correct) fixup.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/


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

             reply	other threads:[~2008-10-14  2:27 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14  2:27 Stephen Rothwell [this message]
2008-10-14  7:59 ` linux-next: manual merge of the arm tree Russell King
2008-10-14  8:07   ` David Brownell
2008-10-14 20:08     ` Tony Lindgren
2008-10-14 20:30       ` [PATCH] ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict (Re: linux-next: manual merge of the arm tree) Tony Lindgren
2008-10-14 20:40         ` Russell King
  -- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the arm tree Thierry Reding
2013-10-25 15:20   ` Dmitry Kravkov
2008-08-25  1:03 Stephen Rothwell
2008-08-26 22:20 ` Russell King
2008-08-26 23:43   ` Stephen Rothwell
2008-07-10  4:33 Stephen Rothwell
2008-07-10  6:29 ` pHilipp Zabel
2008-07-10  7:30 ` Russell King
2008-07-04  6:57 Stephen Rothwell
2008-07-07  9:12 ` Russell King
2008-07-07 10:39   ` Stephen Rothwell

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=20081014132745.051f6418.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=felipe.balbi@nokia.com \
    --cc=khasim@ti.com \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    --cc=tony@atomide.com \
    --cc=wim@iguana.be \
    /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).