headers
Stephen Rothwell | 1 Mar 2010 02:03
Picon
Picon

linux-next: build failure after merge of the blackfin tree

Hi Mike,

After merging the blackfin tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

kernel/trace/trace_syscalls.c:402: error: redefinition of 'arch_syscall_addr'
kernel/trace/trace_syscalls.c:397: note: previous definition of 'arch_syscall_addr' was here

Caused by commit d156d1881ea54ec609d92388601661c2679439bb ("ftrace: unify
arch_syscall_addr() implementations") from the blackfin tree interacting
with commit e7b8e675d9c71b868b66f62f725a948047514719 ("tracing: Unify
arch_syscall_addr() implementations") from Linus' tree.

These are slightly different versions of the same patch. but merging with the blackfin tree managed to add a
second copy of the above function.  I have applied the following patch for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

From: Stephen Rothwell <sfr <at> canb.auug.org.au>
Date: Mon, 1 Mar 2010 11:56:09 +1100
Subject: [PATCH] blackfin: fix mismerge of kernel/trace/trace_syscalls.c

Signed-off-by: Stephen Rothwell <sfr <at> canb.auug.org.au>
---
 kernel/trace/trace_syscalls.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 37ca709..cba47d7 100644
(Continue reading)

Permalink | Reply | 5 comments |
headers
Stephen Rothwell | 1 Mar 2010 03:12
Picon
Picon

linux-next: build failure after merge of the i2c tree

Hi Jean,

After merging the i2c tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/i2c/busses/i2c-powermac.c: In function 'i2c_powermac_smbus_xfer':
drivers/i2c/busses/i2c-powermac.c:125: error: 'err' undeclared (first use in this function)

Caused by commit 2fe61c97a4b1be56d93a84992ffcf00d55f60f63 ("i2c-powermac:
Be less verbose in the absence of real errors").

I have used the i2c tree from next-20100226 for today.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 2 comments |
headers
Stephen Rothwell | 1 Mar 2010 04:20
Picon
Picon

linux-next: manual merge of the net tree with Linus' tree

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/firmware/iscsi_ibft.c between commit
00e7825b943f486e80ff1305cd0594d8791870f8 ("drivers/firmware/iscsi_ibft.c:
remove NIPQUAD_FMT, use %pI4") from Linus' tree and commit
2c35294853b2e977bdfc9e401b7b6d881fcaa69b ("drivers/firmware/iscsi_ibft.c:
use %pM to show MAC address") from the net tree.

Just a trivial context change.  I fixed it up and can carry the change as
necessary.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
Permalink | Reply | 1 comment |
headers
David Miller | 1 Mar 2010 04:21
Favicon

Re: linux-next: manual merge of the net tree with Linus' tree

From: Stephen Rothwell <sfr <at> canb.auug.org.au>
Date: Mon, 1 Mar 2010 14:20:02 +1100

> Today's linux-next merge of the net tree got a conflict in
> drivers/firmware/iscsi_ibft.c between commit
> 00e7825b943f486e80ff1305cd0594d8791870f8 ("drivers/firmware/iscsi_ibft.c:
> remove NIPQUAD_FMT, use %pI4") from Linus' tree and commit
> 2c35294853b2e977bdfc9e401b7b6d881fcaa69b ("drivers/firmware/iscsi_ibft.c:
> use %pM to show MAC address") from the net tree.
> 
> Just a trivial context change.  I fixed it up and can carry the change as
> necessary.

Thanks Stephen, I'll fix this up.
Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Mar 2010 04:52
Picon
Picon

linux-next: manual merge of the mtd tree with the tree

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/sh_flctl.c between commit
010ab820582d03bcd3648416b5837107e8a9c5f3 ("mtd: sh_flctl SHBUSSEL and
SEL_16BIT support") from Linus' tree and commit
5e81e88a4c140586d9212999cea683bcd66a15c6 ("mtd: nand: Allow caller to
pass alternative ID table to nand_scan_ident()") from the mtd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au

diff --cc drivers/mtd/nand/sh_flctl.c
index 1842df8,dbc09a8..0000000
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
 <at>  <at>  <at>  -849,12 -825,7 +849,12  <at>  <at>  <at>  static int __devinit flctl_probe(struc
  	nand->select_chip = flctl_select_chip;
  	nand->cmdfunc = flctl_cmdfunc;

 +	if (pdata->flcmncr_val & SEL_16BIT) {
 +		nand->options |= NAND_BUSWIDTH_16;
 +		nand->read_word = flctl_read_word;
 +	}
 +
- 	ret = nand_scan_ident(flctl_mtd, 1);
+ 	ret = nand_scan_ident(flctl_mtd, 1, NULL);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Mar 2010 05:03
Picon
Picon

Re: linux-next: build failure after merge of the blackfin tree

Hi Frederic,

On Mon, 1 Mar 2010 02:08:52 +0100 Frederic Weisbecker <fweisbec <at> gmail.com> wrote:
>
> Oh, why is this patch in the blackfin tree?

I have no idea beyond the fact that Mike is the Blackfin maintainer.

> Looks like the right patch yeah.

Thanks.

--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 0 comments |
headers
Stephen Rothwell | 1 Mar 2010 06:04
Picon
Picon

linux-next: current pending merge fix patches

Hi Linus,

I am carrying a few merge fixup patches in linux-next that I thought you
might want a heads up about.  Hopefully, these will be fixed before you
see them, but just in case, here they are (in no particular order).

This could also be taken as a reminder to the respective maintiners that
they may want to do a merge of your tree before asking you to pull theirs.

(of course, the SHA1's may change due to rebasing :-()

1) The acpi[1] tree renames drivers/acpi/processor_core.c
to drivers/acpi/processor_driver.c (commit
5f45c35d7ede1c00cbaa3b09b8a84c425af81c4b "ACPI: processor:
mv processor_core.c processor_driver.c") and then
drivers/acpi/processor_pdc.c to drivers/acpi/processor_core.c
(commit de53479b92857f82e4d595104d112b16733b9949 "ACPI: processor:
mv processor_pdc.c processor_core.c"), so the patch in the
cpufreq[2] tree that modifies drivers/acpi/processor_core.c (commit
0f1d683fb35d6c6f49ef696c95757f3970682a0e "[CPUFREQ] Processor Clocking
Control interface driver") get rather confused.  My solution was to
use the acpi tree's version of drivers/acpi/processor_core.c and apply
this patch:

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 7e8e1ba..b5658cd 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
 <at>  <at>  -123,6 +123,8  <at>  <at>  static const struct file_operations acpi_processor_info_fops = {
 #endif
(Continue reading)

Permalink | Reply | 6 comments |
headers
Stephen Rothwell | 1 Mar 2010 06:47
Picon
Picon

linux-next: build warning after merge of the net tree

Hi Dave,

After merging the net tree, today's linux-next build (x86_64 allmodconfig)
produced this warning:

net/bluetooth/hci_sysfs.c: In function 'inquiry_cache_read':
net/bluetooth/hci_sysfs.c:441: warning: the frame size of 4208 bytes is larger than 2048 bytes

Introduced by commit ca325f698996c1a0770a67f41e7dc97a007d8bc2
("Bluetooth: Convert inquiry cache to use debugfs instead of sysfs")
which introduces a function with a 4096 char array on the stack.
--

-- 
Cheers,
Stephen Rothwell                    sfr <at> canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Permalink | Reply | 1 comment |
headers
Stephen Rothwell | 1 Mar 2010 07:25
Picon
Picon

Re: IBFT and SWIOTLB tree.

Hi Konrad,

On Wed, 24 Feb 2010 10:00:34 -0500 Konrad Rzeszutek Wilk <konrad.wilk <at> ORACLE.COM> wrote:
>
> On Wed, Feb 24, 2010 at 07:39:31PM +1100, Stephen Rothwell wrote:
> > 
> > I would need a bit a background for these trees since you are not listed
> > as a maintainer in the MAINTAINERS file.
> 
> Hmm, weird. IBFT is the patch set for the drivers/firmware/iscsi_ibft.c
> which was developed by me.

And I see you have added a MAINTAINERS entry and Linus has merged the two
patches.  I will add this tree tomorrow.  Please don't add any 2.6.35
material until after 2.6.34-rc1 is released.  2.6.34 material and fixes
are OK.

> > > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git
> 
> That one is the re-work of the SWIOTLB IOMMU code. Not a maintainer, but
> I want to make sure that the patches don't stomp/break other code.

Is this intended for 3.6.34?  I can't add that tree yet, as it has a
series of patches in it that have no Signed-off-by lines.  This material
should also get fairly wide review and I would expect to see some
Acked-by lines before the patches were ready for inclusion.

> > The master branch of both these trees is empty relative to Linus' tree ...
> 
> Let me fix that. I had the HEAD point to the right branch, but didn't
(Continue reading)

Permalink | Reply | 1 comment |
headers
David Miller | 1 Mar 2010 08:02
Favicon

Re: linux-next: build warning after merge of the net tree

From: Stephen Rothwell <sfr <at> canb.auug.org.au>
Date: Mon, 1 Mar 2010 16:47:21 +1100

> After merging the net tree, today's linux-next build (x86_64 allmodconfig)
> produced this warning:
> 
> net/bluetooth/hci_sysfs.c: In function 'inquiry_cache_read':
> net/bluetooth/hci_sysfs.c:441: warning: the frame size of 4208 bytes is larger than 2048 bytes
> 
> Introduced by commit ca325f698996c1a0770a67f41e7dc97a007d8bc2
> ("Bluetooth: Convert inquiry cache to use debugfs instead of sysfs")
> which introduces a function with a 4096 char array on the stack.

Thanks Stephen, I'll look into this.
Permalink | Reply | 0 comments |

Gmane