All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	matt mooney <mfm@muteddisk.com>,
	Guenter Roeck <guenter.roeck@ericsson.com>
Subject: Re: linux-next: manual merge of the kbuild tree with the hwmon-staging tree
Date: Fri, 18 Mar 2011 12:22:10 +0100	[thread overview]
Message-ID: <4D834062.5040001@suse.cz> (raw)
In-Reply-To: <20110318114836.04c76926.sfr@canb.auug.org.au>

On 18.3.2011 01:48, Stephen Rothwell wrote:
> Hi Michal,
> 
> Today's linux-next merge of the kbuild tree got a conflict in
> drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
> driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
> change to new flag variable") from the kbuild tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

I am aware of the conflict, but as you say, it is just changed context.

Thanks,
Michal

      parent reply	other threads:[~2011-03-18 11:22 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-18  0:48 linux-next: manual merge of the kbuild tree with the hwmon-staging tree Stephen Rothwell
2011-03-18  3:50 ` Guenter Roeck
2011-03-18 11:22 ` Michal Marek [this message]

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=4D834062.5040001@suse.cz \
    --to=mmarek@suse.cz \
    --cc=guenter.roeck@ericsson.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mfm@muteddisk.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.