* Re: linux-next: Tree for Oct 25 (crypto)
From: Valdis.Kletnieks @ 2011-10-29 23:20 UTC (permalink / raw)
To: Herbert Xu
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, Linus,
linux-crypto
In-Reply-To: <20111027074544.GA19905@gondor.apana.org.au>
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
On Thu, 27 Oct 2011 09:45:44 +0200, Herbert Xu said:
> On Thu, Oct 27, 2011 at 03:05:16AM -0400, Valdis.Kletnieks@vt.edu wrote:
> > Are there any use cases where a config (probably embedded) would wantq
> > CRYPTO_USER but not CRYPTO_NET? Would seem a shame to pull in the entire
>
> Since the CRYPTO_USER interface sits on top of netlink I don't
> see how you could possibly avoid NET.
Oh, OK. The original bug report looked like just some utility functions not
defined, so I didn't pick up on the "it needs netlink" aspect of it.
[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Stephen Rothwell @ 2011-10-29 6:50 UTC (permalink / raw)
To: David Teigland; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111026204515.GA29207@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi David,
On Wed, 26 Oct 2011 16:45:15 -0400 David Teigland <teigland@redhat.com> wrote:
>
> On Thu, Oct 13, 2011 at 05:43:58PM +1100, Stephen Rothwell wrote:
> > dlm
>
> Just restored as linux-dlm (no commits for 3.2)
I am now using the "next" branch of
git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git (it
used to be .../dlm.git). But it is, as you say, empty, so I guess it the
the right thing.
--
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
* Re: HSI framework for linux-next
From: Stephen Rothwell @ 2011-10-28 18:45 UTC (permalink / raw)
To: Carlos Chinea
Cc: linux-next, linux-kernel, linux-omap@vger.kernel.org,
ext Linus Walleij, peter_henn@gmx.de,
sjur.brandeland@stericsson.com, govindraj.ti@gmail.com,
pawel.szyszuk@stericsson.com, Sebastian Reichel
In-Reply-To: <1319794066.28874.22.camel@groo>
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
Hi Carlos,
On Fri, 28 Oct 2011 12:27:46 +0300 Carlos Chinea <carlos.chinea@nokia.com> wrote:
>
> I have been working in an HSI framework for linux:
>
> https://lkml.org/lkml/2011/6/10/280
>
> The framework is in good shape and is currently being used for some
> people so we would like it to see it integrated, if possible, for 3.3
>
> Latest discussion for integration:
> https://lkml.org/lkml/2011/10/20/177
>
> Therefore, could you add the following tree to linux-next ?
I will try to remember, but if I forget, then ping me when v3.2-rc1 has
been released. I don't put future code into linux-next until after -rc1
to save false problems with the stuff that has still not been sent to
Linus.
--
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
* Re: HSI framework for linux-next
From: Shubhrajyoti @ 2011-10-28 15:17 UTC (permalink / raw)
To: artem.bityutskiy
Cc: Carlos Chinea, Stephen Rothwell, linux-next, linux-kernel,
linux-omap@vger.kernel.org, ext Linus Walleij, peter_henn@gmx.de,
sjur.brandeland@stericsson.com, govindraj.ti@gmail.com,
pawel.szyszuk@stericsson.com, Sebastian Reichel
In-Reply-To: <1319800996.31184.131.camel@sauron>
On Friday 28 October 2011 04:53 PM, Artem Bityutskiy wrote:
> On Fri, 2011-10-28 at 12:27 +0300, Carlos Chinea wrote:
>> Hi Stephen,
>>
>> I have been working in an HSI framework for linux:
>>
>> https://lkml.org/lkml/2011/6/10/280
>>
>> The framework is in good shape and is currently being used for some
>> people so we would like it to see it integrated, if possible, for 3.3
>>
>> Latest discussion for integration:
>> https://lkml.org/lkml/2011/10/20/177
> Stephen,
>
> I confirm that this is useful and solid framework, works well, and we
> are also interested to see it upstream.
>
Yes also it may help others to hook up their controller support.
> Thanks!
>
^ permalink raw reply
* Re: HSI framework for linux-next
From: Artem Bityutskiy @ 2011-10-28 11:23 UTC (permalink / raw)
To: Carlos Chinea
Cc: Stephen Rothwell, linux-next, linux-kernel,
linux-omap@vger.kernel.org, ext Linus Walleij, peter_henn@gmx.de,
sjur.brandeland@stericsson.com, govindraj.ti@gmail.com,
pawel.szyszuk@stericsson.com, Sebastian Reichel
In-Reply-To: <1319794066.28874.22.camel@groo>
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
On Fri, 2011-10-28 at 12:27 +0300, Carlos Chinea wrote:
> Hi Stephen,
>
> I have been working in an HSI framework for linux:
>
> https://lkml.org/lkml/2011/6/10/280
>
> The framework is in good shape and is currently being used for some
> people so we would like it to see it integrated, if possible, for 3.3
>
> Latest discussion for integration:
> https://lkml.org/lkml/2011/10/20/177
Stephen,
I confirm that this is useful and solid framework, works well, and we
are also interested to see it upstream.
Thanks!
--
Best Regards,
Artem Bityutskiy
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* HSI framework for linux-next
From: Carlos Chinea @ 2011-10-28 9:27 UTC (permalink / raw)
To: ext Stephen Rothwell
Cc: linux-next, linux-kernel, linux-omap@vger.kernel.org,
ext Linus Walleij, peter_henn@gmx.de,
sjur.brandeland@stericsson.com, govindraj.ti@gmail.com,
pawel.szyszuk@stericsson.com, Sebastian Reichel
Hi Stephen,
I have been working in an HSI framework for linux:
https://lkml.org/lkml/2011/6/10/280
The framework is in good shape and is currently being used for some
people so we would like it to see it integrated, if possible, for 3.3
Latest discussion for integration:
https://lkml.org/lkml/2011/10/20/177
Therefore, could you add the following tree to linux-next ?
git@gitorious.org:kernel-hsi/kernel-hsi.git for-next
Currently the framework does not have any HSI/SSI controller driver, but
myself I am working on an SSI OMAP one, which needs some changes to get
full acceptance. So hopefully I will have the changes done and acked on
time.
There are also other people preparing their controllers for integration
(see the integration discussion)
Thanks and br,
--
Carlos Chinea <carlos.chinea@nokia.com>
^ permalink raw reply
* Re: currently missing kernel devel trees
From: Guan Xuetao @ 2011-10-28 2:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
On Thu, 2011-10-13 at 17:43 +1100, Stephen Rothwell wrote:
> Hi all,
>
> unicore32
My account and repo on git.kernel.org were disabled, and I was waiting
for hpa to get back to me.
Thanks
Guan Xuetao
^ permalink raw reply
* Re: linux-next: manual merge of the libata tree with the at91 tree
From: Sergei Shtylyov @ 2011-10-27 22:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jeff Garzik, linux-next, linux-kernel, Sergei Shtylyov,
Jean-Christophe PLAGNIOL-VILLARD
In-Reply-To: <20111025083819.0940cc9ecefac0d5390a23eb@canb.auug.org.au>
Hello.
On 24.10.2011 23:38, Stephen Rothwell wrote:
> Today's linux-next merge of the libata tree got a conflict in
> drivers/ata/pata_at91.c between commit 9585cf300d98 ("ARM: at91/pata: use
> gpio_is_valid to check the gpio") from the at91 tree and commit
> 8e3bfdb95ad7 ("pata_at91: call clk_put() on ata_host_activate() failure")
> from the libata tree.
I knew about this conflict and have informed Jean-Cristophe on
LAKML. I don't know why libata driver changes went in via the at91 tree...
> I fixed it up (see below) and can carry the fix as necessary.
Thanks.
MBR, Sergei
^ permalink raw reply
* linux-next: unable to fetch the leds and backlight trees
From: Stephen Rothwell @ 2011-10-27 15:52 UTC (permalink / raw)
To: Richard Purdie; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
Hi Richard,
Fetching the leds and backlight trees produces this error (after a long
delay):
fatal: read error: Connection reset by peer
--
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
* Re: ext4 tree back to kernel.org
From: Stephen Rothwell @ 2011-10-27 15:38 UTC (permalink / raw)
To: Ted Ts'o; +Cc: linux-next, linux-kernel
In-Reply-To: <20111027140202.GD31921@thunk.org>
[-- Attachment #1: Type: text/plain, Size: 473 bytes --]
Hi Ted,
On Thu, 27 Oct 2011 10:02:02 -0400 Ted Ts'o <tytso@mit.edu> wrote:
>
> I've actually been updating both kernel.org and github for a week or
> so, this is probably a good time as any to ask that linux-next swtich
> to tracking the dev branch at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
OK, I have switched to that now.
--
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
* Re: MMC tree moved back to kernel.org
From: Stephen Rothwell @ 2011-10-27 15:17 UTC (permalink / raw)
To: Chris Ball; +Cc: linux-next, linux-mmc
In-Reply-To: <m2ty6vih11.fsf@bob.laptop.org>
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
HI Chris,
On Wed, 26 Oct 2011 17:23:22 -0400 Chris Ball <cjb@laptop.org> wrote:
>
> The mmc-next tree has returned to its original location at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git mmc-next
I have switched to that now.
--
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
* Re: Updated target-pending.git branches for linux-next
From: Stephen Rothwell @ 2011-10-27 15:09 UTC (permalink / raw)
To: Nicholas A. Bellinger; +Cc: linux-next, target-devel, Christoph Hellwig
In-Reply-To: <1319658241.421.1.camel@haakon2.linux-iscsi.org>
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
Hi Nicholas,
On Wed, 26 Oct 2011 12:44:01 -0700 "Nicholas A. Bellinger" <nab@linux-iscsi.org> wrote:
>
> Sorry, that is not what I intended to convey. What's currently in
> for-next-merge it what's slated to go in this merge window.. Apologies
> for the extra confusion.
OK, I have added target-merge as well.
--
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
* ext4 tree back to kernel.org
From: Ted Ts'o @ 2011-10-27 14:02 UTC (permalink / raw)
To: Stephen Rothwell, linux-next, linux-kernel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
I've actually been updating both kernel.org and github for a week or
so, this is probably a good time as any to ask that linux-next swtich
to tracking the dev branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
Thanks,
- Ted
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iQIcBAEBCAAGBQJOqWRaAAoJENNvdpvBGATwx+kP/2zHjAaIHsTk0pP5uBCXpuBZ
m4SZOOOMtnVXzBmk60c2CbGxIBR/EEJn5Mj/U6Q5RiutAlgdmpo/6iRxFEROOWyP
Yun6mP5tdcQ1v5C+3vYJZuDDEuJLs8gMtDCJqL1XzE8TahgIJWxn0/ewyJexmWUf
9jJk2VR516a2+aCs2CMJxRjYHO0FS/H7R1b4NP0UTroHnKl8CJqNJ0mH3om4N6Cw
ADIgPqg1erk6iJeUZFOPJPhXQT4U3+VZ4/CicMfg/kQ3UnLue4zcpHdXp0H+mg3Y
mXMV+9+n7Kyd7d8jB//bDIo7CHgq0RqoBobqca+fDR5yXY1VEMZDPMd+PX0Q9XUJ
cQxVdcuOV2YMQV/9sSg9tOTxH6y2YOSwqWl+hU+snZaGEdad/CFJkRQUBgsHmG4L
1B2HqsLhDW+Wg2EVrkctfn8wtLkrOCEFeHrHTrBV3EIEyQIgZRffZ6k/29/wUoEL
nTPNYQkYW42J+TmeJYKsWwViilerHUPDy7hWaqrBZVP6a6hmcQmK5RW0yTXZP/ke
Dt7H8lIzXYreFkEdHGr1ZwIidAswykL+r1738knRFy+tYJ70sAPt5pboT0WNJreT
TzYakK2FRy9PGply5VKLaSuoP4Hir9HvEK5LHgG+f9QKDtzs7aKM+TbRsndV7ImR
0vgW3lCpfl5jU1hKVQsR
=Imwu
-----END PGP SIGNATURE-----
^ permalink raw reply
* Re: [PATCH -next] jbd2: fix build when CONFIG_BUG is not enabled
From: Ted Ts'o @ 2011-10-27 8:06 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, LKML, linux-ext4, Andrew Morton,
Arnd Bergmann, Arnaud Lacombe
In-Reply-To: <4E9495C8.1030200@xenotime.net>
On Tue, Oct 11, 2011 at 12:15:20PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Fix build error when CONFIG_BUG is not enabled:
>
> fs/jbd2/transaction.c:1175:3: error: implicit declaration of function '__WARN'
>
> by changing __WARN() to WARN_ON(), as suggested by
> Arnaud Lacombe <lacombar@gmail.com>.
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Arnaud Lacombe <lacombar@gmail.com>
Thanks, applied.
- Ted
^ permalink raw reply
* Re: linux-next: Tree for Oct 25 (crypto)
From: Herbert Xu @ 2011-10-27 7:45 UTC (permalink / raw)
To: Valdis.Kletnieks
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, Linus,
linux-crypto
In-Reply-To: <7836.1319699116@turing-police.cc.vt.edu>
On Thu, Oct 27, 2011 at 03:05:16AM -0400, Valdis.Kletnieks@vt.edu wrote:
> On Wed, 26 Oct 2011 08:27:17 +0200, Herbert Xu said:
> > On Tue, Oct 25, 2011 at 05:42:01PM -0700, Randy Dunlap wrote:
> > > When CONFIG_NET is not enabled:
> >
> > Thanks, I'll add this patch.
>
> > diff --git a/crypto/Kconfig b/crypto/Kconfig
> > + select NET
>
> Are there any use cases where a config (probably embedded) would wantq
> CRYPTO_USER but not CRYPTO_NET? Would seem a shame to pull in the entire
Since the CRYPTO_USER interface sits on top of netlink I don't
see how you could possibly avoid NET.
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: linux-next: Tree for Oct 25 (crypto)
From: Valdis.Kletnieks @ 2011-10-27 7:05 UTC (permalink / raw)
To: Herbert Xu
Cc: Randy Dunlap, Stephen Rothwell, linux-next, LKML, Linus,
linux-crypto
In-Reply-To: <20111026062717.GA10230@gondor.apana.org.au>
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
On Wed, 26 Oct 2011 08:27:17 +0200, Herbert Xu said:
> On Tue, Oct 25, 2011 at 05:42:01PM -0700, Randy Dunlap wrote:
> > When CONFIG_NET is not enabled:
>
> Thanks, I'll add this patch.
> diff --git a/crypto/Kconfig b/crypto/Kconfig
> + select NET
Are there any use cases where a config (probably embedded) would wantq
CRYPTO_USER but not CRYPTO_NET? Would seem a shame to pull in the entire
CONFIG_NET stuff just for what appears to me to be a few utility routines (I
know there's still a few people out there fighting kernel bloat).
In any case, I suspect that sort of restructuring will be 3.3 material - this does
look like the right fix for this merge window.
[-- Attachment #2: Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply
* MMC tree moved back to kernel.org
From: Chris Ball @ 2011-10-26 21:23 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-mmc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Stephen,
The mmc-next tree has returned to its original location at:
git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git mmc-next
Thanks very much,
Chris.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBAgAGBQJOqHlBAAoJEHNBYZ7TNxYMbvUP+gOPY/bIc4cgLV2xMKuHUk9O
A/aB8TrvssBz3+m/FBlnhF9v1htOzcoqWBRzRHU0vsPSxJ82H/Ljcg2k1n/iiKAV
01wzHMhvIdpDcZoAgdThrSI1CXNmxXWpxvnPyf2/eBWfO4Pq/X/X1h6atiDbKcwi
bd2Y4JAvnhtY2FyrdoRev87gzI4BD6IamtQk9Go1jZMyleqXSiiGQQRlR48thUBO
gsdehUM6WTwYjBKSz/4WCBcEAi6GM0eaaVS4Kjy0765EVj03/RpWJfOCNt5n1XGJ
LuaWyTkyWWbZF2Y5dDffEk4vivWOXsjQmIWuyVJF/3+qRj7NTaE+aNWi+94uLIMb
9nJq/2AmICNU13CToOQuCphXEyym/ZlyVOLYtyYfP5dn8ZSBFm/O1/g+17b0JO2x
AhfHUDhN9g0A8d89RTQCDDKSlMOhaZVmv/vNMhOtaSZOnPmtJtiMjjv0Y1WSgvMG
0pt6ellNFwiM6km0B9FyrN+zC7EkTuOMNpZzav76btJAoCWgqZ3swAKXv1LPBpSy
gzsAOnpkrp6AIw6dyB44RRE7dmRBnPtS9lSd8XkkFC9BcOFEvSBd/eOb6n33OjuC
9yGfiOLptPtCzWl+2iEAdGjqEKleTWh+IgjQUTKPdDCMaGyKbnOR2azj0mLF1CCc
RjTSjReAyRsUJxHUN49R
=pwB6
-----END PGP SIGNATURE-----
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply
* Re: sound git tree back to kernel.org
From: Takashi Iwai @ 2011-10-26 21:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111027075452.ca1b28d4e98c215b7944b6fc@canb.auug.org.au>
At Thu, 27 Oct 2011 07:54:52 +1100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> On Wed, 26 Oct 2011 22:26:22 +0200 Takashi Iwai <tiwai@suse.de> wrote:
> >
> > At Thu, 27 Oct 2011 02:50:10 +1100, Stephen Rothwell wrote:
> > >
> > > I have switched to that now. I assume that the for-linus branch (my
> > > sound-current tree) also exists there?
> >
> > Oh, yes.
>
> Except that there is no for-linus branch there yet. I will wait and see
> if the mirroring catches up some time.
Sorry, I pushed for-linus branch shortly ago, too.
It's up now publicly.
Takashi
^ permalink raw reply
* Re: sound git tree back to kernel.org
From: Stephen Rothwell @ 2011-10-26 20:54 UTC (permalink / raw)
To: Takashi Iwai; +Cc: linux-next, linux-kernel
In-Reply-To: <s5hk47rqz2p.wl%tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Hi Takashi,
On Wed, 26 Oct 2011 22:26:22 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> At Thu, 27 Oct 2011 02:50:10 +1100, Stephen Rothwell wrote:
> >
> > I have switched to that now. I assume that the for-linus branch (my
> > sound-current tree) also exists there?
>
> Oh, yes.
Except that there is no for-linus branch there yet. I will wait and see
if the mirroring catches up some time.
--
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
* Re: linux-next: manual merge of the moduleh tree with the tree
From: Stephen Rothwell @ 2011-10-26 20:48 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel
In-Reply-To: <4EA86636.9010009@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
Hi Paul,
On Wed, 26 Oct 2011 15:57:42 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> I'm surprised to see this, since I'd dropped this chunk based on
> the last linux-next build you did before leaving for vacation.
> You should see this commit in the merge fix repo.
>
> ~$git ls-remote git://openlinux.windriver.com/people/paulg/modsplit-post-merge
> edaec64f302889b6f6eaf2d206782f46768d9922 HEAD
> edaec64f302889b6f6eaf2d206782f46768d9922 refs/heads/master
> ~$
>
> Maybe the server fell over again when you were trying to update?
Sorry, I know what happened ... I fetched the new origin/master, but did
not pull it into master (the checked out branch). It will be better next
time.
--
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
* Re: currently missing kernel devel trees
From: David Teigland @ 2011-10-26 20:45 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, linux-next, Linus, Andrew Morton
In-Reply-To: <20111013174358.b20fedb97c7b53db2ba82ff6@canb.auug.org.au>
On Thu, Oct 13, 2011 at 05:43:58PM +1100, Stephen Rothwell wrote:
> dlm
Just restored as linux-dlm (no commits for 3.2)
Dave
^ permalink raw reply
* Re: linux-next: Tree for Oct 25 (target)
From: Nicholas A. Bellinger @ 2011-10-26 20:42 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Randy Dunlap, linux-next, LKML, Linus, target-devel,
Paul Gortmaker
In-Reply-To: <20111027074002.8cd56b32b3f1200070abc4d9@canb.auug.org.au>
On Thu, 2011-10-27 at 07:40 +1100, Stephen Rothwell wrote:
> On Wed, 26 Oct 2011 12:53:11 -0700 "Nicholas A. Bellinger" <nab@linux-iscsi.org> wrote:
> >
> > On Wed, 2011-10-26 at 11:39 -0700, Randy Dunlap wrote:
> > > On 10/25/11 02:36, Stephen Rothwell wrote:
> > > > Hi all,
> > >
> > > target_core_cdb.c needs to include <linux/export.h>:
> > >
> > > drivers/target/target_core_cdb.c:1316:1: warning: data definition has no type or storage class [enabled by default]
> > > drivers/target/target_core_cdb.c:1316:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> > > drivers/target/target_core_cdb.c:1316:1: warning: parameter names (without types) in function declaration [enabled by default]
> > >
> > >
> >
> > This one had been addressed in target-pending.git/for-next with a
> > module.h include for target_core_cdb.c, but I'll change this now to use
> > the proper export.h.
>
> Except that export.h does not exist in Linus' tree yet. Just leave the
> module.h there and it will be changed sometime later.
>
Got it. Thank you for the heads up Stephen.
--nan
^ permalink raw reply
* Re: linux-next: Tree for Oct 25 (target)
From: Stephen Rothwell @ 2011-10-26 20:40 UTC (permalink / raw)
To: Nicholas A. Bellinger
Cc: Randy Dunlap, linux-next, LKML, Linus, target-devel,
Paul Gortmaker
In-Reply-To: <1319658791.21607.5.camel@haakon2.linux-iscsi.org>
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
On Wed, 26 Oct 2011 12:53:11 -0700 "Nicholas A. Bellinger" <nab@linux-iscsi.org> wrote:
>
> On Wed, 2011-10-26 at 11:39 -0700, Randy Dunlap wrote:
> > On 10/25/11 02:36, Stephen Rothwell wrote:
> > > Hi all,
> >
> > target_core_cdb.c needs to include <linux/export.h>:
> >
> > drivers/target/target_core_cdb.c:1316:1: warning: data definition has no type or storage class [enabled by default]
> > drivers/target/target_core_cdb.c:1316:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL' [-Wimplicit-int]
> > drivers/target/target_core_cdb.c:1316:1: warning: parameter names (without types) in function declaration [enabled by default]
> >
> >
>
> This one had been addressed in target-pending.git/for-next with a
> module.h include for target_core_cdb.c, but I'll change this now to use
> the proper export.h.
Except that export.h does not exist in Linus' tree yet. Just leave the
module.h there and it will be changed sometime later.
--
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
* Re: sound git tree back to kernel.org
From: Takashi Iwai @ 2011-10-26 20:26 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111027025010.e81919a7a95d64c256d70acb@canb.auug.org.au>
At Thu, 27 Oct 2011 02:50:10 +1100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> On Tue, 25 Oct 2011 14:25:52 +0200 Takashi Iwai <tiwai@suse.de> wrote:
> >
> > could you update the sound git tree URL as below?
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-next
> >
> > Now back to kernel.org, and "-2.6" suffix was removed.
>
> I have switched to that now. I assume that the for-linus branch (my
> sound-current tree) also exists there?
Oh, yes.
Thanks!
Takashi
^ permalink raw reply
* Re: linux-next: manual merge of the moduleh tree with the tree
From: Paul Gortmaker @ 2011-10-26 19:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20111025194519.de13df739f60f9d961425558@canb.auug.org.au>
On 11-10-25 04:45 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the moduleh tree got a conflict in
> arch/arm/plat-s5p/dev-tv.c from merge fix patch
> "arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch" from the
> moduleh tree.
>
> This file has been removed, so I dropped that hunk.
Hi Stephen,
I'm surprised to see this, since I'd dropped this chunk based on
the last linux-next build you did before leaving for vacation.
You should see this commit in the merge fix repo.
~$git ls-remote git://openlinux.windriver.com/people/paulg/modsplit-post-merge
edaec64f302889b6f6eaf2d206782f46768d9922 HEAD
edaec64f302889b6f6eaf2d206782f46768d9922 refs/heads/master
~$
Maybe the server fell over again when you were trying to update?
Thanks,
Paul.
---
commit edaec64f302889b6f6eaf2d206782f46768d9922
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu Oct 13 22:25:20 2011 -0400
drop dev-tv chunk from arm fixup patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch b/arm-Ad
index 9e1cbbb..89e71ed 100644
--- a/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch
+++ b/arm-Add-export.h-to-recently-added-files-for-EXPORT_.patch
@@ -10,18 +10,6 @@ new export.h file included that provides them.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-diff --git a/arch/arm/plat-s5p/dev-tv.c b/arch/arm/plat-s5p/dev-tv.c
-index 361a1b6..7c5fb88 100644
---- a/arch/arm/plat-s5p/dev-tv.c
-+++ b/arch/arm/plat-s5p/dev-tv.c
-@@ -11,6 +11,7 @@
- */
-
- #include <linux/dma-mapping.h>
-+#include <linux/export.h>
-
- #include <mach/irqs.h>
- #include <mach/map.h>
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c
index 6e3d9ab..93a994a 100644
--- a/arch/arm/plat-samsung/dma-ops.c
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox