From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jiri Pirko <jpirko@redhat.com>,
Ian Campbell <Ian.Campbell@citrix.com>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
Mark Einon <mark.einon@gmail.com>
Subject: linux-next: manual merge of the staging tree with the net-next tree
Date: Tue, 25 Oct 2011 19:26:36 +1100 [thread overview]
Message-ID: <20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 703 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et1310_tx.c drivers/staging/et131x/et131x_netdev.c
between commits afc4b13df143 ("net: remove use of ndo_set_multicast_list
in drivers"), bf3f1a6081aa ("et131x: convert to SKB paged frag API") and
5d6bcdfe38ce ("net: use DMA_x_DEVICE and dma_mapping_error with
skb_frag_dma_map") from the net-next tree and commit d2796743cba2
("staging: et131x: Put all .c files into one big file") from the staging
tree.
The latter removed these files, so I did that but more fixup is proably
needed.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2011-10-25 8:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 8:26 Stephen Rothwell [this message]
2011-10-25 12:15 ` [PATCH] linux-next: et131x: Fixups due to merge issues from staging tree Mark Einon
2012-01-31 18:26 ` Greg KH
2012-01-31 19:09 ` Mark Einon
2013-01-23 4:45 linux-next: manual merge of the staging tree with the net-next tree Stephen Rothwell
2013-01-23 4:52 ` Greg KH
2013-05-29 4:14 Stephen Rothwell
2013-05-29 8:03 ` Greg KH
2014-03-17 8:08 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2014-03-27 5:09 Stephen Rothwell
2014-03-27 19:14 ` Eric W. Biederman
2014-05-28 8:28 Stephen Rothwell
2014-05-28 15:49 ` Greg KH
2014-07-16 6:43 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2016-10-21 1:21 Stephen Rothwell
2016-11-24 3:42 Stephen Rothwell
2016-12-07 4:04 Stephen Rothwell
2016-12-07 7:02 ` Greg KH
2018-03-15 7:35 Stephen Rothwell
2019-02-28 4:52 Stephen Rothwell
2019-02-28 7:04 ` Greg KH
2021-08-02 23:33 Mark Brown
2021-08-03 8:57 ` Phillip Potter
2021-08-03 9:23 ` Arnd Bergmann
2021-08-09 7:55 ` Stephen Rothwell
2021-08-09 12:46 ` Phillip Potter
2021-08-09 20:00 ` Arnd Bergmann
2021-08-09 21:45 ` Phillip Potter
2023-10-23 3:47 Stephen Rothwell
2023-10-23 7:27 ` Greg KH
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=20111025192636.f816c8860ee168a0a4756eda@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Ian.Campbell@citrix.com \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=jpirko@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.einon@gmail.com \
--cc=netdev@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).