From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>,
QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>,
Felix Fietkau <nbd@openwrt.org>,
Rajkumar Manoharan <rmanohar@qti.qualcomm.com>,
John Stultz <john.stultz@linaro.org>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Fri, 25 Jul 2014 14:38:15 +1000 [thread overview]
Message-ID: <20140725143815.370009a8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/net/wireless/ath/ath9k/hw.c between commit 8d7e09dda821
("ath9k: save tsf in channel context") from the net-next tree and
commit 6438e0ddc870 ("wireless: ath9k: Get rid of timespec
conversions") from the tip tree.
The former changes made the latter conversions much harder, so I
effectively dropped the tip tree commit. Please discuss with the
wireless maintainer ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org,
QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"John W. Linville" <linville@tuxdriver.com>,
Felix Fietkau <nbd@openwrt.org>,
Rajkumar Manoharan <rmanohar@qti.qualcomm.com>,
John Stultz <john.stultz@linaro.org>
Subject: linux-next: manual merge of the tip tree with the net-next tree
Date: Fri, 25 Jul 2014 14:38:15 +1000 [thread overview]
Message-ID: <20140725143815.370009a8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/net/wireless/ath/ath9k/hw.c between commit 8d7e09dda821
("ath9k: save tsf in channel context") from the net-next tree and
commit 6438e0ddc870 ("wireless: ath9k: Get rid of timespec
conversions") from the tip tree.
The former changes made the latter conversions much harder, so I
effectively dropped the tip tree commit. Please discuss with the
wireless maintainer ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-25 4:38 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-25 4:38 Stephen Rothwell [this message]
2014-07-25 4:38 ` linux-next: manual merge of the tip tree with the net-next tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 2:13 Stephen Rothwell
2022-01-10 1:12 Stephen Rothwell
2019-10-18 2:31 Stephen Rothwell
2019-10-18 5:00 ` Alexei Starovoitov
2019-02-15 2:20 Stephen Rothwell
2017-11-01 7:15 Stephen Rothwell
2017-11-01 8:18 ` Peter Zijlstra
2017-11-01 8:27 ` Ingo Molnar
2017-11-01 8:55 ` Peter Zijlstra
2017-11-01 9:04 ` Ingo Molnar
2017-11-01 10:57 ` Stephen Rothwell
2017-11-01 16:27 ` Alexei Starovoitov
2017-11-05 2:12 ` Stephen Rothwell
2017-11-01 7:10 Stephen Rothwell
2017-10-30 20:55 Mark Brown
2017-11-13 6:00 ` Stephen Rothwell
2017-08-31 3:47 Stephen Rothwell
2017-09-05 0:05 ` Stephen Rothwell
2017-02-20 1:22 Stephen Rothwell
2017-02-20 9:02 ` Daniel Borkmann
2016-12-12 2:30 Stephen Rothwell
2016-12-01 3:46 Stephen Rothwell
2016-11-17 3:04 Stephen Rothwell
2015-04-07 7:11 Stephen Rothwell
2015-04-07 7:11 ` Stephen Rothwell
2015-04-07 7:32 ` Daniel Borkmann
2015-04-07 16:10 ` Alexei Starovoitov
2015-04-07 7:04 Stephen Rothwell
2015-04-07 7:04 ` Stephen Rothwell
2015-04-07 16:11 ` Alexei Starovoitov
2015-04-07 7:00 Stephen Rothwell
2015-04-07 7:00 ` Stephen Rothwell
2015-04-07 7:30 ` Daniel Borkmann
2014-05-05 4:29 Stephen Rothwell
2014-05-05 4:29 ` Stephen Rothwell
2014-01-13 3:18 Stephen Rothwell
2014-01-13 3:18 ` Stephen Rothwell
2014-01-13 3:20 ` Stephen Rothwell
2014-01-13 3:20 ` Stephen Rothwell
2014-01-14 3:02 ` Stephen Rothwell
2014-01-14 3:02 ` Stephen Rothwell
2014-01-14 4:51 ` H. Peter Anvin
2014-01-14 5:19 ` Stephen Rothwell
2014-01-14 5:19 ` David Miller
2014-01-14 5:44 ` Stephen Rothwell
2014-01-14 5:48 ` David Miller
2014-01-14 6:10 ` Stephen Rothwell
2013-11-08 4:58 Stephen Rothwell
2013-11-08 4:58 ` Stephen Rothwell
2013-04-11 4:03 Stephen Rothwell
2013-04-11 4:03 ` Stephen Rothwell
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=20140725143815.370009a8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ath9k-devel@qca.qualcomm.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mingo@elte.hu \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rmanohar@qti.qualcomm.com \
--cc=tglx@linutronix.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.