From: Gregory Haskins <gregory.haskins@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for October 30
Date: Fri, 30 Oct 2009 11:30:23 -0400 [thread overview]
Message-ID: <4AEB068F.3020607@gmail.com> (raw)
In-Reply-To: <20091030200916.e9331f66.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 627 bytes --]
Hi Stephen
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20091029:
>
< snip >
> Merging alacrity/linux-next
> CONFLICT (content): Merge conflict in drivers/net/Kconfig
> CONFLICT (content): Merge conflict in lib/Kconfig
So I've noticed this error in your reports for a while now, but I wasn't
quite sure if there was an action-item for me to address it.
Considering no one is complaining that the tree is broken, I assume
these kinds of conflicts are automatically resolved, but I am wondering
if there are steps I should take to prevent the conflict in the future?
Kind Regards,
-Greg
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 267 bytes --]
next prev parent reply other threads:[~2009-10-30 15:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-30 9:09 linux-next: Tree for October 30 Stephen Rothwell
2009-10-30 15:30 ` Gregory Haskins [this message]
2009-10-30 18:01 ` [PATCH -next] staging: fix wlags49 kconfigs Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2008-10-30 6:30 linux-next: Tree for October 30 Stephen Rothwell
2008-10-30 23:55 ` Randy Dunlap
2008-10-31 6:25 ` Greg KH
2008-10-31 16:40 ` Greg KH
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=4AEB068F.3020607@gmail.com \
--to=gregory.haskins@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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.