From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jason Cooper <jason@lakedaemon•net>,
andrew@lunn•ch, gregory.clement@free-electrons•com,
linux-arm-kernel@lists•infradead.org,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Vincent Donnefort <vdonnefort@gmail•com>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Sun, 1 Nov 2015 10:35:55 +1100 [thread overview]
Message-ID: <20151101103555.2464c0ee@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in:
arch/arm/mach-mvebu/pmsu.c
between commit:
9d2ea95a599a ("ARM: mvebu: add broken-idle option")
from the arm-soc tree and commit:
da6ee32a42c0 ("ARM: mvebu: add broken-idle option")
from the mvebu tree.
I fixed it up (looks like 2 version of the same thing (though different)
so I just used the version from the arm-doc tree) and can carry the fix
as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-10-31 23:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-31 23:35 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:41 linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell
2022-05-10 13:59 ` Krzysztof Kozlowski
2022-05-10 14:42 ` Arnd Bergmann
2018-05-16 22:47 Stephen Rothwell
2017-04-11 22:34 Stephen Rothwell
2017-04-12 8:23 ` Gregory CLEMENT
2017-04-12 10:51 ` Stephen Rothwell
2016-04-13 23:29 Stephen Rothwell
2016-02-17 23:33 Stephen Rothwell
2015-12-02 11:12 Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:21 ` Arnd Bergmann
2015-12-02 13:49 ` Gregory CLEMENT
2015-12-02 15:09 ` Arnd Bergmann
2015-01-13 0:20 Stephen Rothwell
2015-01-13 1:05 ` Andrew Lunn
2014-05-06 1:07 Stephen Rothwell
2014-05-06 1:13 ` Olof Johansson
2014-03-18 0:21 Stephen Rothwell
2014-02-26 1:46 Stephen Rothwell
2013-08-19 6:05 Stephen Rothwell
2013-08-19 20:57 ` Jason Cooper
2013-08-19 21:09 ` Olof Johansson
2013-08-19 21:38 ` Jason Cooper
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=20151101103555.2464c0ee@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrew@lunn$(echo .)ch \
--cc=arnd@arndb$(echo .)de \
--cc=gregory.clement@free-electrons$(echo .)com \
--cc=jason@lakedaemon$(echo .)net \
--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=vdonnefort@gmail$(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