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 for Android: free password hash cracker in your pocket

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

Message-ID: <alpine.LNX.2.00.1112120033380.21970@pobox.suse.cz>
Date:	Mon, 12 Dec 2011 00:33:55 +0100 (CET)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Justin P. Mattock" <justinmattock@...il.com>,
	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 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
--
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/