From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel@lists•infradead.org
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Igor Grinberg <grinberg@compulab•co.il>,
Tony Lindgren <tony@atomide•com>, Venkatraman S <svenkatr@ti•com>,
Chris Ball <cjb@laptop•org>
Subject: linux-next: manual merge of the arm-soc tree with the mmc tree
Date: Mon, 17 Sep 2012 18:01:57 +1000 [thread overview]
Message-ID: <20120917180157.dada1de4e34b3dcf59971ccd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/omap.c between commit 2976837c6ea8 ("mmc: omap: remove
unused variables and includes") from the mmc tree and commit cf3a6ec2c0a4
("ARM: OMAP: remove plat/board.h file") from the arm-soc tree.
The latter is a subset of the former.
I fixed it up and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-17 8:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 8:01 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-26 10:38 linux-next: manual merge of the arm-soc tree with the mmc tree Stephen Rothwell
2012-09-24 9:36 Stephen Rothwell
2012-04-12 4:02 Stephen Rothwell
2012-04-12 4:54 ` Chris Ball
2012-04-13 12:46 ` Nicolas Ferre
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=20120917180157.dada1de4e34b3dcf59971ccd@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=cjb@laptop$(echo .)org \
--cc=grinberg@compulab$(echo .)co.il \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=svenkatr@ti$(echo .)com \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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