linux-next: manual merge of the hdlc tree

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 507 bytes --]

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/cosa.c between commit
0911810755fc9f15659cc3cb43912633b90027a0 ("cosa: cdev lock_kernel()
pushdown") from the blk-removal tree and commit
d2e510df1fe342b6df51c1af036ca28a60f6fc55 ("WAN: Port COSA driver to
generic HDLC") from the hdlc tree.

Just a simple overlapping change. I can carry the fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

On Fri, 4 Jul 2008 18:56:45 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the hdlc tree got a conflict in
> drivers/net/wan/cosa.c between commit
> 0911810755fc9f15659cc3cb43912633b90027a0 ("cosa: cdev lock_kernel()
> pushdown") from the blk-removal tree and commit
                      ^^^
bkl

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/hdlc_fr.c between commit
54364b752ef0c91fe92684df000cc4593d1e8963 ("Add missing skb->dev
assignment in Frame Relay RX code") from the net tree and commit
41274d8181eca88e7ac2d7e82f804263a4f23ce4 ("WAN: Use struct
net_device_stats built into struct net_device.") from the hdlc tree
(which seem sto also exist in the net tree).

Just contextual.  I kept in the net tree's addition.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 544 bytes --]

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/pc300_drv.c between commit
198191c4a7ce4daba379608fb38b9bc5a4eedc61 ("WAN: convert drivers to use
built-in netdev_stats") from the net tree and commit
e693f93d7b291ae6a774728c35bd1c7969f1782a ("WAN: Convert PC300 driver to
use normal u8/u16/u32 types") from the hdlc tree.

Just contextual conflicts.  I used the hdlc tree's version.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
Documentation/DocBook/Makefile between commit
7e3975617df8dd8b7fd94f14200abdec9f71729e ("Remove videobook.tmpl") from
Linus' tree and commit 9c7205161b03a43861765a26fc72f5a00fdadf75 ("WAN:
syncppp.c is no longer used by any kernel code. Remove it") from the hdlc
tree.

Overlapping changes.  I fixed it up (see below).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc Documentation/DocBook/Makefile
index fabc064,69f4a93..0000000
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -6,7 -6,7 +6,7 @@@
  # To add a new book the only step required is to add the book to the
  # list of DOCBOOKS.
  
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
 -DOCBOOKS := z8530book.xml mcabook.xml videobook.xml \
++DOCBOOKS := z8530book.xml mcabook.xml \
  	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    procfs-guide.xml writing_usb_driver.xml networking.xml \
  	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

Re: linux-next: manual merge of the hdlc tree

[Krzysztof Halasa]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the hdlc tree got a conflict in
> Documentation/DocBook/Makefile between commit
> 7e3975617df8dd8b7fd94f14200abdec9f71729e ("Remove videobook.tmpl") from
> Linus' tree and commit 9c7205161b03a43861765a26fc72f5a00fdadf75 ("WAN:
> syncppp.c is no longer used by any kernel code. Remove it") from the hdlc
> tree.
>
> Overlapping changes.  I fixed it up (see below).

Thanks. I will update to have the latest Linus' tree.
-- 
Krzysztof Halasa

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/syncppp.c between commit
404b12c10d2f4d77649a193af2ec69f77b852926 ("drivers/net/wan/syncppp: Fix
unused-var warnings") from the net-current tree and commit
8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN: syncppp.c is no longer
used by any kernel code. Remove it.") from the hdlc tree.

The former modifies code while the latter removes the whole driver.  I
just removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

Hi Krzysztof,

Today's linux-next merge of the hdlc tree got a conflict in
Documentation/DocBook/wanbook.tmpl between commit
89a056df78b113fcab21d71cd24aa1893c09225b ("Rationalise Randy's address a
bit") from Linus' tree and commit
8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN: syncppp.c is no longer
used by any kernel code. Remove it.") from the hdlc tree.

The former updated a file that the latter removed.  I just removed it.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the hdlc tree

[Krzysztof Halasa]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Today's linux-next merge of the hdlc tree got a conflict in
> Documentation/DocBook/wanbook.tmpl between commit
> 89a056df78b113fcab21d71cd24aa1893c09225b ("Rationalise Randy's address a
> bit") from Linus' tree and commit
> 8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN: syncppp.c is no longer
> used by any kernel code. Remove it.") from the hdlc tree.
>
> The former updated a file that the latter removed.  I just removed it.

Thanks. I will request Jeff to pull this code soon (the tree will be
reset) so I hope the conflicts will end in few days.
-- 
Krzysztof Halasa

Re: linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

Hi Krzysztof,

On Fri, 31 Oct 2008 18:50:09 +0100 Krzysztof Halasa <khc@pm.waw.pl> wrote:
>
> Thanks. I will request Jeff to pull this code soon (the tree will be
> reset) so I hope the conflicts will end in few days.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: manual merge of the hdlc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

Hi Krzysztof,

I have been carrying a conflict between your tree, Linus' and the net
trees.  Could you please do the following:
	merge Linus' tree into yours and fix up the conflict
(Documentation/DocBook/wanbook.tmpl is modified in Linus' tree and
removed in yours)
	send commit 8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN:
syncppp.c is no longer used by any kernel code. Remove it") to Dave
Miller to include in the net tree.  You can keep it in your tree as well.

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]