linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the tty tree with Linus' tree
@ 2011-10-25  8:18 Stephen Rothwell
  2011-10-25 10:03 ` Nicolas Ferre
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2011-10-25  8:18 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Voss, Nikolaus, Nicolas Ferre

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5
("atmel_serial: fix atmel_default_console_device") from Linus' tree and
commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate ports")
from the tty tree.

I just used the tty tree version (which may not be completely correct).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2011-10-25  8:18 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
@ 2011-10-25 10:03 ` Nicolas Ferre
  2011-10-25 10:05   ` [PATCH] tty/serial: atmel_serial: fixup merge conflict Nicolas Ferre
  0 siblings, 1 reply; 24+ messages in thread
From: Nicolas Ferre @ 2011-10-25 10:03 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, linux-next, linux-kernel, Voss, Nikolaus, Nicolas FERRE

On 10/25/2011 10:18 AM, Stephen Rothwell :
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in 
> drivers/tty/serial/atmel_serial.c between commit 0d0a3cc183c5 
> ("atmel_serial: fix atmel_default_console_device") from Linus' tree
> and commit 4cbf9f4864bd ("tty/serial: atmel_serial: auto-enumerate
> ports") from the tty tree.
> 
> I just used the tty tree version (which may not be completely
> correct).

I sent a patch now to fix this conflict. It can be applied on both
current tty-next and linux-next (obviously).

Sorry for the noise and thank you to having take care of this.

Best regards,
-- 
Nicolas Ferre

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

* [PATCH] tty/serial: atmel_serial: fixup merge conflict
  2011-10-25 10:03 ` Nicolas Ferre
@ 2011-10-25 10:05   ` Nicolas Ferre
  0 siblings, 0 replies; 24+ messages in thread
From: Nicolas Ferre @ 2011-10-25 10:05 UTC (permalink / raw)
  To: sfr, greg; +Cc: linux-kernel, linux-next, N.Voss, nicolas.ferre

Proper atmel_console_init() merge using platform data.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 drivers/tty/serial/atmel_serial.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 358bbb2..9988c0c 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1671,7 +1671,9 @@ static struct console atmel_console = {
 static int __init atmel_console_init(void)
 {
 	if (atmel_default_console_device) {
-		int id = atmel_default_console_device->id;
+		struct atmel_uart_data *pdata =
+			atmel_default_console_device->dev.platform_data;
+		int id = pdata->num;
 		struct atmel_uart_port *port = &atmel_ports[id];
 
 		port->backup_imr = 0;
-- 
1.7.5.4

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2020-03-16  6:38   ` Jiri Slaby
@ 2020-03-16  7:46     ` Greg KH
  0 siblings, 0 replies; 24+ messages in thread
From: Greg KH @ 2020-03-16  7:46 UTC (permalink / raw)
  To: Jiri Slaby
  Cc: Stephen Rothwell, Linux Next Mailing List, Linux Kernel Mailing List

On Mon, Mar 16, 2020 at 07:38:33AM +0100, Jiri Slaby wrote:
> On 10. 03. 20, 10:04, Greg KH wrote:
> > On Tue, Mar 10, 2020 at 02:40:13PM +1100, Stephen Rothwell wrote:
> >> Hi all,
> >>
> >> Today's linux-next merge of the tty tree got a conflict in:
> >>
> >>   drivers/tty/vt/selection.c
> >>
> >> between commits:
> >>
> >>   4b70dd57a15d ("vt: selection, push console lock down")
> >>   e8c75a30a23c ("vt: selection, push sel_lock up")
> >>
> >> from Linus' tree and commits:
> >>
> >>   9256d09f1da1 ("vt: selection, create struct from console selection globals")
> >>   bc80932cc25a ("vt: selection, indent switch-case properly")
> >>
> >> from the tty tree.
> >>
> >> I fixed it up (I think - see below) and can carry the fix as necessary.
> >> This is now fixed as far as linux-next is concerned, but any non trivial
> >> conflicts should be mentioned to your upstream maintainer when your tree
> >> is submitted for merging.  You may also want to consider cooperating
> >> with the maintainer of the conflicting tree to minimise any particularly
> >> complex conflicts.
> > 
> > Thank you for this, I hadn't gotten to it yet.
> > 
> > Your merge looks the same as mine, and I've pushed out the merge
> > resolution in my tree.
> 
> Ah, the two merges differ, actually.
> 
> Stepen's (cdc26c076ff):
> 
> -       if (sel_cons != vc_cons[fg_console].d) {
>  -      mutex_lock(&vc_sel.lock);
> +       if (vc_sel.cons != vc_cons[fg_console].d) {
> 
> 
> Yours (cb05c6c82fb0):
>  -      if (sel_cons != vc_cons[fg_console].d) {
>  +      mutex_lock(&vc_sel.lock);
>  +      if (vc_sel.cons != vc_cons[fg_console].d) {
> 
> > Jiri, can you double-check to verify that the merge is correct in my
> > tree?
> 
> So this is now a tty tree problem. Will send a patch in a minute.

Thanks for fixing this up, now merged.

greg k-h

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2020-03-10  9:04 ` Greg KH
  2020-03-10 10:52   ` Jiri Slaby
@ 2020-03-16  6:38   ` Jiri Slaby
  2020-03-16  7:46     ` Greg KH
  1 sibling, 1 reply; 24+ messages in thread
From: Jiri Slaby @ 2020-03-16  6:38 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

On 10. 03. 20, 10:04, Greg KH wrote:
> On Tue, Mar 10, 2020 at 02:40:13PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tty tree got a conflict in:
>>
>>   drivers/tty/vt/selection.c
>>
>> between commits:
>>
>>   4b70dd57a15d ("vt: selection, push console lock down")
>>   e8c75a30a23c ("vt: selection, push sel_lock up")
>>
>> from Linus' tree and commits:
>>
>>   9256d09f1da1 ("vt: selection, create struct from console selection globals")
>>   bc80932cc25a ("vt: selection, indent switch-case properly")
>>
>> from the tty tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary.
>> This is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging.  You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
> 
> Thank you for this, I hadn't gotten to it yet.
> 
> Your merge looks the same as mine, and I've pushed out the merge
> resolution in my tree.

Ah, the two merges differ, actually.

Stepen's (cdc26c076ff):

-       if (sel_cons != vc_cons[fg_console].d) {
 -      mutex_lock(&vc_sel.lock);
+       if (vc_sel.cons != vc_cons[fg_console].d) {


Yours (cb05c6c82fb0):
 -      if (sel_cons != vc_cons[fg_console].d) {
 +      mutex_lock(&vc_sel.lock);
 +      if (vc_sel.cons != vc_cons[fg_console].d) {

> Jiri, can you double-check to verify that the merge is correct in my
> tree?

So this is now a tty tree problem. Will send a patch in a minute.

thanks,
-- 
js
suse labs

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2020-03-10  3:40 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
  2020-03-10  9:04 ` Greg KH
