* Re: linux-next: build failure after merge of the driver-core tree
From: Greg KH @ 2012-04-19 20:07 UTC (permalink / raw)
To: Stephen Rothwell, Hannes Reinecke; +Cc: linux-next, linux-kernel
In-Reply-To: <20120419144815.50f7c3d30d88e6259665313d@canb.auug.org.au>
On Thu, Apr 19, 2012 at 02:48:15PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> After merging the driver-core tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> lib/klist.c: In function 'klist_iter_init_node':
> lib/klist.c:287:4: error: too few arguments to function 'kref_put'
> include/linux/kref.h:92:19: note: declared here
>
> Caused by commit a15d49fd3094 ("driver core: check start node in
> klist_iter_init_node"). That really hasn't been build tested, has it?
>
> I have used the driver-core tree from next-20120418 for today.
Ick. Hannes, care to send me a fix for this?
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the tty tree with the tty.current tree
From: Greg KH @ 2012-04-19 20:07 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Tomoya MORINAGA
In-Reply-To: <20120419145951.4e1652ae5b1b80686892495d@canb.auug.org.au>
On Thu, Apr 19, 2012 at 02:59:51PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/pch_uart.c between commit af6d17cdc8c8 ("pch_uart: Fix
> dma channel unallocated issue") from the tty.current tree and commit
> 44db113212d8 ("pch_uart: Delete unused structure member") from the tty
> tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks correct, thanks.
greg k-h
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with the usb.current tree
From: Greg KH @ 2012-04-19 20:07 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Anatolij Gustschin, Ramneek Mehresh
In-Reply-To: <20120419151402.6f958fabc6bd96696b4cde3c@canb.auug.org.au>
On Thu, Apr 19, 2012 at 03:14:02PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl:
> Fix kernel crash on mpc5121e") from the usb.current tree and commit
> 58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy
> support") from the usb tree.
>
> I fixed it up (using the pdata assignment from the latter commit) and
> can carry the fix as necessary.
Thanks, that sounds correct, I'll fix this up when the patches in
usb.current get pushed to Linus.
greg k-h
^ permalink raw reply
* Re: [PATCH] cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
From: Paul Gortmaker @ 2012-04-19 12:40 UTC (permalink / raw)
To: Jesper Nilsson
Cc: Mikael Starvik, linux-cris-kernel, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <20120419091450.GF16861@axis.com>
On 12-04-19 05:14 AM, Jesper Nilsson wrote:
> On Wed, Apr 18, 2012 at 09:58:43PM +0200, Paul Gortmaker wrote:
>> Most of these have been purged years ago. This one silently lived
>> on until commit 69349c2dc01c489eccaa4c472542c08e370c6d7e
>>
>> "kconfig: fix IS_ENABLED to not require all options to be defined"
>>
>> In the above, we use some macro trickery to create a conditional that
>> is valid in CPP and in C usage. However that trickery doesn't sit
>> well if you have the legacy "-traditional" flag enabled. You'll get:
>>
>> AS arch/cris/arch-v10/lib/checksum.o
>> In file included from <command-line>:4:0:
>> include/linux/kconfig.h:23:0: error: syntax error in macro parameter list
>> make[2]: *** [arch/cris/arch-v10/lib/checksum.o] Error 1
>>
>> Everything builds fine w/o "-traditional" so simply drop it from this
>> location as well.
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>
> Agreed, I'll push this to the CRIS-tree. Thanks!
Thanks, Please make sure it goes on your "for-3.4" branch,
since Linus took the kconfig change directly into 3.4 (i.e. it
is not specific to linux-next).
Paul.
>
> /^JN - Jesper Nilsson
^ permalink raw reply
* Re: linux-next: commit "GFS2: Clean up log write code path" breakage
From: Steven Whitehouse @ 2012-04-19 10:12 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, cluster-devel
In-Reply-To: <CAP=VYLoD6yLQkLO0Q=wGQ5yag9e9qw-5iwHLGgcck60Efy5-Vg@mail.gmail.com>
Hi,
On Wed, 2012-04-18 at 21:26 -0400, Paul Gortmaker wrote:
> Hi Steven,
>
> When you have a chance can you look at this? Git bisect says that
> this commit:
>
> ----------
> commit e80623efc450fb615d1496774c8d5c063a50fb3a
> Author: Steven Whitehouse <swhiteho@redhat.com>
> Date: Mon Apr 16 09:28:31 2012 +0100
>
> GFS2: Clean up log write code path
> ----------
>
This should do the trick... I've rolled in a couple of other small fixes
that I had pending too. I guess probably page_address() was a macro on
the problematic arches which is why they hit it, but x86_64 did not.
I've pushed the patch to my -nmw git tree, so that it should appear in
the next -next. Thanks for the bug report,
Steve.
>From 3c1d908182c084972276b1196fb0ef6f1c419c68 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 19 Apr 2012 10:38:50 +0100
Subject: [PATCH] GFS2: Log code fixes
This patch removes a log lock from around atomic operation where
it is not needed, removes an unused variable, and also changes
a void pointer used incorrectly to a struct page pointer.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 2307218..db9cb18 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -643,10 +643,8 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
if (sdp->sd_log_head != sdp->sd_log_flush_head) {
log_write_header(sdp, 0);
} else if (sdp->sd_log_tail != current_tail(sdp) && !sdp->sd_log_idle){
- gfs2_log_lock(sdp);
atomic_dec(&sdp->sd_log_blks_free); /* Adjust for unreserved buffer */
trace_gfs2_log_blocks(sdp, -1);
- gfs2_log_unlock(sdp);
log_write_header(sdp, 0);
}
lops_after_commit(sdp, ai);
@@ -797,11 +795,9 @@ int gfs2_logd(void *data)
struct gfs2_sbd *sdp = data;
unsigned long t = 1;
DEFINE_WAIT(wait);
- unsigned preflush;
while (!kthread_should_stop()) {
- preflush = atomic_read(&sdp->sd_log_pinned);
if (gfs2_jrnl_flush_reqd(sdp) || t == 0) {
gfs2_ail1_empty(sdp);
gfs2_log_flush(sdp, NULL);
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index e9709da..11fedb5 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -375,7 +375,7 @@ void gfs2_log_write_page(struct gfs2_sbd *sdp, struct page *page)
static struct page *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type,
u32 ld_length, u32 ld_data1)
{
- void *page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
+ struct page *page = mempool_alloc(gfs2_page_pool, GFP_NOIO);
struct gfs2_log_descriptor *ld = page_address(page);
clear_page(ld);
ld->ld_header.mh_magic = cpu_to_be32(GFS2_MAGIC);
--
1.7.4
^ permalink raw reply related
* Re: linux-next: commit "GFS2: Clean up log write code path" breakage
From: Steven Whitehouse @ 2012-04-19 9:34 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, cluster-devel
In-Reply-To: <CAP=VYLoD6yLQkLO0Q=wGQ5yag9e9qw-5iwHLGgcck60Efy5-Vg@mail.gmail.com>
Hi,
On Wed, 2012-04-18 at 21:26 -0400, Paul Gortmaker wrote:
> Hi Steven,
>
> When you have a chance can you look at this? Git bisect says that
> this commit:
>
Yes, I can see what that is... the most amazing thing is that it ever
worked in the first place. I'm cooking up a patch to fix it which should
be ready very shortly,
Steve.
> ----------
> commit e80623efc450fb615d1496774c8d5c063a50fb3a
> Author: Steven Whitehouse <swhiteho@redhat.com>
> Date: Mon Apr 16 09:28:31 2012 +0100
>
> GFS2: Clean up log write code path
> ----------
>
> has caused the failure seen in several allmodconfigs (sparc, m68k).
>
> fs/gfs2/lops.c:379:42: error: request for member 'virtual' in
> something not a structure or union
> make[3]: *** [fs/gfs2/lops.o] Error 1
>
> Here are some examples:
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/6131431/
> http://kisskb.ellerman.id.au/kisskb/buildresult/6131694/
> http://kisskb.ellerman.id.au/kisskb/buildresult/6131511/
>
> Thanks,
> Paul.
^ permalink raw reply
* Re: [PATCH] cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
From: Jesper Nilsson @ 2012-04-19 9:14 UTC (permalink / raw)
To: Paul Gortmaker
Cc: Mikael Starvik, linux-cris-kernel, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org
In-Reply-To: <1334779123-21957-1-git-send-email-paul.gortmaker@windriver.com>
On Wed, Apr 18, 2012 at 09:58:43PM +0200, Paul Gortmaker wrote:
> Most of these have been purged years ago. This one silently lived
> on until commit 69349c2dc01c489eccaa4c472542c08e370c6d7e
>
> "kconfig: fix IS_ENABLED to not require all options to be defined"
>
> In the above, we use some macro trickery to create a conditional that
> is valid in CPP and in C usage. However that trickery doesn't sit
> well if you have the legacy "-traditional" flag enabled. You'll get:
>
> AS arch/cris/arch-v10/lib/checksum.o
> In file included from <command-line>:4:0:
> include/linux/kconfig.h:23:0: error: syntax error in macro parameter list
> make[2]: *** [arch/cris/arch-v10/lib/checksum.o] Error 1
>
> Everything builds fine w/o "-traditional" so simply drop it from this
> location as well.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Agreed, I'll push this to the CRIS-tree. Thanks!
/^JN - Jesper Nilsson
--
Jesper Nilsson -- jesper.nilsson@axis.com
^ permalink raw reply
* linux-next: Tree for Apr 19
From: Stephen Rothwell @ 2012-04-19 6:46 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 29870 bytes --]
Hi all,
Changes since 20120418:
New tree: kvm-ppc
Linus' tree gained a build failure for which I applied a patch.
The devicetree-current tree still had its build failure so I used the
version from next-20120410.
The v4l-dvb tree still had its build failure so I used the version from
next-20120410.
The net-next tree gained a build failure for which I applied a patch.
The wireless-next tree lost its conflicts.
The md tree gained a build failure so I used the version from
next-20120418.
The trivial tree gained a conflict against the sound-asoc tree.
The kvm-ppc tree gained a build failure for which I reverted a commit.
The driver-core tree gained a build failure so I used the version from
next-20120418.
The tty tree gained a conflict against the tty.current tree.
The usb tree gained a conflict against the usb.current tree.
The vhost tree gained a conflict against the net-next tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 189 trees (counting Linus' and 27 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (b6a8958 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Applying: security: commoncaps.c needs to include personality.h
Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17)
Merging arm-current/fixes (708e5978 ARM: 7386/1: jump_label: fixup for rename to static_key)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (fae2e0f powerpc: Fix typo in runlatch code)
Merging sparc/master (7d93101 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (22b4a4f tcp: fix retransmit of partially acked frames)
Merging sound-current/for-linus (f2ec52d ALSA: fix core/vmaster.c kernel-doc warning)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (fd09c85 ath9k: Fix TX fragmentation)
Merging driver-core.current/driver-core-linus (e816b57 Linux 3.4-rc3)
Merging tty.current/tty-linus (af6d17c pch_uart: Fix dma channel unallocated issue)
Merging usb.current/usb-linus (8034761 USB: ehci-tegra: don't call set_irq_flags(IRQF_VALID))
Merging staging.current/staging-linus (e816b57 Linux 3.4-rc3)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (0e3d0f3 Input: da9052 - fix memory leak in da9052_onkey_probe())
Merging md-current/for-linus (afbaa90 md/bitmap: prevent bitmap_daemon_work running while initialising bitmap)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds)
$ git reset --hard HEAD^
Merging refs/next/20120410/devicetree-current
Merging spi-current/spi/merge (39ec0d3 spi/imx: prevent NULL pointer dereference in spi_imx_probe())
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (708e5978 ARM: 7386/1: jump_label: fixup for rename to static_key)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
Merging s5p/for-next (9ab15ea ARM: EXYNOS: add dts files to dtbs target)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (9c75fc8 CRIS: Remove legacy RTC drivers)
Merging hexagon/linux-next (4323328 hexagon: add missing cpu.h include)
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (03c63c1 m68k/mm: Port OOM changes to do_page_fault())
Merging m68knommu/for-next (b97c0bb m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (09f61ff powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (affbb42 [S390] Fix compile error in swab.h)
Merging sh/sh-latest (9d773d3 Merge branch 'sh/kgdb' into sh-latest)
Merging sparc-next/master (df2e7f5 sparc32: fix build of pcic)
Merging tile/master (a46bf6d arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (cd9d9f5 rbd: don't hold spinlock during messenger flush)
Merging cifs/master (592fe89 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling)
Merging ext4/dev (57f73c2 ext4: fix handling of journalled quota options)
Merging fuse/for-next (c628ee6 fuse: use flexible array in fuse.h)
Merging gfs2/master (e2a62b2 GFS2: Remove unused argument from gfs2_internal_read)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f3efde6 NFSv4: Fix open(O_TRUNC) and ftruncate() error handling)
Merging nfsd/nfsd-next (f69adb2 nfsd: allocate id-to-name and name-to-id caches in per-net operations.)
Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (297fe33 UBIFS: remove douple initialization in change_category())
Merging xfs/for-next (8a00ebe xfs: Ensure inode reclaim can run during quotacheck)
Merging vfs/for-next (94c6424 fs: fix inode.c kernel-doc warnings)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (cb5464b Merge branch 'upstream' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
Merging i2c-embedded/i2c-embedded/for-next (8b230a8 Merge branch 'i2c-embedded/next-updates' into i2c-embedded/for-next)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (032c4871 acpi_power_meter: clean up code around setup_attrs)
Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream)
$ git reset --hard HEAD^
Merging refs/next/20120410/v4l-dvb
Merging kbuild/for-next (63ce2ed Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
Merging libata/NEXT (85d6725 libata: make ata_print_id atomic)
Merging infiniband/for-next (c72adfd be2net: Add functionality to support RoCE driver)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (8527f8e firewire: core: fw_device_refresh(): clean up error handling)
Merging ubi/linux-next (0034102 Linux 3.4-rc2)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
Merging target-updates/for-next (bfb79ea target/iscsi: Go back to core allocating data buffer for cmd)
Merging target-merge/for-next-merge (3e6e9e9 sbp-target: Initial merge of firewire/ieee-1394 target mode support)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (475448a merge: libsas devel rnc-devel fixes)
CONFLICT (content): Merge conflict in drivers/ata/libata-scsi.c
Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (59e26ef atl1c: restore max-read-request-size in Device Conrol Register)
Merging wireless-next/master (b5abcf0 mwifiex: corrections in timestamp related code)
Merging bluetooth/master (5dad9df Bluetooth: btusb: Dynamic alternate setting)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (4ac50fc mtd: docg3 fix in-middle of blocks reads)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (b5201df Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (28b349f Merge branch 'for-3.4' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (b5e9528 Input: ep93xx_keypad - switch to using dev_pm_ops)
Merging input-mt/for-next (0034102 Linux 3.4-rc2)
Merging cgroup/for-next (86f82d5 cgroup: remove cgroup_subsys->populate())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
Merging quilt/device-mapper (025716f Fix a memory leak inadvertently introduced during simplification of cell_release_singleton() in commit 6f94a4c45a6f744383f9f695dde019998db3df55 ("dm thin: fix stacked bi_next usage").)
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
Merging mmc/mmc-next (43cee57 mmc: tegra: support SDHCI SPEC 300)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (ee867a0 raid5: add AVX optimized RAID5 checksumming)
$ git reset --hard HEAD^
Merging refs/next/20120418/md
Merging mfd/for-next (5499f69 mfd: Add support for tps65910 device sleep)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (351fa3a vga-switcheroo: select VGA arbitration.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (42c1b14 Merge branches 'regulator-linus' and 'regulator-drivers' into regulator-next)
Merging security/next (8156b45 seccomp: fix build warnings when there is no CONFIG_SECCOMP_FILTER)
CONFLICT (content): Merge conflict in include/linux/filter.h
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (0034102 Linux 3.4-rc2)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (59bf896 Fix "the the" in various Kconfig)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
$ git rm -f sound/soc/imx/Kconfig
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (e816b57 Linux 3.4-rc3)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (d57a428 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (2adb096 Merge branch 'linus')
Merging rcu/rcu/next (2127c49 Merge branches 'fixes.2012.04.18a' and 'inline.2012.04.18a' of ../linux-2.6-tip into HEAD)
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
Merging kvm-ppc/kvm-ppc-next (84b5f3f KVM: Use minimum and maximum address mapped by TLB1)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (4fb62b4 Merge branch 'stable/for-linus-3.5' into linux-next)
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (f5b2552 workqueue: change BUG_ON() to WARN_ON())
Merging drivers-x86/linux-next (e64c9de dell-laptop: Terminate quirks list properly)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (b076764 Merge branch 'regmap-stride' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (a15d49f driver core: check start node in klist_iter_init_node)
$ git reset --hard HEAD^
Merging refs/next/20120418/driver-core
Merging tty/tty-next (5f1a389 serial/8250_pci: fix suspend/resume vs init/exit quirks)
CONFLICT (content): Merge conflict in drivers/tty/serial/pch_uart.c
Merging usb/usb-next (15c9d50 USB: ehci: ohci: Add clk_{un}prepare() support)
CONFLICT (content): Merge conflict in drivers/usb/host/ehci-fsl.c
Merging staging/staging-next (b0d5c79 drivers: staging: rtl8172: Remove unneeded include of version.h)
Merging char-misc/char-misc-next (b4161f0 Support M95040 SPI EEPROM)
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
Merging pinctrl/for-next (dcb5dbc pinctrl: show pin name for pingroups in sysfs)
Merging tegra/for-next (cdc6419 Merge branch 'for-3.5/defconfig' into for-next)
Merging moduleh/for-sfr (c3baa60 pci: frv architecture needs generic setup-bus infrastructure)
Merging vhost/linux-next (33b3aa0 x86: eoi micro-optimization)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (0ba4514 Merge branch 'next/dt' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-generic.c
Merging kvmtool/master (0333eec kvm tools: Update README for CONFIG_FB_VESA)
Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2)
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: umem: fix up unplugging
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: MIPS: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: remove reclaim_mode_t
Applying: mm: remove swap token code
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: simple_strtoul() cleanup
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: HPFS: remove PRINTK() macro
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod: avoid deadlock from recursive kmod call
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: use IS_ERR_OR_NULL()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: ipc: message queue receive cleanup
Applying: c/r: ipc: message queue stealing feature introduced
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (766c1ed notify_change(): check that i_mutex is held)
Applying: net: using kmemleak_not_leak requires including kmemleak.h
[master a81f493] Revert "watchdog: add check for suspended vm in softlockup detector"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: David Miller @ 2012-04-19 6:40 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, majianpeng
In-Reply-To: <20120419162859.904574e2518c5a904802efbc@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Apr 2012 16:28:59 +1000
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
>
> net/ipv4/route.c: In function 'ip_static_sysctl_init':
> net/ipv4/route.c:3517:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
...
> net/core/sysctl_net_core.c: In function 'sysctl_core_init':
> net/core/sysctl_net_core.c:259:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
...
I already checked in a fix for this, thanks Stephen.
^ permalink raw reply
* linux-next: build failure after merge of the final tree (kvm-ppc tree related)
From: Stephen Rothwell @ 2012-04-19 6:35 UTC (permalink / raw)
To: Alexander Graf
Cc: linux-next, linux-kernel, Eric B Munson, Marcelo Tosatti,
Avi Kivity
[-- Attachment #1: Type: text/plain, Size: 619 bytes --]
Hi all,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
In file included from kernel/watchdog.c:27:0:
include/linux/kvm_para.h: In function 'kvm_para_has_feature':
include/linux/kvm_para.h:32:2: error: implicit declaration of function 'kvm_arch_para_features' [-Werror=implicit-function-declaration]
Caused by commit 5d1c0f4a80a6 ("watchdog: add check for suspended vm in
softlockup detector"). This build has no KVM related CONFIG options set.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (net-next tree related)
From: Stephen Rothwell @ 2012-04-19 6:28 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, majianpeng
[-- Attachment #1: Type: text/plain, Size: 2243 bytes --]
Hi all,
After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:
net/ipv4/route.c: In function 'ip_static_sysctl_init':
net/ipv4/route.c:3517:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
Caused by commit 7f5938810890 ("net/ipv4:Remove two memleak reports by
kmemleak_not_leak").
net/core/sysctl_net_core.c: In function 'sysctl_core_init':
net/core/sysctl_net_core.c:259:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
Caused by commit 798ec84d4575 ("net/core:Remove memleak reports by
kmemleak_not_leak").
I added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Apr 2012 16:25:16 +1000
Subject: [PATCH] net: using kmemleak_not_leak requires including kmemleak.h
fixes these build errors:
net/ipv4/route.c: In function 'ip_static_sysctl_init':
net/ipv4/route.c:3517:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
net/core/sysctl_net_core.c: In function 'sysctl_core_init':
net/core/sysctl_net_core.c:259:2: error: implicit declaration of function 'kmemleak_not_leak' [-Werror=implicit-function-declaration]
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/core/sysctl_net_core.c | 1 +
net/ipv4/route.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index cee5991..247c69b 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -14,6 +14,7 @@
#include <linux/vmalloc.h>
#include <linux/init.h>
#include <linux/slab.h>
+#include <linux/kmemleak.h>
#include <net/ip.h>
#include <net/sock.h>
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index bcd4744..dcb4205 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -93,6 +93,7 @@
#include <linux/times.h>
#include <linux/slab.h>
#include <linux/prefetch.h>
+#include <linux/kmemleak.h>
#include <net/dst.h>
#include <net/net_namespace.h>
#include <net/protocol.h>
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: manual merge of the vhost tree with the net-next tree
From: Michael S. Tsirkin @ 2012-04-19 5:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Jason Wang, David Miller, netdev
In-Reply-To: <20120419153547.c9e4cf4865b28c61668a2be1@canb.auug.org.au>
On Thu, Apr 19, 2012 at 03:35:47PM +1000, Stephen Rothwell wrote:
> Hi Michael,
>
> Today's linux-next merge of the vhost tree got a conflict in
> drivers/net/virtio_net.c between commit 586d17c5a01b ("virtio-net: send
> gratuitous packets when needed") from the net-next tree and commit
> 66fdfb7bc203 ("virtio-net: remove useless disable on freeze") from the
> vhost tree.
>
> Just context changes. I fixed it up (I think - see below) and can carry
> the fix as necessary.
The fix looks right, thanks a lot.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/net/virtio_net.c
> index fa58c78,3e4767f..0000000
> --- a/drivers/net/virtio_net.c
> +++ b/drivers/net/virtio_net.c
> @@@ -1224,16 -1183,6 +1224,11 @@@ static int virtnet_freeze(struct virtio
> {
> struct virtnet_info *vi = vdev->priv;
>
> + /* Prevent config work handler from accessing the device */
> + mutex_lock(&vi->config_lock);
> + vi->config_enable = false;
> + mutex_unlock(&vi->config_lock);
> +
> - virtqueue_disable_cb(vi->rvq);
> - virtqueue_disable_cb(vi->svq);
> - if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
> - virtqueue_disable_cb(vi->cvq);
> -
> netif_device_detach(vi->dev);
> cancel_delayed_work_sync(&vi->refill);
>
^ permalink raw reply
* linux-next: manual merge of the vhost tree with the net-next tree
From: Stephen Rothwell @ 2012-04-19 5:35 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: linux-next, linux-kernel, Jason Wang, David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in
drivers/net/virtio_net.c between commit 586d17c5a01b ("virtio-net: send
gratuitous packets when needed") from the net-next tree and commit
66fdfb7bc203 ("virtio-net: remove useless disable on freeze") from the
vhost tree.
Just context changes. I fixed it up (I think - see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/virtio_net.c
index fa58c78,3e4767f..0000000
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -1224,16 -1183,6 +1224,11 @@@ static int virtnet_freeze(struct virtio
{
struct virtnet_info *vi = vdev->priv;
+ /* Prevent config work handler from accessing the device */
+ mutex_lock(&vi->config_lock);
+ vi->config_enable = false;
+ mutex_unlock(&vi->config_lock);
+
- virtqueue_disable_cb(vi->rvq);
- virtqueue_disable_cb(vi->svq);
- if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
- virtqueue_disable_cb(vi->cvq);
-
netif_device_detach(vi->dev);
cancel_delayed_work_sync(&vi->refill);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the usb tree with the usb.current tree
From: Stephen Rothwell @ 2012-04-19 5:14 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Anatolij Gustschin, Ramneek Mehresh
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl:
Fix kernel crash on mpc5121e") from the usb.current tree and commit
58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy
support") from the usb tree.
I fixed it up (using the pdata assignment from the latter commit) and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the tty tree with the tty.current tree
From: Stephen Rothwell @ 2012-04-19 4:59 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Tomoya MORINAGA
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/pch_uart.c between commit af6d17cdc8c8 ("pch_uart: Fix
dma channel unallocated issue") from the tty.current tree and commit
44db113212d8 ("pch_uart: Delete unused structure member") from the tty
tree.
Just context changes. 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/pch_uart.c
index c2816f4,a5e6343..0000000
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -1447,11 -1455,8 +1455,10 @@@ static int pch_uart_verify_port(struct
__func__);
return -EOPNOTSUPP;
#endif
- priv->use_dma_flag = 1;
- priv->use_dma = 1;
dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
+ if (!priv->use_dma)
+ pch_request_dma(port);
+ priv->use_dma = 1;
}
return 0;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the driver-core tree
From: Stephen Rothwell @ 2012-04-19 4:48 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Hannes Reinecke
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
Hi Greg,
After merging the driver-core tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
lib/klist.c: In function 'klist_iter_init_node':
lib/klist.c:287:4: error: too few arguments to function 'kref_put'
include/linux/kref.h:92:19: note: declared here
Caused by commit a15d49fd3094 ("driver core: check start node in
klist_iter_init_node"). That really hasn't been build tested, has it?
I have used the driver-core tree from next-20120418 for today.
--
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
* linux-next: manual merge of the trivial tree with the sound-asoc tree
From: Stephen Rothwell @ 2012-04-19 3:58 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Shawn Guo, Mark Brown, Liam Girdwood,
Masanari Iida
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
sound/soc/imx/Kconfig between commit a23dc694828e ("ASoC: imx: merge
sound/soc/imx into sound/soc/fsl") from the sound-asoc tree and commit
59bf89640647 ("Fix "the the" in various Kconfig") from the trivial tree.
The former merged the file into sound/soc/fsl/Kconfig (where the "the
the" now needs fixing). I have just removed sound/soc/imx/Kconfig.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] samples/seccomp: fix dependencies on arch macros
From: James Morris @ 2012-04-19 3:44 UTC (permalink / raw)
To: Will Drewry
Cc: james, paul.gortmaker, eparis, linux-next, linux-kernel, keescook,
linux-security-module
In-Reply-To: <1334796625-26830-1-git-send-email-wad@chromium.org>
On Wed, 18 Apr 2012, Will Drewry wrote:
> This change fixes the compilation error triggered here for
> i386 allmodconfig in linux-next:
> http://kisskb.ellerman.id.au/kisskb/buildresult/6123842/
>
> Logic attempting to predict the host architecture has been
> removed from the Makefile. Instead, the bpf-direct sample
> should now compile on any architecture, but if the architecture
> is not supported, it will compile a minimal main() function.
>
> This change also ensures the samples are not compiled when
> there is no seccomp filter support.
>
> (Note, I wasn't able to reproduce the error locally, but
> the existing approach was clearly flawed. This tweak
> should resolve your issue and avoid other future weirdness.)
>
> Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> Suggested-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Will Drewry <wad@chromium.org>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next
--
James Morris
<jmorris@namei.org>
^ permalink raw reply
* Re: linux-next: build failure after merge of the md tree
From: NeilBrown @ 2012-04-19 3:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120419125502.bd9b7dcbe9497c8319035793@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
On Thu, 19 Apr 2012 12:55:02 +1000 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Neil,
>
> After merging the md tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> ERROR: ".bitmap_resize" [drivers/md/raid456.ko] undefined!
> ERROR: ".bitmap_resize" [drivers/md/raid10.ko] undefined!
>
> Caused by commit 89efe2ab3a8c ("md/bitmap: add bitmap_resize function to
> allow bitmap resizing") and followups.
>
> I have used the md tree form next-20120418 for today.
Thanks a lot Stephen.
I've add the missing EXPORT_SYMBOL_GPL(), so should be fine for next time
round.
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the md tree
From: Stephen Rothwell @ 2012-04-19 2:55 UTC (permalink / raw)
To: Neil Brown; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
Hi Neil,
After merging the md tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
ERROR: ".bitmap_resize" [drivers/md/raid456.ko] undefined!
ERROR: ".bitmap_resize" [drivers/md/raid10.ko] undefined!
Caused by commit 89efe2ab3a8c ("md/bitmap: add bitmap_resize function to
allow bitmap resizing") and followups.
I have used the md tree form next-20120418 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* New ARM build coverage (was: linux-next: triage for April 18, 2012)
From: Paul Gortmaker @ 2012-04-19 2:13 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-next
ARM folks,
Just a heads up that Stephen expanded the linux-next ARM coverage
today to add a whole bunch more builds.
Possibly "new" build fails were detected in these configs:
ARM:mackerel_defconfig,ag5evm_defconfig
ARM:ezx_defconfig
ARM:mini2440_defconfig
ARM:spear6xx_defconfig
More details below in the triage report.
If you happen to know anything about these, or care to have a poke
at posting a fix for one, by all means have at it.
Thanks,
Paul.
---------- Forwarded message ----------
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Wed, Apr 18, 2012 at 10:01 PM
Subject: linux-next: triage for April 18, 2012
To: linux-next@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
A handful of "new" (most likely pre-existing?) ARM failures from the
50-odd ARM builds Stephen added. (some are kallsyms fails & ignored).
They are all tagged with the date "Apr 19 (possibly earlier?)" below.
[ http://marc.info/?l=linux-next&m=133472511300783&w=2 ]
Lots of "undefined reference to `vga_default_device'" stuff hitting
several arch (arm/m68k,...) [ https://lkml.org/lkml/2012/4/18/157 ]
The samples/seccomp/bpf-direct.c stuff still breaks most allyes/allmod
configs. Hopefully the fix for that is in the next treegen?
[ http://marc.info/?l=linux-next&m=133479674429442&w=2 ]
The gfs2 has issues, being broken on sparc and m68k. Now bisected.
[ http://marc.info/?l=linux-next&m=133479890929994&w=2 ]
MIPS got a build failure in iwlwifi/iwl-core.h
[ http://kisskb.ellerman.id.au/kisskb/buildresult/6131791/ ]
All the rcu rcu_read_lock_nesting fallout is fixed
I've pushed some cris, frv and xtensa fixes into my linux-next feed,
so we'll see how that goes in several hours...
---------------------
New breakage since last report:
all:all vga fallout -- too many to list below, so here are some examples.
sh7785lcr_32bit_defconfig, tilegx_defconfig, x86_64-randconfig
m68k-allmodconfig, mips-p27_defconfig, orion5x_defconfig ...
http://kisskb.ellerman.id.au/kisskb/buildresult/6131974/
http://kisskb.ellerman.id.au/kisskb/buildresult/6127336/
http://kisskb.ellerman.id.au/kisskb/buildresult/6131666/
http://kisskb.ellerman.id.au/kisskb/buildresult/6131694/
http://kisskb.ellerman.id.au/kisskb/buildresult/6127233/
http://kisskb.ellerman.id.au/kisskb/buildresult/6126942/
arm:various -- may not be new; many ARM builds just added
mips:ip27_defconfig iwl-core.h: static decl of 'iwl_alloc_traffic_mem'
follows non-static decl
Randconfig fails that may or may not be new (by their very nature):
powerpc: mpc52xx_pci.c: format '%x' expects 'unsigned int', but
arg2 has type 'resource_size_t'
http://kisskb.ellerman.id.au/kisskb/buildresult/6131745/
powerpc: leds-renesas-tpu.c: undefined ref to `led_classdev_register'
http://kisskb.ellerman.id.au/kisskb/buildresult/6127187/
Builds that are fixed since last report:
all:all "rcu_read_lock_nesting undefined"
----------------------
Note1: The randconfig fails are only listed once and not tracked
in the below listing.
Note2: Build fails that are perpetual and/or unlikely to ever
get fixed are not tracked here.
Note3: Issues that Stephen finds and reverts/avoids before kicking
off the all-arch/all-config builds are also not tracked here.
Note4: I'm also not tracking the kallsyms extra pass on ARM on
a per board basis anymore. It has nothing to do with the board.
Why? See: http://marc.info/?l=linux-next&m=133267456809502
----------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of April 18th, 2012:
===============================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:mackerel_defconfig,ag5evm_defconfig
when: Apr 19 (possibly earlier?)
why: pfc-sh7372.c: undefined reference to `mmc_detect_change'
why: pfc-sh73a0.c: undefined reference to `mmc_detect_change'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131930/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131908/
ARM:bcmring_defconfig
when: Apr 19 (possibly earlier?)
why: core.c: macro "AMBA_APB_DEVICE" requires 6 args, but only 5 given
status: fixed, pending feed into linux next.
fix:
ref: http://www.spinics.net/lists/arm-kernel/msg169724.html
ARM:ezx_defconfig
when: Apr 19 (possibly earlier?)
why: ezx-pcap.c: implicit declaration of function 'irq_to_gpio'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131924/
ARM:mini2440_defconfig
when: Apr 19 (possibly earlier?)
why: arm-unknown-linux-gnueabi-ld: no machine record defined
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131932/
ARM:spear6xx_defconfig
when: Apr 19 (possibly earlier?)
why: asm/timex.h: fatal error: mach/timex.h: No such file
status:
fix:
ref:
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
----------------
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to
`atmel_default_console_device'
status:
fix:
ref:
---------------
bfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from
kernel/time/timekeeping.c
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
---------------
cris:various_defconfigs
when: Apr 16
why: AS arch/cris/arch-v10/lib/checksumcopy.o
why: In file included from <command-line>:4:0:
why: include/linux/kconfig.h:23:0: error: syntax error in
macro parameter list
why: [macro magic for config_enabled]
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6123623/
ref: commit 69349c2dc01c489eccaa4c472542c08e370c6d7e
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
frv:defconfig
when: Mar 15
why: undefined reference to `pci_cardbus_resource_alignment'
status: PaulG submitted a fix
fix: http://marc.info/?l=linux-pci&m=133478439025369&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6030067/
----------------
i386:allmodconfig
when: Apr 17
why: samples/seccomp/bpf-direct.c:47:2: error: #error
Unsupported platform
status: reported
fix:
ref: http://marc.info/?l=linux-kernel&m=133471624530782&w=2
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
mips:ip27_defconfig
when: Apr 18
why: iwlwifi/iwl-core.h: static decl of 'iwl_alloc_traffic_mem'
follows non-static
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131791/
mips:allmodconfig
when: Apr 17
why: sound/oss/soundcard.c: 'MAX_DMA_CHANNELS' undeclared
status: one of many fixes mips needs...
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091660/
----------------
parisc:allmodconfig
when: ?
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when: ?
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
sparc/m68k:all
when: Apr 18
why: fs/gfs2/lops.c:379:42: error: request for member
'virtual' in something not a structure or union
status: reported/bisected by PaulG
fix:
ref: http://marc.info/?l=linux-next&m=133479890929994&w=2
------------------
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* linux-next: triage for April 18, 2012
From: Paul Gortmaker @ 2012-04-19 2:01 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel
A handful of "new" (most likely pre-existing?) ARM failures from the
50-odd ARM builds Stephen added. (some are kallsyms fails & ignored).
They are all tagged with the date "Apr 19 (possibly earlier?)" below.
[ http://marc.info/?l=linux-next&m=133472511300783&w=2 ]
Lots of "undefined reference to `vga_default_device'" stuff hitting
several arch (arm/m68k,...) [ https://lkml.org/lkml/2012/4/18/157 ]
The samples/seccomp/bpf-direct.c stuff still breaks most allyes/allmod
configs. Hopefully the fix for that is in the next treegen?
[ http://marc.info/?l=linux-next&m=133479674429442&w=2 ]
The gfs2 has issues, being broken on sparc and m68k. Now bisected.
[ http://marc.info/?l=linux-next&m=133479890929994&w=2 ]
MIPS got a build failure in iwlwifi/iwl-core.h
[ http://kisskb.ellerman.id.au/kisskb/buildresult/6131791/ ]
All the rcu rcu_read_lock_nesting fallout is fixed
I've pushed some cris, frv and xtensa fixes into my linux-next feed,
so we'll see how that goes in several hours...
---------------------
New breakage since last report:
all:all vga fallout -- too many to list below, so here are some examples.
sh7785lcr_32bit_defconfig, tilegx_defconfig, x86_64-randconfig
m68k-allmodconfig, mips-p27_defconfig, orion5x_defconfig ...
http://kisskb.ellerman.id.au/kisskb/buildresult/6131974/
http://kisskb.ellerman.id.au/kisskb/buildresult/6127336/
http://kisskb.ellerman.id.au/kisskb/buildresult/6131666/
http://kisskb.ellerman.id.au/kisskb/buildresult/6131694/
http://kisskb.ellerman.id.au/kisskb/buildresult/6127233/
http://kisskb.ellerman.id.au/kisskb/buildresult/6126942/
arm:various -- may not be new; many ARM builds just added
mips:ip27_defconfig iwl-core.h: static decl of 'iwl_alloc_traffic_mem'
follows non-static decl
Randconfig fails that may or may not be new (by their very nature):
powerpc: mpc52xx_pci.c: format '%x' expects 'unsigned int', but
arg2 has type 'resource_size_t'
http://kisskb.ellerman.id.au/kisskb/buildresult/6131745/
powerpc: leds-renesas-tpu.c: undefined ref to `led_classdev_register'
http://kisskb.ellerman.id.au/kisskb/buildresult/6127187/
Builds that are fixed since last report:
all:all "rcu_read_lock_nesting undefined"
----------------------
Note1: The randconfig fails are only listed once and not tracked
in the below listing.
Note2: Build fails that are perpetual and/or unlikely to ever
get fixed are not tracked here.
Note3: Issues that Stephen finds and reverts/avoids before kicking
off the all-arch/all-config builds are also not tracked here.
Note4: I'm also not tracking the kallsyms extra pass on ARM on
a per board basis anymore. It has nothing to do with the board.
Why? See: http://marc.info/?l=linux-next&m=133267456809502
----------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of April 18th, 2012:
===============================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:mackerel_defconfig,ag5evm_defconfig
when: Apr 19 (possibly earlier?)
why: pfc-sh7372.c: undefined reference to `mmc_detect_change'
why: pfc-sh73a0.c: undefined reference to `mmc_detect_change'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131930/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131908/
ARM:bcmring_defconfig
when: Apr 19 (possibly earlier?)
why: core.c: macro "AMBA_APB_DEVICE" requires 6 args, but only 5 given
status: fixed, pending feed into linux next.
fix:
ref: http://www.spinics.net/lists/arm-kernel/msg169724.html
ARM:ezx_defconfig
when: Apr 19 (possibly earlier?)
why: ezx-pcap.c: implicit declaration of function 'irq_to_gpio'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131924/
ARM:mini2440_defconfig
when: Apr 19 (possibly earlier?)
why: arm-unknown-linux-gnueabi-ld: no machine record defined
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131932/
ARM:spear6xx_defconfig
when: Apr 19 (possibly earlier?)
why: asm/timex.h: fatal error: mach/timex.h: No such file
status:
fix:
ref:
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
why: net/core/pktgen.c: can't find a register in class 'GENERAL_REGS'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5869486/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
----------------
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
---------------
cris:various_defconfigs
when: Apr 16
why: AS arch/cris/arch-v10/lib/checksumcopy.o
why: In file included from <command-line>:4:0:
why: include/linux/kconfig.h:23:0: error: syntax error in macro parameter list
why: [macro magic for config_enabled]
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6123623/
ref: commit 69349c2dc01c489eccaa4c472542c08e370c6d7e
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
frv:defconfig
when: Mar 15
why: undefined reference to `pci_cardbus_resource_alignment'
status: PaulG submitted a fix
fix: http://marc.info/?l=linux-pci&m=133478439025369&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6030067/
----------------
i386:allmodconfig
when: Apr 17
why: samples/seccomp/bpf-direct.c:47:2: error: #error Unsupported platform
status: reported
fix:
ref: http://marc.info/?l=linux-kernel&m=133471624530782&w=2
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
mips:ip27_defconfig
when: Apr 18
why: iwlwifi/iwl-core.h: static decl of 'iwl_alloc_traffic_mem' follows non-static
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6131791/
mips:allmodconfig
when: Apr 17
why: sound/oss/soundcard.c: 'MAX_DMA_CHANNELS' undeclared
status: one of many fixes mips needs...
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091660/
----------------
parisc:allmodconfig
when: ?
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when: ?
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
sparc/m68k:all
when: Apr 18
why: fs/gfs2/lops.c:379:42: error: request for member 'virtual' in something not a structure or union
status: reported/bisected by PaulG
fix:
ref: http://marc.info/?l=linux-next&m=133479890929994&w=2
------------------
^ permalink raw reply
* linux-next: commit "GFS2: Clean up log write code path" breakage
From: Paul Gortmaker @ 2012-04-19 1:26 UTC (permalink / raw)
To: swhiteho; +Cc: linux-next, cluster-devel
Hi Steven,
When you have a chance can you look at this? Git bisect says that
this commit:
----------
commit e80623efc450fb615d1496774c8d5c063a50fb3a
Author: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon Apr 16 09:28:31 2012 +0100
GFS2: Clean up log write code path
----------
has caused the failure seen in several allmodconfigs (sparc, m68k).
fs/gfs2/lops.c:379:42: error: request for member 'virtual' in
something not a structure or union
make[3]: *** [fs/gfs2/lops.o] Error 1
Here are some examples:
http://kisskb.ellerman.id.au/kisskb/buildresult/6131431/
http://kisskb.ellerman.id.au/kisskb/buildresult/6131694/
http://kisskb.ellerman.id.au/kisskb/buildresult/6131511/
Thanks,
Paul.
^ permalink raw reply
* [PATCH] samples/seccomp: fix dependencies on arch macros
From: Will Drewry @ 2012-04-19 0:50 UTC (permalink / raw)
To: james, paul.gortmaker
Cc: eparis, linux-next, linux-kernel, keescook, linux-security-module,
Will Drewry
This change fixes the compilation error triggered here for
i386 allmodconfig in linux-next:
http://kisskb.ellerman.id.au/kisskb/buildresult/6123842/
Logic attempting to predict the host architecture has been
removed from the Makefile. Instead, the bpf-direct sample
should now compile on any architecture, but if the architecture
is not supported, it will compile a minimal main() function.
This change also ensures the samples are not compiled when
there is no seccomp filter support.
(Note, I wasn't able to reproduce the error locally, but
the existing approach was clearly flawed. This tweak
should resolve your issue and avoid other future weirdness.)
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Will Drewry <wad@chromium.org>
---
samples/seccomp/Makefile | 12 +++---------
samples/seccomp/bpf-direct.c | 18 ++++++++++++++++--
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile
index e8fe0f5..16aa2d4 100644
--- a/samples/seccomp/Makefile
+++ b/samples/seccomp/Makefile
@@ -1,27 +1,21 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o
-hostprogs-$(CONFIG_SECCOMP) := bpf-fancy dropper
-bpf-fancy-objs := bpf-fancy.o bpf-helper.o
+hostprogs-$(CONFIG_SECCOMP_FILTER) := bpf-fancy dropper bpf-direct
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include
HOSTCFLAGS_bpf-helper.o += -I$(objtree)/usr/include
HOSTCFLAGS_bpf-helper.o += -idirafter $(objtree)/include
+bpf-fancy-objs := bpf-fancy.o bpf-helper.o
HOSTCFLAGS_dropper.o += -I$(objtree)/usr/include
HOSTCFLAGS_dropper.o += -idirafter $(objtree)/include
dropper-objs := dropper.o
-# bpf-direct.c is x86-only.
-ifeq ($(SRCARCH),x86)
-# List of programs to build
-hostprogs-$(CONFIG_SECCOMP) += bpf-direct
-bpf-direct-objs := bpf-direct.o
-endif
-
HOSTCFLAGS_bpf-direct.o += -I$(objtree)/usr/include
HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include
+bpf-direct-objs := bpf-direct.o
# Try to match the kernel target.
ifeq ($(CONFIG_64BIT),)
diff --git a/samples/seccomp/bpf-direct.c b/samples/seccomp/bpf-direct.c
index 26f523e..151ec3f 100644
--- a/samples/seccomp/bpf-direct.c
+++ b/samples/seccomp/bpf-direct.c
@@ -8,6 +8,11 @@
* and can serve as a starting point for developing
* applications using prctl(PR_SET_SECCOMP, 2, ...).
*/
+#if defined(__i386__) || defined(__x86_64__)
+#define SUPPORTED_ARCH 1
+#endif
+
+#if defined(SUPPORTED_ARCH)
#define __USE_GNU 1
#define _GNU_SOURCE 1
@@ -43,8 +48,6 @@
#define REG_ARG3 REG_R10
#define REG_ARG4 REG_R8
#define REG_ARG5 REG_R9
-#else
-#error Unsupported platform
#endif
#ifndef PR_SET_NO_NEW_PRIVS
@@ -174,3 +177,14 @@ int main(int argc, char **argv)
payload("Error message going to STDERR\n"));
return 0;
}
+#else /* SUPPORTED_ARCH */
+/*
+ * This sample is x86-only. Since kernel samples are compiled with the
+ * host toolchain, a non-x86 host will result in using only the main()
+ * below.
+ */
+int main(void)
+{
+ return 1;
+}
+#endif /* SUPPORTED_ARCH */
--
1.7.5.4
^ permalink raw reply related
* linux-next: build failure in Linus' tree
From: Stephen Rothwell @ 2012-04-19 0:41 UTC (permalink / raw)
To: Linus; +Cc: linux-next, linux-kernel, Eric Paris, James Morris
[-- Attachment #1: Type: text/plain, Size: 1377 bytes --]
Hi Linus,
While building Linus' tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
security/commoncap.c: In function 'cap_bprm_set_creds':
security/commoncap.c:510:22: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
Caused by commit d52fc5dde171 ("fcaps: clear the same personality flags as suid when fcaps are used").
I added this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Apr 2012 10:38:26 +1000
Subject: [PATCH] security: commoncap.c needs to include personality.h
fixes this build error on PowerPC:
security/commoncap.c: In function 'cap_bprm_set_creds':
security/commoncap.c:510:22: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
security/commoncap.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/security/commoncap.c b/security/commoncap.c
index 0ecf4ba..71a166a 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -29,6 +29,7 @@
#include <linux/securebits.h>
#include <linux/user_namespace.h>
#include <linux/binfmts.h>
+#include <linux/personality.h>
/*
* If a non-root user executes a setuid-root binary in
--
1.7.10.rc3
--
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 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