* linux-next: manual merge of the trivial tree with the wireless-next tree
@ 2011-12-05 2:37 Stephen Rothwell
2011-12-11 23:33 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-12-05 2:37 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Justin P. Mattock, Johannes Berg,
John W. Linville
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
net/mac80211/work.c between commit e76aadc57228 ("mac80211: revert
on-channel work optimisations") from the wireless-next tree and commit
42b2aa86c667 ("treewide: Fix typos in various parts of the kernel, and
fix some comments") from the trivial tree.
The former removed the comment that was fixed in the latter, so I did
that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the wireless-next tree
2011-12-05 2:37 linux-next: manual merge of the trivial tree with the wireless-next tree Stephen Rothwell
@ 2011-12-11 23:33 ` Jiri Kosina
2011-12-12 3:43 ` Justin P. Mattock
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Kosina @ 2011-12-11 23:33 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Justin P. Mattock, Johannes Berg,
John W. Linville
On Mon, 5 Dec 2011, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> net/mac80211/work.c between commit e76aadc57228 ("mac80211: revert
> on-channel work optimisations") from the wireless-next tree and commit
> 42b2aa86c667 ("treewide: Fix typos in various parts of the kernel, and
> fix some comments") from the trivial tree.
>
> The former removed the comment that was fixed in the latter, so I did
> that.
I have now dropped the conflicting hunk, thanks for reporting, Stephen.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the wireless-next tree
2011-12-11 23:33 ` Jiri Kosina
@ 2011-12-12 3:43 ` Justin P. Mattock
0 siblings, 0 replies; 3+ messages in thread
From: Justin P. Mattock @ 2011-12-12 3:43 UTC (permalink / raw)
To: Jiri Kosina
Cc: Stephen Rothwell, linux-next, linux-kernel, Johannes Berg,
John W. Linville
On 12/11/2011 03:33 PM, Jiri Kosina wrote:
> On Mon, 5 Dec 2011, Stephen Rothwell wrote:
>
>> Hi Jiri,
>>
>> Today's linux-next merge of the trivial tree got a conflict in
>> net/mac80211/work.c between commit e76aadc57228 ("mac80211: revert
>> on-channel work optimisations") from the wireless-next tree and commit
>> 42b2aa86c667 ("treewide: Fix typos in various parts of the kernel, and
>> fix some comments") from the trivial tree.
>>
>> The former removed the comment that was fixed in the latter, so I did
>> that.
>
> I have now dropped the conflicting hunk, thanks for reporting, Stephen.
>
not sure what hunk was removed from this, but if its from my commit I
can pull -next and redu the patch so that its not conflicting and resend
if you would like.
Justin P. Mattock
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-12 3:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-05 2:37 linux-next: manual merge of the trivial tree with the wireless-next tree Stephen Rothwell
2011-12-11 23:33 ` Jiri Kosina
2011-12-12 3:43 ` Justin P. Mattock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).