@ 2020-03-16  6:34 ` Jiri Slaby
  1 sibling, 0 replies; 24+ messages in thread
From: Jiri Slaby @ 2020-03-16  6:34 UTC (permalink / raw)
  To: Stephen Rothwell, Greg KH
  Cc: Linux Next Mailing List, Linux Kernel Mailing List


[-- Attachment #1.1: Type: text/plain, Size: 1590 bytes --]

On 10. 03. 20, 4:40, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   drivers/tty/vt/selection.c
> 
> between commits:
> 
>   4b70dd57a15d ("vt: selection, push console lock down")
>   e8c75a30a23c ("vt: selection, push sel_lock up")
> 
> from Linus' tree and commits:
> 
>   9256d09f1da1 ("vt: selection, create struct from console selection globals")
>   bc80932cc25a ("vt: selection, indent switch-case properly")
> 
> from the tty tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

I checked the result previously, but now I see a double lock there. Did
something change?

Anyway, vc_sel.lock cannot be taken in both set_selection_kernel and
__set_selection_kernel:

--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@ -219,7 +219,6 @@ static int __set_selection_kernel(struct
tiocl_selection *v, struct tty_struct *
        if (ps > pe)    /* make vc_sel.start <= vc_sel.end */
                swap(ps, pe);

-       mutex_lock(&vc_sel.lock);
        if (vc_sel.cons != vc_cons[fg_console].d) {
                clear_selection();
                vc_sel.cons = vc_cons[fg_console].d;


thanks,
-- 
js
suse labs


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2020-03-10  9:04 ` Greg KH
@ 2020-03-10 10:52   ` Jiri Slaby
  2020-03-16  6:38   ` Jiri Slaby
  1 sibling, 0 replies; 24+ messages in thread
From: Jiri Slaby @ 2020-03-10 10:52 UTC (permalink / raw)
  To: Greg KH, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List

