From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jkosina@suse•cz>, Mark Brown <broonie@kernel•org>,
Liam Girdwood <lgirdwood@gmail•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Krzysztof Kozlowski <k.kozlowski.k@gmail•com>
Subject: linux-next: manual merge of the trivial tree with the regulator tree
Date: Mon, 10 Aug 2015 12:37:29 +1000 [thread overview]
Message-ID: <20150810123729.58c74531@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in:
drivers/regulator/max77843.c
between commit:
2a32b401a11f ("regulator: Remove the max77843 driver")
from the regulator tree and commit:
971bd8fa369a ("treewide: Fix typo in printk")
from the trivial tree.
I fixed it up (the former removed the file, so I did that) and can carry
the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2015-08-10 2:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 2:37 Stephen Rothwell [this message]
2015-08-10 4:07 ` linux-next: manual merge of the trivial tree with the regulator tree Krzysztof Kozłowski
-- strict thread matches above, loose matches on Subject: below --
2012-12-10 4:29 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=20150810123729.58c74531@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=jkosina@suse$(echo .)cz \
--cc=k.kozlowski.k@gmail$(echo .)com \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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