From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org,
Daniel J Blueman <daniel.blueman@gmail•com>,
FUJITA Tomonori <fujita.tomonori@lab•ntt.co.jp>
Subject: linux-next: manual merge of the x86 tree
Date: Fri, 12 Sep 2008 09:34:43 +1000 [thread overview]
Message-ID: <20080912093443.2f226fe7.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
Hi all,
Today's linux-next merge of the x86 tree got a conflict in lib/swiotlb.c
between commit 36223a399f639b13b7a454349565934e6d3e2db0 ("swiotlb: fix
back-off path when memory allocation fails") from Linus' tree and commit
9dfda12b8b769e224ca4efbc35ace4524b9c017b ("swiotlb: use map_single
instead of swiotlb_map_single in swiotlb_alloc_coherent") from the x86
tree.
It looks like the bug fixed by the former is also fixed in the latter, so
I used the latter version.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-09-11 23:35 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-11 23:34 Stephen Rothwell [this message]
2008-09-14 15:18 ` linux-next: manual merge of the x86 tree Ingo Molnar
2008-09-14 18:13 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 2:23 Stephen Rothwell
2008-09-11 23:37 Stephen Rothwell
2008-09-14 15:16 ` Ingo Molnar
2008-09-14 18:11 ` Stephen Rothwell
2008-09-03 0:57 Stephen Rothwell
2008-09-05 16:00 ` Ingo Molnar
2008-09-02 1:32 Stephen Rothwell
2008-09-05 18:22 ` Ingo Molnar
2008-08-15 3:58 Stephen Rothwell
2008-07-31 2:59 Stephen Rothwell
2008-07-23 2:51 Stephen Rothwell
2008-07-18 2:29 Stephen Rothwell
2008-07-17 1:43 Stephen Rothwell
2008-07-15 2:26 Stephen Rothwell
2008-07-14 1:30 Stephen Rothwell
2008-07-11 1:48 Stephen Rothwell
2008-07-11 1:47 Stephen Rothwell
2008-07-08 0:56 Stephen Rothwell
2008-07-08 3:22 ` Jeremy Fitzhardinge
2008-07-08 5:01 ` Stephen Rothwell
2008-07-08 5:28 ` Jeremy Fitzhardinge
2008-07-08 5:39 ` Ingo Molnar
2008-07-08 0:52 Stephen Rothwell
2008-07-04 3:50 Stephen Rothwell
2008-07-04 3:41 Stephen Rothwell
2008-07-04 9:41 ` Ingo Molnar
2008-06-25 2:28 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=20080912093443.2f226fe7.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.blueman@gmail$(echo .)com \
--cc=fujita.tomonori@lab$(echo .)ntt.co.jp \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
/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