linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the usb tree
@ 2008-11-10  1:06 Stephen Rothwell
  2008-11-10  1:40 ` Greg KH
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2008-11-10  1:06 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, Jonathan McDowell, Jeff Garzik, David S. Miller,
	Denis Joseph Barrow

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/net/usb/hso.c between commit
939a9516416ad8ccec27aa05bd19236c550c0c03 ("[netdrvr] usb/hso: Cleanup
rfkill error handling") from the net-current tree and commit
d0797ae05df8297aa1db7216c8814419047d5a12 ("HSO: put linefeeds on printk's
in hso.c") from the usb tree.

Some of the changes from the latter have been done on the former and the
former added some code next to those changes.  I have fixed it up for now
but the net-current change will (presumably) be in Linus' tree shortly,
so I expect this to be fixed in the usb tree soon.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: Tree for Oct 22
@ 2013-10-22 15:08 Thierry Reding
  2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
  0 siblings, 1 reply; 23+ messages in thread
From: Thierry Reding @ 2013-10-22 15:08 UTC (permalink / raw)
  To: linux-next, linux-kernel; +Cc: Mark Brown

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

        git://gitorious.org/thierryreding/linux-next.git

A next-20131022 tag is also provided for convenience.

Gained a couple new conflicts, fixed more build failures. ARM seems to
be in pretty good shape, as is the 64-bit x86 allmodconfig.

Thierry

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-10-14  3:53 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:53 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Alan Cox

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/ftdi_sio.c between commit
43b11d33f2c20c33fcf197780edb2e5d8a1b6a67 ("ftdi: A few errors are err()
that should be debug which causes much spewage") from Linus' tree and
commit 1e5778f3c11989c36ca25e60dc3ecf14af3a4c99 ("USB: remove use of err
() in drivers/usb/serial") from the usb tree.

I used the versions from Linus tree for now.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-10-14  3:47 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:47 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Denis Joseph Barrow

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/net/usb/hso.c between commit
8ef5ba63b94b04b182ac4a6009dbbf1406beb3c5 ("[netdrvr] usb/hso: throttle to
prevent loss of serial data") from Linus' tree and commit
046a038ee4a99eb585313b07dc658a6a444d530e ("HSO: put linefeeds on printk's
in hso.c") from the usb tree.

The former removed some of the code that the latter was modifying.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-10-14  3:37 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:37 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/media/video/zr364xx.c between commit
69025c934b21a9ce49a76dfef59f1ebdfbe96c78 ("V4L/DVB (8731): zr364xx:
remove BKL") from Linus' tree and commit
598abe853e0084a625b0d554fa9afe8562bd2aa7 ("USB: remove info() macro from
usb media drivers") from the usb tree.

I fixed it up by using he version in Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-10-14  3:31 Stephen Rothwell
  2008-10-14  5:44 ` Alexey Klimov
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:31 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Alexey Klimov, Mauro Carvalho Chehab

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/media/radio/dsbr100.c between commit
90b698dd47f3929f20746f828e2cd648bc6539dd ("V4L/DVB (9151): dsbr100: Add
returns and fix codingstyle for vidioc_s_ctrl") from Linus' tree and
commit 58e43f3f48c28cc35be7502b5aa81ce53de51815 ("USB: remove warn()
macro from usb media drivers") from the usb tree.

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

diff --cc drivers/media/radio/dsbr100.c
index 66783ff,bbd237d..0000000
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@@ -360,15 -360,13 +360,17 @@@ static int vidioc_s_ctrl(struct file *f
  	switch (ctrl->id) {
  	case V4L2_CID_AUDIO_MUTE:
  		if (ctrl->value) {
 -			if (dsbr100_stop(radio)==-1)
 +			if (dsbr100_stop(radio) == -1) {
- 				warn("Radio did not respond properly");
+ 				dev_warn(&radio->usbdev->dev,
+ 					 "Radio did not respond properly\n");
 +				return -EBUSY;
 +			}
  		} else {
 -			if (dsbr100_start(radio)==-1)
 +			if (dsbr100_start(radio) == -1) {
- 				warn("Radio did not respond properly");
+ 				dev_warn(&radio->usbdev->dev,
+ 					 "Radio did not respond properly\n");
 +				return -EBUSY;
 +			}
  		}
  		return 0;
  	}
@@@ -416,9 -413,9 +418,10 @@@ static int usb_dsbr100_open(struct inod
  	radio->muted = 1;
  
  	if (dsbr100_start(radio)<0) {
- 		warn("Radio did not start up properly");
+ 		dev_warn(&radio->usbdev->dev,
+ 			 "Radio did not start up properly\n");
  		radio->users = 0;
 +		unlock_kernel();
  		return -EIO;
  	}
  	dsbr100_setfreq(radio, radio->curfreq);

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-10-14  3:27 Stephen Rothwell
  0 siblings, 0 replies; 23+ messages in thread
From: Stephen Rothwell @ 2008-10-14  3:27 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Tomi Orava, Mauro Carvalho Chehab

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/media/dvb/cinergyT2/cinergyT2.c between commit
986bd1e58b18c09b753f797df19251804bfe3e84 ("V4L/DVB (9107): Alternative
version of Terratec Cinergy T2 driver") from Linus' tree and commit
58e43f3f48c28cc35be7502b5aa81ce53de51815 ("USB: remove warn() macro from
usb media drivers") from the usb tree.

The former commit removes the file, so I have done that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-07-17  0:54 Stephen Rothwell
  2008-07-17  7:04 ` Greg KH
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2008-07-17  0:54 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, David Woodhouse, Alan Cox

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

Hi Greg,

Now that the firmware tree has been merged into Linus' tree, the files
drivers/usb/serial/ti_fw_3410.h and drivers/usb/serial/ti_fw_5052.h no
longer exist, so the patch "ti_usb: kick firmware into user space" no
longer needs to patch them.  I am not sure if that patch is needed at all
any more (probably not).

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

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-07-16  2:02 Stephen Rothwell
  2008-07-16  2:30 ` Greg KH
  2008-07-16  7:06 ` Jaswinder Singh
  0 siblings, 2 replies; 23+ messages in thread
From: Stephen Rothwell @ 2008-07-16  2:02 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Alan Cox, Jaswinder Singh

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/serial/io_ti.c between commit
d12b219a228efe92f0778ed3af21305e65fbb052 ("edgeport-ti: use
request_firmware()") from Linus' tree and commit
1f023570c8d00d3511799ccad21dc3525a6160e1 ("USB: io_ti: FIrst cut at a big
clean up") from the usb tree.

This conflict used to be in the firmware tree and my solution then was to
remove the commit now in Linus' tree because the fixup was going to take
to long.  Now my solution is to remove the commit from the usb tree.

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

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

^ permalink raw reply	[flat|nested] 23+ messages in thread
* linux-next: manual merge of the usb tree
@ 2008-07-07  3:09 Stephen Rothwell
  2008-07-07 14:09 ` Alan Stern
  0 siblings, 1 reply; 23+ messages in thread
From: Stephen Rothwell @ 2008-07-07  3:09 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, Alan Stern

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

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/hub.c between commit
09ca8adbe9f724a7e96f512c0039c4c4a1c5dcc0 ("Revert "USB: don't explicitly
reenable root-hub status interrupts"") from Linus' tree and commit
hub_events ("USB: simplify hub_restart() logic") from the usb tree.

I fixed it up but definitely worth a check to make sure that the end of
hub_events() still make sense.

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

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

^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2013-10-22 18:02 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-10  1:06 linux-next: manual merge of the usb tree Stephen Rothwell
2008-11-10  1:40 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02   ` Srinivas Pandruvada
2008-10-14  3:53 Stephen Rothwell
2008-10-14  3:47 Stephen Rothwell
2008-10-14  3:37 Stephen Rothwell
2008-10-14  3:31 Stephen Rothwell
2008-10-14  5:44 ` Alexey Klimov
2008-10-14  3:27 Stephen Rothwell
2008-07-17  0:54 Stephen Rothwell
2008-07-17  7:04 ` Greg KH
2008-07-16  2:02 Stephen Rothwell
2008-07-16  2:30 ` Greg KH
2008-07-16  7:06 ` Jaswinder Singh
2008-07-16  7:13   ` Stephen Rothwell
2008-07-16  7:20     ` Jaswinder Singh
2008-07-16  7:45       ` Stephen Rothwell
2008-07-16  7:49         ` Jaswinder Singh
2008-07-16  7:58           ` Stephen Rothwell
2008-07-07  3:09 Stephen Rothwell
2008-07-07 14:09 ` Alan Stern
2008-07-07 16:09   ` Stephen Rothwell

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).