Prev: isdn: avoid calling tty_ldisc_flush() in atomic context
Next: [PATCH] hp-wmi: add return value checking for input_allocate_device()
From: David Miller on 5 Jul 2010 22:30
From: Tilman Schmidt <tilman(a)imap.cc>
Date: Tue, 6 Jul 2010 02:18:59 +0200 (CEST)

> @@ -384,7 +388,7 @@ void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *dskb)
>
> /* don't send further B3 messages if disconnected */
> if (bcs->apconnstate < APCONN_ACTIVE) {
> - gig_dbg(DEBUG_LLDATA, "disconnected, discarding ack");
> + gig_dbg(DEBUG_MCMD, "disconnected, discarding ack");
> return;
> }

This is against something other than net-next-2.6 even with your
other two ISDN patches applied, because all of these lines read
"if (ap->connected ..."

Please tell me what exactly these patches are against so that I
can apply them to net-next-2.6 cleanly.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Tilman Schmidt on 6 Jul 2010 04:20
Am 2010-07-06 04:23 schrieb David Miller:
> From: Tilman Schmidt <tilman(a)imap.cc>
> Date: Tue, 6 Jul 2010 02:18:59 +0200 (CEST)
>
>> @@ -384,7 +388,7 @@ void gigaset_skb_sent(struct bc_state *bcs, struct sk_buff *dskb)
>>
>> /* don't send further B3 messages if disconnected */
>> if (bcs->apconnstate < APCONN_ACTIVE) {
>> - gig_dbg(DEBUG_LLDATA, "disconnected, discarding ack");
>> + gig_dbg(DEBUG_MCMD, "disconnected, discarding ack");
>> return;
>> }
>
> This is against something other than net-next-2.6 even with your
> other two ISDN patches applied, because all of these lines read
> "if (ap->connected ..."
>
> Please tell me what exactly these patches are against so that I
> can apply them to net-next-2.6 cleanly.

They are against mainline and apply cleanly to v2.6.35-rc3.
IOW, they go on top of the series you applied to net-2.6 on
Fri, 25 Jun 2010 21:31:28 -0700 (PDT).

Specifically, the last patch of that series,
> Subject: [PATCH 5/5] isdn/gigaset: correct CAPI connection state storage
makes the switch from ap->connected to bcs->apconnstate.

So if you'll postpone applying last night's series until
after your next merge of net-2.6 into net-next-2.6, it
should then apply cleanly.

Thanks,
Tilman

From: David Miller on 6 Jul 2010 13:50
From: Tilman Schmidt <tilman(a)imap.cc>
Date: Tue, 06 Jul 2010 10:14:53 +0200

> So if you'll postpone applying last night's series until
> after your next merge of net-2.6 into net-next-2.6, it
> should then apply cleanly.

That's the kind of information I'd like to see from you when you
post patches which have such dependencies.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Tilman Schmidt on 6 Jul 2010 16:40
Am 06.07.2010 19:44 schrieb David Miller:
> From: Tilman Schmidt <tilman(a)imap.cc>
> Date: Tue, 06 Jul 2010 10:14:53 +0200
>
>> So if you'll postpone applying last night's series until
>> after your next merge of net-2.6 into net-next-2.6, it
>> should then apply cleanly.
>
> That's the kind of information I'd like to see from you when you
> post patches which have such dependencies.

Understood. It's just that I had thought my "for 2.6.35" patches
had already been applied to net-next-2.6, anyway. When I got
your complaint I noticed I had been mistaken. Sorry for that.
I know how that mistake arose, and it won't happen again.

Thanks,
Tilman

--
Tilman Schmidt E-Mail: tilman(a)imap.cc
Bonn, Germany
Diese Nachricht besteht zu 100% aus wiederverwerteten Bits.
Ungeöffnet mindestens haltbar bis: (siehe Rückseite)

 | 
Pages: 1
Prev: isdn: avoid calling tty_ldisc_flush() in atomic context
Next: [PATCH] hp-wmi: add return value checking for input_allocate_device()