From: Matt Fleming <matt.fleming@intel•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "Luck, Tony" <tony.luck@intel•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"H. Peter Anvin" <hpa@linux•intel.com>,
Seiji Aguchi <seiji.aguchi@hds•com>
Subject: Re: linux-next: manual merge of the ia64 tree with Linus' tree
Date: Wed, 13 Feb 2013 12:55:52 +0000 [thread overview]
Message-ID: <1360760152.24917.33.camel@mfleming-mobl1.ger.corp.intel.com> (raw)
In-Reply-To: <20130213130559.dd6b2ac2c59093cc1794f41b@canb.auug.org.au>
On Wed, 2013-02-13 at 13:05 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the ia64 tree got a conflict in
> drivers/firmware/efivars.c between commit 83e68189745a ("efi: Make
> 'efi_enabled' a function to query EFI facilities") from the tree and
> commit a93bc0c6e07e ("efi_pstore: Introducing workqueue updating sysfs")
> from the ia64 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks Stephen, this is all correct.
next prev parent reply other threads:[~2013-02-13 12:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 2:05 linux-next: manual merge of the ia64 tree with Linus' tree Stephen Rothwell
2013-02-13 12:55 ` Matt Fleming [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-11-26 0:31 Stephen Rothwell
2012-11-26 3:19 ` Seiji Aguchi
2012-11-27 0:44 ` Luck, Tony
2009-09-17 1:33 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=1360760152.24917.33.camel@mfleming-mobl1.ger.corp.intel.com \
--to=matt.fleming@intel$(echo .)com \
--cc=hpa@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=seiji.aguchi@hds$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tony.luck@intel$(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