From: "Justin P. Mattock" <justinmattock@gmail.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>,
"John W. Linville" <linville@tuxdriver.com>
Subject: Re: linux-next: manual merge of the trivial tree with the wireless-next tree
Date: Sun, 11 Dec 2011 19:43:53 -0800 [thread overview]
Message-ID: <4EE57879.6060109@gmail.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1112120033380.21970@pobox.suse.cz>
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
prev parent reply other threads:[~2011-12-12 3:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=4EE57879.6060109@gmail.com \
--to=justinmattock@gmail.com \
--cc=jkosina@suse.cz \
--cc=johannes.berg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.