On 10. 03. 20, 10:04, Greg KH wrote:
> On Tue, Mar 10, 2020 at 02:40:13PM +1100, Stephen Rothwell wrote:
>> Hi all,
>>
>> Today's linux-next merge of the tty tree got a conflict in:
>>
>>   drivers/tty/vt/selection.c
>>
>> between commits:
>>
>>   4b70dd57a15d ("vt: selection, push console lock down")
>>   e8c75a30a23c ("vt: selection, push sel_lock up")
>>
>> from Linus' tree and commits:
>>
>>   9256d09f1da1 ("vt: selection, create struct from console selection globals")
>>   bc80932cc25a ("vt: selection, indent switch-case properly")
>>
>> from the tty tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary.
>> This is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging.  You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
> 
> Thank you for this, I hadn't gotten to it yet.
> 
> Your merge looks the same as mine, and I've pushed out the merge
> resolution in my tree.
> 
> Jiri, can you double-check to verify that the merge is correct in my
> tree?
Yes, the result is exactly what I have in my tree.

thanks,
-- 
js
suse labs

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2020-03-10  3:40 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
@ 2020-03-10  9:04 ` Greg KH
  2020-03-10 10:52   ` Jiri Slaby
  2020-03-16  6:38   ` Jiri Slaby
  2020-03-16  6:34 ` Jiri Slaby
  1 sibling, 2 replies; 24+ messages in thread
From: Greg KH @ 2020-03-10  9:04 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jiri Slaby

On Tue, Mar 10, 2020 at 02:40:13PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   drivers/tty/vt/selection.c
> 
> between commits:
> 
>   4b70dd57a15d ("vt: selection, push console lock down")
>   e8c75a30a23c ("vt: selection, push sel_lock up")
> 
> from Linus' tree and commits:
> 
>   9256d09f1da1 ("vt: selection, create struct from console selection globals")
>   bc80932cc25a ("vt: selection, indent switch-case properly")
> 
> from the tty tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.
> This is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thank you for this, I hadn't gotten to it yet.

Your merge looks the same as mine, and I've pushed out the merge
resolution in my tree.

Jiri, can you double-check to verify that the merge is correct in my
tree?

thanks,

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2020-03-10  3:40 Stephen Rothwell
  2020-03-10  9:04 ` Greg KH
  2020-03-16  6:34 ` Jiri Slaby
  0 siblings, 2 replies; 24+ messages in thread
From: Stephen Rothwell @ 2020-03-10  3:40 UTC (permalink / raw)
  To: Greg KH; +Cc: Linux Next Mailing List, Linux Kernel Mailing List, Jiri Slaby

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

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  drivers/tty/vt/selection.c

between commits:

  4b70dd57a15d ("vt: selection, push console lock down")
  e8c75a30a23c ("vt: selection, push sel_lock up")

from Linus' tree and commits:

  9256d09f1da1 ("vt: selection, create struct from console selection globals")
  bc80932cc25a ("vt: selection, indent switch-case properly")

from the tty tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

cdc26c076ff74acec5113c5234093eae54954761
diff --cc drivers/tty/vt/selection.c
index d7d2e4b844bc,b9c517463efa..582184dd386c
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
@@@ -211,57 -216,53 +216,51 @@@ static int __set_selection_kernel(struc
  		return 0;
  	}
  
- 	if (ps > pe)	/* make sel_start <= sel_end */
+ 	if (ps > pe)	/* make vc_sel.start <= vc_sel.end */
  		swap(ps, pe);
  
