From: "John W. Linville" <linville@tuxdriver.com>
To: Arend van Spriel <arend@broadcom.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: Re: merge issue with wireless-testing
Date: Wed, 26 Feb 2014 11:18:34 -0500 [thread overview]
Message-ID: <20140226161834.GA3243@tuxdriver.com> (raw)
In-Reply-To: <530E0E4B.5020409@broadcom.com>
On Wed, Feb 26, 2014 at 04:54:51PM +0100, Arend van Spriel wrote:
> On 02/26/2014 04:13 PM, Arend van Spriel wrote:
> > On 02/26/2014 04:10 PM, Arend van Spriel wrote:
> >> Hi John,
> >>
> >> Our internal kernel repository was still dangling on 3.14-rc1 (last
> >> merge from wireless-testing/master) so I thought it was time to tag
> >> along and do a new merge of wireless-testing/master, but I get a ship
> >> load of merge conflicts that I can not explain (see below). Did you
> >> rebase between rc1 and rc4? Hope you can end my confusion.
> >
> > I tried to merge:
> >
> > commit b8f6bdb12edb9b24114c746117087fdc9f75741e
> > Merge: e078763 b7b146c
> > Author: John W. Linville <linville@tuxdriver.com>
> > Date: Tue Feb 25 15:36:46 2014 -0500
> >
> > Merge branch 'master' of
> > git://git.kernel.org/pub/scm/linux/kernel/git/linvi
> >
> > Conflicts:
> > drivers/net/wireless/ath/ath9k/recv.c
>
> git diff between v3.14-rc4 tag and wireless-testing looks pretty normal
> except for these:
>
> arch/s390/kernel/compat_wrapper.S | 2 +-
> arch/s390/pci/pci_dma.c | 8 +-
> drivers/s390/cio/chsc.c | 1 +
> drivers/s390/crypto/zcrypt_msgtype6.c | 24 +-
> security/selinux/ss/policydb.c | 8 +-
>
> I think I will go and rebase instead of the merge.
I don't recall any thing weird since the -rc1 rebase. I'm not sure
what the problem you are seeing might be?
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2014-02-26 16:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 15:10 merge issue with wireless-testing Arend van Spriel
2014-02-26 15:13 ` Arend van Spriel
2014-02-26 15:54 ` Arend van Spriel
2014-02-26 16:18 ` John W. Linville [this message]
2014-02-26 17:18 ` Arend van Spriel
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=20140226161834.GA3243@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=arend@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
/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 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).