All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: sfr@canb.auug.org.au
Cc: linux-next@vger.kernel.org, linville@tuxdriver.com
Subject: Re: linux-next: manual merge of the net tree
Date: Wed, 18 Jun 2008 22:01:01 -0700 (PDT)	[thread overview]
Message-ID: <20080618.220101.192721731.davem@davemloft.net> (raw)
In-Reply-To: <20080619130456.e9e22b32.sfr@canb.auug.org.au>

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jun 2008 13:04:56 +1000

> Today's linux-next merge of the net tree got a conflict in
> net/mac80211/tx.c between commit 3a5be7d4b079f3a9ce1e8ce4a93ba15ae6d00111
> ("Revert "mac80211: Use skb_header_cloned() on TX path."") from the
> Linus' tree and commit 23c0752a25d73ccc4547700e8a57d5ae2f2edf56
> ("mac80211: clean up skb reallocation code") from the net (wireless) tree.
> 
> I couldn't readily see what to do with it, so I took the version in the
> net tree.  I assume that this will be sorted out next time that the
> wireless (or net) tree pulls in Linus' tree.

Thanks Stephen.  I anticipated this and I will work out a proper
merge resolution later tonight after I finish something else
I'm currently working on.

  reply	other threads:[~2008-06-19  5:01 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19  3:04 linux-next: manual merge of the net tree Stephen Rothwell
2008-06-19  5:01 ` David Miller [this message]
2008-06-19  5:49   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-12-23 23:19 Stephen Rothwell
2008-12-24  2:15 ` David Miller
2008-12-24 14:41 ` Cyrill Gorcunov
2008-12-23 23:15 Stephen Rothwell
2008-12-24  2:16 ` David Miller
2008-12-15  3:44 Stephen Rothwell
2008-12-15  6:59 ` David Miller
2008-12-09  2:21 Stephen Rothwell
2008-12-09 22:17 ` J. Bruce Fields
2008-12-09 23:22   ` David Miller
2008-12-09 23:41   ` Stephen Rothwell
2008-12-09  2:13 Stephen Rothwell
2008-12-08  3:48 Stephen Rothwell
2008-12-08  7:26 ` David Miller
2008-12-29  3:53   ` Stephen Rothwell
2008-12-29  4:00     ` David Miller
2008-12-29  4:14       ` Stephen Rothwell
2008-12-01  3:26 Stephen Rothwell
2008-12-01  7:20 ` David Miller
2008-12-01 17:06 ` Mike Frysinger
2008-12-01  3:16 Stephen Rothwell
2008-11-27  3:40 Stephen Rothwell
2008-11-27  8:03 ` David Miller
2008-11-26  6:42 Stephen Rothwell
2008-11-26  6:34 Stephen Rothwell
2008-11-21  2:33 Stephen Rothwell
2008-11-21  2:29 Stephen Rothwell
2008-11-21  4:11 ` David Miller
2008-11-21  4:22   ` Stephen Rothwell
2008-11-20  2:10 Stephen Rothwell
2008-11-18  0:51 Stephen Rothwell
2008-11-12  2:59 Stephen Rothwell
2008-11-12  3:07 ` John W. Linville
2008-11-10  3:02 Stephen Rothwell
2008-11-11  7:00 ` David Miller
2008-11-11  8:24   ` Stephen Rothwell
2008-11-11  9:21     ` David Miller
2008-11-11 23:17       ` Stephen Rothwell
2008-11-07  4:33 Stephen Rothwell
2008-11-07  4:24 Stephen Rothwell
2008-11-07  4:47 ` David Miller
2008-10-29  3:11 Stephen Rothwell
2008-10-29  4:53 ` David Miller
2008-10-29 12:34   ` John W. Linville
2008-10-29 20:20     ` David Miller
2008-08-28  3:55 Stephen Rothwell
2008-08-28  8:15 ` David Miller
2008-07-16  7:00 Stephen Rothwell
2008-07-16  6:56 Stephen Rothwell
2008-07-10  4:02 Stephen Rothwell
2008-07-10 12:11 ` Patrick McHardy
2008-07-08  4:27 Stephen Rothwell
2008-07-08  6:03 ` Tobias Diedrich
2008-07-08 14:23   ` Rafael J. Wysocki
2008-07-08  4:16 Stephen Rothwell
2008-07-08 12:22 ` John W. Linville
2008-07-08 13:00   ` Stephen Rothwell
2008-07-08  4:10 Stephen Rothwell
2008-07-08  5:14 ` David Miller
2008-07-08  5:44 ` David Miller
2008-07-08  6:15   ` Stephen Rothwell
2008-07-03  4:08 Stephen Rothwell
2008-07-03  4:14 ` David Miller
2008-07-03  3:56 Stephen Rothwell
2008-07-03  4:11 ` Stephen Rothwell
2008-07-03  4:13 ` David Miller
2008-07-01  7:19 Stephen Rothwell
2008-07-01  7:19 ` Stephen Rothwell
2008-07-01  9:33 ` David Miller
2008-07-01  9:33   ` David Miller
2008-07-01 15:09 ` Stephen Rothwell
2008-07-01 15:09   ` Stephen Rothwell
2008-07-01  7:11 Stephen Rothwell
2008-07-01  7:11 ` Stephen Rothwell
2008-06-13 21:56 linux-next: pending wireless/wireless-current merge conflict John W. Linville
2008-06-25 18:04 ` John W. Linville
2008-06-26  5:40   ` linux-next: manual merge of the net tree Stephen Rothwell
2008-06-26  5:54     ` David Miller
2008-06-26  6:58       ` Stephen Rothwell
2008-06-26  9:08         ` David Miller

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=20080618.220101.192721731.davem@davemloft.net \
    --to=davem@davemloft.net \
    --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.