From: Jonathan Cameron <jic23@cam.ac.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Subject: Re: linux-next: manual merge of the als tree with Linus' tree
Date: Thu, 18 Feb 2010 15:16:19 +0000 [thread overview]
Message-ID: <4B7D59C3.90301@cam.ac.uk> (raw)
In-Reply-To: <20100218171147.973d1016.sfr@canb.auug.org.au>
On 02/18/10 06:11, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the als tree got a conflict in drivers/misc/Kconfig between commit 8c5d30e590593495c5bb8bd4a2519ce1ac909a22 ("dell-laptop: remove duplicate Kconfig entry under drivers/misc") from Linus' tree and commit 6600f58cfc348ef5862876ab4965d95aad793429 ("isl29003: Move from misc to als now it available with minimal changes") from the als tree.
>
> Just context changes. I fixed it up (see below) and can carry the change
> for a while.
Thanks Stephen and sorry for wasting your time!
I've reset that last patch, merged Linus' current tree and reapplied it on top with the
merge problems fixed up. While I was there I edited the commit message so it was actually
English (oops).
Anyhow, (fingers crossed), it should now work fine.
Jonathan
next prev parent reply other threads:[~2010-02-18 15:14 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 6:11 linux-next: manual merge of the als tree with Linus' tree Stephen Rothwell
2010-02-18 15:16 ` Jonathan Cameron [this message]
2010-02-19 3:46 ` 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=4B7D59C3.90301@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=alan-jenkins@tuffmail.co.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rui.zhang@intel.com \
--cc=sfr@canb.auug.org.au \
/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.