From: Johannes Berg <johannes@sipsolutions.net>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org,
Samuel Ortiz <sameo@linux.intel.com>,
Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
Luciano Coelho <coelho@ti.com>
Subject: Re: wireless tree rebased (from 5/28), Broadcom bits dropped
Date: Wed, 05 Jun 2013 08:59:46 +0200 [thread overview]
Message-ID: <1370415586.8920.4.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <20130604215320.GC11199@tuxdriver.com> (sfid-20130605_000022_753591_1B1E52D0)
On Tue, 2013-06-04 at 17:53 -0400, John W. Linville wrote:
> I messed this up too -- bad day...
>
> If you pulled in between the earlier message and this one, please
> do so again. If you saw this message before taking any action to
> clean-up my mess, then you are OK.
This was confusing, I think you rebased around some merges instead of
redoing the merges? My patches are in, but suddenly got new commit IDs,
e.g. fa331699d05ce1d0d4896eb4a137cfae50d7afde (new) vs.
c2c15e215e860c99b86ddfc4be4bb25cf180fed0 for "mac80211: work around
broken APs not including HT info".
This will cause git to pull them in again when I send a new pull
request, so it would have been nicer to redo the merges, but anyway ...
just a heads-up for everyone that here it's a bit confusing now.
johannes
next prev parent reply other threads:[~2013-06-05 6:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 21:26 wireless tree rebased (from 5/28), Broadcom bits dropped John W. Linville
2013-06-04 21:53 ` John W. Linville
2013-06-05 6:59 ` Johannes Berg [this message]
2013-06-05 14:37 ` John W. Linville
2013-06-05 16:40 ` Samuel Ortiz
2013-06-05 16:49 ` Gustavo Padovan
2013-06-05 16:57 ` Arend van Spriel
2013-06-05 20:19 ` John W. Linville
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=1370415586.8920.4.camel@jlt4.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=coelho@ti.com \
--cc=gustavo.padovan@collabora.co.uk \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=sameo@linux.intel.com \
/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.