- 	if (sel_cons != vc_cons[fg_console].d) {
 -	mutex_lock(&vc_sel.lock);
+ 	if (vc_sel.cons != vc_cons[fg_console].d) {
  		clear_selection();
- 		sel_cons = vc_cons[fg_console].d;
+ 		vc_sel.cons = vc_cons[fg_console].d;
  	}
- 	mode = vt_do_kdgkbmode(fg_console);
- 	if (mode == K_UNICODE)
- 		use_unicode = 1;
- 	else
- 		use_unicode = 0;
- 
- 	switch (v->sel_mode)
- 	{
- 		case TIOCL_SELCHAR:	/* character-by-character selection */
+ 	unicode = vt_do_kdgkbmode(fg_console) == K_UNICODE;
+ 
+ 	switch (v->sel_mode) {
+ 	case TIOCL_SELCHAR:	/* character-by-character selection */
+ 		new_sel_start = ps;
+ 		new_sel_end = pe;
+ 		break;
+ 	case TIOCL_SELWORD:	/* word-by-word selection */
+ 		spc = isspace(sel_pos(ps, unicode));
+ 		for (new_sel_start = ps; ; ps -= 2) {
+ 			if ((spc && !isspace(sel_pos(ps, unicode))) ||
+ 			    (!spc && !inword(sel_pos(ps, unicode))))
+ 				break;
  			new_sel_start = ps;
+ 			if (!(ps % vc->vc_size_row))
+ 				break;
+ 		}
+ 
+ 		spc = isspace(sel_pos(pe, unicode));
+ 		for (new_sel_end = pe; ; pe += 2) {
+ 			if ((spc && !isspace(sel_pos(pe, unicode))) ||
+ 			    (!spc && !inword(sel_pos(pe, unicode))))
+ 				break;
  			new_sel_end = pe;
- 			break;
- 		case TIOCL_SELWORD:	/* word-by-word selection */
- 			spc = isspace(sel_pos(ps));
- 			for (new_sel_start = ps; ; ps -= 2)
- 			{
- 				if ((spc && !isspace(sel_pos(ps))) ||
- 				    (!spc && !inword(sel_pos(ps))))
- 					break;
- 				new_sel_start = ps;
- 				if (!(ps % vc->vc_size_row))
- 					break;
- 			}
- 			spc = isspace(sel_pos(pe));
- 			for (new_sel_end = pe; ; pe += 2)
- 			{
- 				if ((spc && !isspace(sel_pos(pe))) ||
- 				    (!spc && !inword(sel_pos(pe))))
- 					break;
- 				new_sel_end = pe;
- 				if (!((pe + 2) % vc->vc_size_row))
- 					break;
- 			}
- 			break;
- 		case TIOCL_SELLINE:	/* line-by-line selection */
- 			new_sel_start = ps - ps % vc->vc_size_row;
- 			new_sel_end = pe + vc->vc_size_row
- 				    - pe % vc->vc_size_row - 2;
- 			break;
- 		case TIOCL_SELPOINTER:
- 			highlight_pointer(pe);
- 			return 0;
- 		default:
- 			return -EINVAL;
+ 			if (!((pe + 2) % vc->vc_size_row))
+ 				break;
+ 		}
+ 		break;
+ 	case TIOCL_SELLINE:	/* line-by-line selection */
+ 		new_sel_start = ps - ps % vc->vc_size_row;
+ 		new_sel_end = pe + vc->vc_size_row
+ 			    - pe % vc->vc_size_row - 2;
+ 		break;
+ 	case TIOCL_SELPOINTER:
+ 		highlight_pointer(pe);
 -		goto unlock;
++		return 0;
+ 	default:
 -		ret = -EINVAL;
 -		goto unlock;
++		return -EINVAL;
  	}
  
  	/* remove the pointer */
@@@ -270,31 -271,31 +269,31 @@@
  	/* select to end of line if on trailing space */
  	if (new_sel_end > new_sel_start &&
  		!atedge(new_sel_end, vc->vc_size_row) &&
- 		isspace(sel_pos(new_sel_end))) {
+ 		isspace(sel_pos(new_sel_end, unicode))) {
  		for (pe = new_sel_end + 2; ; pe += 2)
- 			if (!isspace(sel_pos(pe)) ||
+ 			if (!isspace(sel_pos(pe, unicode)) ||
  			    atedge(pe, vc->vc_size_row))
  				break;
- 		if (isspace(sel_pos(pe)))
+ 		if (isspace(sel_pos(pe, unicode)))
  			new_sel_end = pe;
  	}
- 	if (sel_start == -1)	/* no current selection */
+ 	if (vc_sel.start == -1)	/* no current selection */
  		highlight(new_sel_start, new_sel_end);
- 	else if (new_sel_start == sel_start)
+ 	else if (new_sel_start == vc_sel.start)
  	{
- 		if (new_sel_end == sel_end)	/* no action required */
+ 		if (new_sel_end == vc_sel.end)	/* no action required */
 -			goto unlock;
 +			return 0;
- 		else if (new_sel_end > sel_end)	/* extend to right */
- 			highlight(sel_end + 2, new_sel_end);
+ 		else if (new_sel_end > vc_sel.end)	/* extend to right */
+ 			highlight(vc_sel.end + 2, new_sel_end);
  		else				/* contract from right */
- 			highlight(new_sel_end + 2, sel_end);
+ 			highlight(new_sel_end + 2, vc_sel.end);
  	}
- 	else if (new_sel_end == sel_end)
+ 	else if (new_sel_end == vc_sel.end)
  	{
- 		if (new_sel_start < sel_start)	/* extend to left */
- 			highlight(new_sel_start, sel_start - 2);
+ 		if (new_sel_start < vc_sel.start) /* extend to left */
+ 			highlight(new_sel_start, vc_sel.start - 2);
  		else				/* contract from left */
- 			highlight(sel_start, new_sel_start - 2);
+ 			highlight(vc_sel.start, new_sel_start - 2);
  	}
  	else	/* some other case; start selection from scratch */
  	{
@@@ -311,15 -312,16 +310,15 @@@
  	if (!bp) {
  		printk(KERN_WARNING "selection: kmalloc() failed\n");
  		clear_selection();
 -		ret = -ENOMEM;
 -		goto unlock;
 +		return -ENOMEM;
  	}
- 	kfree(sel_buffer);
- 	sel_buffer = bp;
+ 	kfree(vc_sel.buffer);
+ 	vc_sel.buffer = bp;
  
  	obp = bp;
- 	for (i = sel_start; i <= sel_end; i += 2) {
- 		c = sel_pos(i);
- 		if (use_unicode)
+ 	for (i = vc_sel.start; i <= vc_sel.end; i += 2) {
+ 		c = sel_pos(i, unicode);
+ 		if (unicode)
  			bp += store_utf8(c, bp);
  		else
  			*bp++ = c;
@@@ -335,21 -337,9 +334,21 @@@
  			obp = bp;
  		}
  	}
- 	sel_buffer_lth = bp - sel_buffer;
+ 	vc_sel.buf_len = bp - vc_sel.buffer;
 -unlock:
 +
 +	return ret;
 +}
 +
 +int set_selection_kernel(struct tiocl_selection *v, struct tty_struct *tty)
 +{
 +	int ret;
 +
- 	mutex_lock(&sel_lock);
++	mutex_lock(&vc_sel.lock);
 +	console_lock();
 +	ret = __set_selection_kernel(v, tty);
 +	console_unlock();
- 	mutex_unlock(&sel_lock);
+ 	mutex_unlock(&vc_sel.lock);
 +
  	return ret;
  }
  EXPORT_SYMBOL_GPL(set_selection_kernel);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2016-05-20  2:31 Stephen Rothwell
@ 2016-05-21  3:26 ` Greg KH
  0 siblings, 0 replies; 24+ messages in thread
From: Greg KH @ 2016-05-21  3:26 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Andrei Pistirica, Ralf Baechle,
	Vladimir Murzin, Linus Torvalds

On Fri, May 20, 2016 at 12:31:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   include/uapi/linux/serial_core.h
> 
> between commits:
> 
>   157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
>   07b75260ebc2 ("Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus")
> 
> from Linus' tree and commit:
> 
>   041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
> 
> from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Thanks for this, I've warned Linus to watch out for this when he merges
my tree into his.

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2016-05-20  2:31 Stephen Rothwell
  2016-05-21  3:26 ` Greg KH
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2016-05-20  2:31 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Andrei Pistirica, Ralf Baechle,
	Vladimir Murzin, Linus Torvalds

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in:

  include/uapi/linux/serial_core.h

between commits:

  157b9394709e ("serial: pic32_uart: Add PIC32 UART driver")
  07b75260ebc2 ("Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus")

from Linus' tree and commit:

  041f031def33 ("serial: mps2-uart: add MPS2 UART driver")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/uapi/linux/serial_core.h
index 24da334af7f1,9aef04c5f7bc..000000000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -264,7 -264,7 +264,10 @@@
  /* MVEBU UART */
  #define PORT_MVEBU	114
  
 +/* Microchip PIC32 UART */
 +#define PORT_PIC32	115
 +
+ /* MPS2 UART */
 -#define PORT_MPS2UART	115
++#define PORT_MPS2UART	116
+ 
  #endif /* _UAPILINUX_SERIAL_CORE_H */

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2014-05-05  5:41 Stephen Rothwell
@ 2014-05-05 21:02 ` Greg KH
  0 siblings, 0 replies; 24+ messages in thread
From: Greg KH @ 2014-05-05 21:02 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Marc Zyngier, Catalin Marinas, Rob Herring

On Mon, May 05, 2014 at 03:41:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> arch/arm64/kernel/early_printk.c between commit f774b7d10e21 ("arm64:
> fixmap: fix missing sub-page offset for earlyprintk") from the  tree and
> commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") from the
> tty tree.
> 
> I fixed it up (I removed the file) and can carry the fix as necessary (no
> action is required).

That sounds fine to me, thanks.

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2014-05-05  5:41 Stephen Rothwell
  2014-05-05 21:02 ` Greg KH
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2014-05-05  5:41 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Marc Zyngier, Catalin Marinas, Rob Herring

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
arch/arm64/kernel/early_printk.c between commit f774b7d10e21 ("arm64:
fixmap: fix missing sub-page offset for earlyprintk") from the  tree and
commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") from the
tty tree.

I fixed it up (I removed the file) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2013-01-21  3:46 Stephen Rothwell
  2013-01-21 21:02 ` Greg KH
@ 2013-01-25 20:57 ` Greg KH
  1 sibling, 0 replies; 24+ messages in thread
From: Greg KH @ 2013-01-25 20:57 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Wei Yongjun, Tony Prisk

On Mon, Jan 21, 2013 at 02:46:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty:
> serial: vt8500: fix return value check in vt8500_serial_probe()") from
> Linus' tree and commit 12faa35ae5cb ("serial: vt8500: UART uses gated
> clock rather than 24Mhz reference") from the tty tree.
> 
> I fixed it up (I just used the tty tree version - which included the
> former fix) and can carry the fix as necessary (no action is required).

This should be resolved in the next pull of my tree.

thanks,

greg k-h

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2013-01-21  3:46 Stephen Rothwell
@ 2013-01-21 21:02 ` Greg KH
  2013-01-25 20:57 ` Greg KH
  1 sibling, 0 replies; 24+ messages in thread
From: Greg KH @ 2013-01-21 21:02 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Wei Yongjun, Tony Prisk

On Mon, Jan 21, 2013 at 02:46:04PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty:
> serial: vt8500: fix return value check in vt8500_serial_probe()") from
> Linus' tree and commit 12faa35ae5cb ("serial: vt8500: UART uses gated
> clock rather than 24Mhz reference") from the tty tree.
> 
> I fixed it up (I just used the tty tree version - which included the
> former fix) and can carry the fix as necessary (no action is required).

That sounds correct, thanks.

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2013-01-21  3:46 Stephen Rothwell
  2013-01-21 21:02 ` Greg KH
  2013-01-25 20:57 ` Greg KH
  0 siblings, 2 replies; 24+ messages in thread
From: Stephen Rothwell @ 2013-01-21  3:46 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Wei Yongjun, Tony Prisk

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty:
serial: vt8500: fix return value check in vt8500_serial_probe()") from
Linus' tree and commit 12faa35ae5cb ("serial: vt8500: UART uses gated
clock rather than 24Mhz reference") from the tty tree.

I fixed it up (I just used the tty tree version - which included the
former fix) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2013-01-17  2:04 Stephen Rothwell
@ 2013-01-18  0:41 ` Greg KH
  0 siblings, 0 replies; 24+ messages in thread
From: Greg KH @ 2013-01-18  0:41 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Steven Rostedt

On Thu, Jan 17, 2013 at 01:04:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/staging/sb105x/Kconfig between commit db210312f77b ("staging:
> Make SystemBase PCI Multiport UART only for x86") from the  tree and
> commit e27a7d7977b0 ("Staging: sb105x: mark it BROKEN") from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc drivers/staging/sb105x/Kconfig
> index 1facad6,3d0d0eb..0000000
> --- a/drivers/staging/sb105x/Kconfig
> +++ b/drivers/staging/sb105x/Kconfig
> @@@ -1,8 -1,7 +1,8 @@@
>   config SB105X
>   	tristate "SystemBase PCI Multiport UART"
>   	select SERIAL_CORE
> - 	depends on PCI
> + 	depends on PCI && BROKEN
>  +	depends on X86

Looks good to me, thanks.

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2013-01-17  2:04 Stephen Rothwell
  2013-01-18  0:41 ` Greg KH
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2013-01-17  2:04 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Steven Rostedt

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/staging/sb105x/Kconfig between commit db210312f77b ("staging:
Make SystemBase PCI Multiport UART only for x86") from the  tree and
commit e27a7d7977b0 ("Staging: sb105x: mark it BROKEN") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/sb105x/Kconfig
index 1facad6,3d0d0eb..0000000
--- a/drivers/staging/sb105x/Kconfig
+++ b/drivers/staging/sb105x/Kconfig
@@@ -1,8 -1,7 +1,8 @@@
  config SB105X
  	tristate "SystemBase PCI Multiport UART"
  	select SERIAL_CORE
- 	depends on PCI
+ 	depends on PCI && BROKEN
 +	depends on X86
  	help
  	  A driver for the SystemBase Multi-2/PCI serial card
  

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

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2011-10-25  8:12 Stephen Rothwell
@ 2011-10-25 12:02 ` Greg KH
  0 siblings, 0 replies; 24+ messages in thread
From: Greg KH @ 2011-10-25 12:02 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tomoya MORINAGA

On Tue, Oct 25, 2011 at 07:12:17PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250_pci.c between commit dacacc3e794c
> ("serial/8250_pci: delete duplicate data definition") from Linus' tree
> and commit 64d91cfaade2 ("8250_pci: Fix kernel panic when pch_uart is
> disabled") from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, the fix is correct.

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2011-10-25  8:12 Stephen Rothwell
  2011-10-25 12:02 ` Greg KH
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2011-10-25  8:12 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Tomoya MORINAGA

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

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250_pci.c between commit dacacc3e794c
("serial/8250_pci: delete duplicate data definition") from Linus' tree
and commit 64d91cfaade2 ("8250_pci: Fix kernel panic when pch_uart is
disabled") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/tty/serial/8250_pci.c
index 3abeca2,1b449b7..0000000
--- a/drivers/tty/serial/8250_pci.c
+++ b/drivers/tty/serial/8250_pci.c
@@@ -1598,7 -1639,14 +1639,8 @@@ static struct pci_serial_quirk pci_seri
  		.vendor         = 0x10DB,
  		.device         = 0x800D,
  		.init		= pci_eg20t_init,
+ 		.setup		= pci_default_setup,
  	},
 -	{
 -		.vendor         = 0x10DB,
 -		.device         = 0x800D,
 -		.init		= pci_eg20t_init,
 -		.setup		= pci_default_setup,
 -	},
  	/*
  	 * Cronyx Omega PCI (PLX-chip based)
  	 */

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

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2011-02-25  5:11   ` Stephen Rothwell
@ 2011-02-25  5:48     ` Greg KH
  0 siblings, 0 replies; 24+ messages in thread
From: Greg KH @ 2011-02-25  5:48 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Amit Shah

On Fri, Feb 25, 2011 at 04:11:24PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Thu, 24 Feb 2011 11:39:47 -0800 Greg KH <greg@kroah.com> wrote:
> >
> > Thanks, I've merge 2.6.38-rc6 into tty-next so this, and another merge
> > issue, should now be resolved.
> 
> Thanks.  The tree still has its build failure, though.

Yes, sorry, will fix that tomorrow.

greg k-h

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2011-02-24 19:39 ` Greg KH
@ 2011-02-25  5:11   ` Stephen Rothwell
  2011-02-25  5:48     ` Greg KH
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2011-02-25  5:11 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Amit Shah

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

Hi Greg,

On Thu, 24 Feb 2011 11:39:47 -0800 Greg KH <greg@kroah.com> wrote:
>
> Thanks, I've merge 2.6.38-rc6 into tty-next so this, and another merge
> issue, should now be resolved.

Thanks.  The tree still has its build failure, though.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

* Re: linux-next: manual merge of the tty tree with Linus' tree
  2011-02-24  5:34 Stephen Rothwell
@ 2011-02-24 19:39 ` Greg KH
  2011-02-25  5:11   ` Stephen Rothwell
  0 siblings, 1 reply; 24+ messages in thread
From: Greg KH @ 2011-02-24 19:39 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Amit Shah

On Thu, Feb 24, 2011 at 04:34:39PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/char/Makefile between commit
> 51df0acc3d76cf41d5496ef044cc5717ab5c7f71 ("virtio: console: Move file
> back to drivers/char/") from Linus' tree and commit
> a6afd9f3e819de4795fcd356e5bfad446e4323f2 ("tty: move a number of tty
> drivers from drivers/char/ to drivers/tty/") (and later ones) from the tty
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Thanks, I've merge 2.6.38-rc6 into tty-next so this, and another merge
issue, should now be resolved.

greg k-h

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

* linux-next: manual merge of the tty tree with Linus' tree
@ 2011-02-24  5:34 Stephen Rothwell
  2011-02-24 19:39 ` Greg KH
  0 siblings, 1 reply; 24+ messages in thread
From: Stephen Rothwell @ 2011-02-24  5:34 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Amit Shah

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/char/Makefile between commit
51df0acc3d76cf41d5496ef044cc5717ab5c7f71 ("virtio: console: Move file
back to drivers/char/") from Linus' tree and commit
a6afd9f3e819de4795fcd356e5bfad446e4323f2 ("tty: move a number of tty
drivers from drivers/char/ to drivers/tty/") (and later ones) from the tty
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/char/Makefile
index 8238f89,3ca1f62..0000000
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@@ -5,32 -5,7 +5,8 @@@
  obj-y				+= mem.o random.o
  obj-$(CONFIG_TTY_PRINTK)	+= ttyprintk.o
  obj-y				+= misc.o
- obj-$(CONFIG_BFIN_JTAG_COMM)	+= bfin_jtag_comm.o
- obj-$(CONFIG_MVME147_SCC)	+= generic_serial.o vme_scc.o
- obj-$(CONFIG_MVME162_SCC)	+= generic_serial.o vme_scc.o
- obj-$(CONFIG_BVME6000_SCC)	+= generic_serial.o vme_scc.o
- obj-$(CONFIG_ROCKETPORT)	+= rocket.o
- obj-$(CONFIG_SERIAL167)		+= serial167.o
- obj-$(CONFIG_CYCLADES)		+= cyclades.o
- obj-$(CONFIG_STALLION)		+= stallion.o
- obj-$(CONFIG_ISTALLION)		+= istallion.o
- obj-$(CONFIG_NOZOMI)		+= nozomi.o
- obj-$(CONFIG_DIGIEPCA)		+= epca.o
- obj-$(CONFIG_SPECIALIX)		+= specialix.o
- obj-$(CONFIG_MOXA_INTELLIO)	+= moxa.o
- obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o
  obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o
- obj-$(CONFIG_MOXA_SMARTIO)	+= mxser.o
- obj-$(CONFIG_COMPUTONE)		+= ip2/
- obj-$(CONFIG_RISCOM8)		+= riscom8.o
- obj-$(CONFIG_ISI)		+= isicom.o
- obj-$(CONFIG_SYNCLINK)		+= synclink.o
- obj-$(CONFIG_SYNCLINKMP)	+= synclinkmp.o
- obj-$(CONFIG_SYNCLINK_GT)	+= synclink_gt.o
- obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
- obj-$(CONFIG_SX)		+= sx.o generic_serial.o
- obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
 +obj-$(CONFIG_VIRTIO_CONSOLE)	+= virtio_console.o
  obj-$(CONFIG_RAW_DRIVER)	+= raw.o
  obj-$(CONFIG_SGI_SNSC)		+= snsc.o snsc_event.o
  obj-$(CONFIG_MSPEC)		+= mspec.o

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

end of thread, other threads:[~2020-03-16  7:46 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-10-25  8:18 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2011-10-25 10:03 ` Nicolas Ferre
2011-10-25 10:05   ` [PATCH] tty/serial: atmel_serial: fixup merge conflict Nicolas Ferre
  -- strict thread matches above, loose matches on Subject: below --
2020-03-10  3:40 linux-next: manual merge of the tty tree with Linus' tree Stephen Rothwell
2020-03-10  9:04 ` Greg KH
2020-03-10 10:52   ` Jiri Slaby
2020-03-16  6:38   ` Jiri Slaby
2020-03-16  7:46     ` Greg KH
2020-03-16  6:34 ` Jiri Slaby
2016-05-20  2:31 Stephen Rothwell
2016-05-21  3:26 ` Greg KH
2014-05-05  5:41 Stephen Rothwell
2014-05-05 21:02 ` Greg KH
2013-01-21  3:46 Stephen Rothwell
2013-01-21 21:02 ` Greg KH
2013-01-25 20:57 ` Greg KH
2013-01-17  2:04 Stephen Rothwell
2013-01-18  0:41 ` Greg KH
2011-10-25  8:12 Stephen Rothwell
2011-10-25 12:02 ` Greg KH
2011-02-24  5:34 Stephen Rothwell
2011-02-24 19:39 ` Greg KH
2011-02-25  5:11   ` Stephen Rothwell
2011-02-25  5:48     ` Greg KH

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