linux-kernel - Re: linux-next: manual merge of the trivial tree with the wireless-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Sun, 11 Dec 2011 19:43:53 -0800
From:	"Justin P. Mattock" <justinmattock@...il.com>
To:	Jiri Kosina <jkosina@...e.cz>
CC:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Johannes Berg <johannes.berg@...el.com>,
	"John W. Linville" <linville@...driver.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless-next
 tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/