From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: tglx@linutronix•de, mingo@elte•hu, hpa@zytor•com,
peterz@infradead•org, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, sam@ravnborg•org
Subject: Re: linux-next: manual merge of the tip tree with the sparc-next tree
Date: Mon, 14 May 2012 01:03:14 -0400 (EDT) [thread overview]
Message-ID: <20120514.010314.489356554013696006.davem@davemloft.net> (raw)
In-Reply-To: <20120514145114.bc3e8b95da9478486ac0a13e@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 14 May 2012 14:51:14 +1000
> Today's linux-next merge of the tip tree got a conflict in
> arch/sparc/include/asm/thread_info_32.h between commit e7b7e0c35655
> ("sparc32: drop btfixup for alloc_thread_info_node/free_thread_info")
> from the sparc-next tree and commit f5e10287367d ("task_allocator: Use
> config switches instead of magic defines") from the tip tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks Stephen, you in fact probably will need to carry this one.
next prev parent reply other threads:[~2012-05-14 5:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 4:51 linux-next: manual merge of the tip tree with the sparc-next tree Stephen Rothwell
2012-05-14 5:03 ` David Miller [this message]
2012-05-14 5:47 ` Sam Ravnborg
-- strict thread matches above, loose matches on Subject: below --
2020-06-04 2:35 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=20120514.010314.489356554013696006.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sam@ravnborg$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--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