linux-next: Tree for Oct 16

2016-10-15 Thread Stephen Rothwell
Hi all,

Changes since 20161014:

The net tree gained a conflict against Linus' tree.

The akpm-current tree still had its build failures for which I applied
2 patches.

Non-merge commits (relative to Linus' tree): 389
 614 files changed, 17748 insertions(+), 3167 deletions(-)



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" and checkout or reset to the new
master.

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 (with
CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a
native build of tools/perf. After the final fixups (if any), I do an
x86_64 modules_install followed by builds for x86_64 allnoconfig,
powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc
and sparc64 defconfig.

Below is a summary of the state of the merge.

I am currently merging 243 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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.

-- 
Cheers,
Stephen Rothwell

$ git checkout master
$ git reset --hard stable
Merging origin/master (1001354ca341 Linux 4.9-rc1)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of 
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when 
not configured)
Merging arc-current/for-curr (8df0cc75f530 ARC: [build] Support gz, lzma 
compressed uImage)
Merging arm-current/fixes (fb833b1fbb68 ARM: fix delays)
Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table 
users off module.h and onto extable.h)
Merging metag-fixes/fixes (35d04077ad96 metag: Only define 
atomic_dec_if_positive conditionally)
Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks 
for SR-IOV and window alignment)
Merging sparc/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of 
git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
Merging net/master (9e55d0f95460 Merge tag 
'wireless-drivers-for-davem-2016-10-14' of 
git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/Kconfig
Applying: qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move
Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti 
interface is removed)
Merging netfilter/master (6d3a4c404648 strparser: Propagate correct error code 
in strp_recv())
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
Merging wireless-drivers/master (1ea2643961b0 ath6kl: add Dell OEM SDIO I/O for 
the Venue 8 Pro)
Merging mac80211/master (1d4de2e222b4 mac80211: fix CMD_FRAME for AP_VLAN)
Merging sound-current/for-linus (fdd8218d7d1b ALSA: line6: fix a crash in 
line6_hwdep_write())
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device 
removal)
Merging driver-core.current/driver-core-linus (b66484cd7470 Merge branch 'akpm' 
(patches from Andrew))
Merging tty.current/tty-linus (b66484cd7470 Merge branch 'akpm' (patches from 
Andrew))
Merging usb.current/usb-linus (b66484cd7470 Merge branch 'akpm' (patches from 
Andrew))
Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix 
endpoint name)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add 
support for another Infineon flashloader)
Merging usb-chipidea-fixes/ci-for-usb-stable (6b7f456e67a1 usb: chipidea: host: 
fix NULL ptr dereference during shutdown)
Merging staging.current/staging-linus (29fbff8698fc Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging char-misc.current/char-misc-linus (b66484cd7470 Merge branch 'akpm' 
(patches from Andrew))
Merging input-current/for-linus (1134ca268e73 Merge branch 'next' into 
for-linus)
Merging crypto-current/master (c3afafa47898 Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of 
git://git.infradead.org/users/pcmoore/audit)
Merging rr-fixes/fixes (8244062ef1e5 modules: fix 

linux-next: Tree for Oct 16

2015-10-16 Thread Stephen Rothwell
Hi all,

Changes since 20151015:

The asm-generic tree lost its build failure.

The arm-soc tree lost its build failure.

I used the h8300 tree from next-20150828 since the current tree no
contains a rebased part of Linus' tree.

The slave-dma tree still had its build failure for which I applied a merge
fix patch.

The crypto tree lost its build failure.

The input tree gained a build failure so I used the version from
next-20151015.

The mfd tree still had its build failure for which I applied a merge
fix patch.

The battery tree still had its build failure so I used the version from
next-20150925.

The dt-rh tree gained a conflict against the regulator tree.

The kvm-arm tree gained a conflict against the kvm tree.

The cgroup tree gained conflicts against the tip tree.

The akpm tree lost a patch that was no longer needed as the patch it
was fixing has been removed.

Non-merge commits (relative to Linus' tree): 7703
 6339 files changed, 298677 insertions(+), 130938 deletions(-)



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" and checkout or reset to the new
master.

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,
a multi_v7_defconfig for arm and a native build of tools/perf. After
the final fixups (if any), it is also built with powerpc allnoconfig
(32 and 64 bit), ppc44x_defconfig, allyesconfig (this fails its final
link) and pseries_le_defconfig and i386, sparc, sparc64 and arm defconfig.

Below is a summary of the state of the merge.

I am currently merging 228 trees (counting Linus' and 34 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (69984b644407 Merge tag 'arm64-fixes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on 
module install)
Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4)
Merging arm-current/fixes (868e87ccda24 ARM: make RiscPC depend on MMU)
Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs 
for v4.3-rc1)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached 
build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (abb39bc792aa selftests/powerpc: Fix build failure 
of load_unaligned_zeropad test)
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
Merging net/master (53ca376eec4e mlxsw: core: Fix race condition in 
__mlxsw_emad_transmit)
Merging ipsec/master (4e077237cfb6 xfrm: Fix state threshold configuration from 
userspace)
Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for 
nf_dup_ipv{4,6})
Merging sound-current/for-linus (e8d65a8d9852 ALSA: hda - Fix inverted internal 
mic on Lenovo G50-80)
Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access 
in numa_node override)
Merging wireless-drivers/master (de28a05ee28e Merge tag 
'iwlwifi-for-kalle-2015-10-05' of 
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3)
Merging tty.current/tty-linus (25cb62b76430 Linux 4.3-rc5)
Merging usb.current/usb-linus (25cb62b76430 Linux 4.3-rc5)
Merging usb-gadget-fixes/fixes (25cb62b76430 Linux 4.3-rc5)
Merging usb-serial-fixes/usb-linus (049e6dde7e57 Linux 4.3-rc4)
Merging staging.current/staging-linus (25cb62b76430 Linux 4.3-rc5)
Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5)
Merging input-current/for-linus (a487c03fa282 Input: cyapa - fix the copy paste 
error on electrodes_rx value)
Merging crypto-current/master (8996eafdcbad crypto: ahash - ensure statesize is 
non-zero)
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
Merging 

Re: linux-next: Tree for Oct 16

2014-10-16 Thread Guenter Roeck
On Thu, Oct 16, 2014 at 04:11:28PM +1100, Stephen Rothwell wrote:
 Hi all,
 
 Please do not add any material intended for v3.19 to your linux-next
 included trees until after v3.18-rc1 has been released.
 
 Changes since 20141015:
 
 The net tree lost its build failure.
 
 The thermal tree gained a build failure for which I reverted a commit.
 
 The akpm-current tree gained a build failure for which I applied a patch.
 
 The akpm tree lost a patch that turned up elsewhere.
 
 Non-merge commits (relative to Linus' tree): 1106
  1073 files changed, 32703 insertions(+), 16141 deletions(-)
 
 
 

There are some new build failures, so here is a complete list of all the
problems I am seeing in my builds.

Guenter
---

arm:at91_dt_defconfig
arm:sama5_defconfig
arm:at91rm9200_defconfig

drivers/tty/serial/atmel_serial.c:717:3:
error: implicit declaration of function 'dmaengine_terminate_all'
drivers/tty/serial/atmel_serial.c:724:2:
error: implicit declaration of function 'async_tx_ack'
drivers/tty/serial/atmel_serial.c: In function 'atmel_release_tx_dma':
drivers/tty/serial/atmel_serial.c:746:3:
error: implicit declaration of function 'dma_release_channel'
drivers/tty/serial/atmel_serial.c: In function 'atmel_tx_dma':
drivers/tty/serial/atmel_serial.c:790:3:
error: implicit declaration of function 'dmaengine_prep_slave_sg'
drivers/tty/serial/atmel_serial.c:793:7: error: 'DMA_MEM_TO_DEV' undeclared

and more similar problems.

---
arm64:defconfig

mm/gup.c: In function '__get_user_pages_fast':
mm/gup.c:963:3: error: implicit declaration of function 'pgd_huge'

---
avr32:defconfig

drivers/input/leds.o: In function `init_module':
leds.c:(.init.text+0x0): multiple definition of `init_module'
drivers/input/input.o:input.c:(.init.text+0x0): first defined here
drivers/input/leds.o: In function `cleanup_module':
leds.c:(.exit.text+0x0): multiple definition of `cleanup_module'
drivers/input/input.o:input.c:(.exit.text+0x0): first defined here

---
avr32:merisc_defconfig
avr32:atngw100mkii_evklcd101_defconfig

drivers/tty/serial/atmel_serial.c: In function 'atmel_get_lines_status':
drivers/tty/serial/atmel_serial.c:254:
error: 'struct atmel_uart_port' has no member named 'gpios'

drivers/tty/serial/atmel_serial.c: In function 'atmel_config_rs485':
drivers/tty/serial/atmel_serial.c:301:
error: 'struct atmel_uart_port' has no member named 'tx_done_mask'
drivers/tty/serial/atmel_serial.c:308:
error: 'struct atmel_uart_port' has no member named 'rs485'

and many more similar problems. Also there are the same dma related errors as
for the arm builds.

---
sparc64:allmodconfig

drivers/bcma/main.c: In function 'bcma_of_find_child_device':
drivers/bcma/main.c:150:3:
error: implicit declaration of function 'of_translate_address'

---
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


linux-next: Tree for Oct 16

2014-10-15 Thread Stephen Rothwell
Hi all,

Please do not add any material intended for v3.19 to your linux-next
included trees until after v3.18-rc1 has been released.

Changes since 20141015:

The net tree lost its build failure.

The thermal tree gained a build failure for which I reverted a commit.

The akpm-current tree gained a build failure for which I applied a patch.

The akpm tree lost a patch that turned up elsewhere.

Non-merge commits (relative to Linus' tree): 1106
 1073 files changed, 32703 insertions(+), 16141 deletions(-)



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 and checkout or reset to the new
master.

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 and a
multi_v7_defconfig for arm. After the final fixups (if any), it is also
built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and
allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm
defconfig.

Below is a summary of the state of the merge.

I am currently merging 225 trees (counting Linus' and 32 trees of patches
pending for Linus' tree).

Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .

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.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (0429fbc0bdc2 Merge branch 'for-3.18-consistent-ops' of 
git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu)
Merging fixes/master (b94d525e58dc Merge 
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1)
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
Merging arm-current/fixes (ad684dce87fa ARM: 8179/1: kprobes-test: Fix compile 
error bad immediate value for offset)
Merging m68k-current/for-linus (24cae7934cf1 m68k: Reformat 
arch/m68k/mm/hwtest.c)
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of 
flash_block_list in rtas_flash)
Merging powerpc-merge-mpe/for-linus (d53ba6b3bba3 cxl: Fix afu_read() not doing 
finish_wait() on signal or non-blocking)
Merging sparc/master (f4da3628dc7c sparc64: Fix FPU register corruption with 
AES crypto offload.)
Merging net/master (f5b720b85944 gianfar: Add FCS to rx buffer size (fix))
Merging ipsec/master (b8c203b2d2fc xfrm: Generate queueing routes only from 
route lookup functions)
Merging sound-current/for-linus (c8b00fd2f4c5 ALSA: hda_intel: Add Device IDs 
for Intel Sunrise Point PCH)
Merging pci-current/for-linus (52265ae92ab9 Merge branch 
'remove-weak-function-declarations' into for-linus)
Merging wireless/master (f8adaf0ae978 brcmfmac: Fix off by one bug in 
brcmf_count_20mhz_channels())
Merging driver-core.current/driver-core-linus (5e40d331bd72 Merge branch 'next' 
of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
Merging tty.current/tty-linus (9e82bf014195 Linux 3.17-rc5)
Merging usb.current/usb-linus (0f33be009b89 Linux 3.17-rc6)
Merging usb-gadget-fixes/fixes (0b93a4c838fa usb: dwc3: fix TRB completion when 
multiple TRBs are started)
Merging usb-serial-fixes/usb-linus (dee80ad12d2b USB: cp210x: add support for 
Seluxit USB dongle)
Merging staging.current/staging-linus (80213c03c415 Merge tag 
'pci-v3.18-changes' of 
git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci)
Merging char-misc.current/char-misc-linus (9e82bf014195 Linux 3.17-rc5)
Merging input-current/for-linus (447a8b858e4b Merge branch 'next' into 
for-linus)
Merging md-current/for-linus (d47648fcf061 raid5: avoid finding discard 
stripe)
Merging crypto-current/master (be34c4ef693f crypto: sha - Handle unaligned 
input data in generic sha256 and sha512.)
Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing)
Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
Merging devicetree-current/devicetree/merge (e66c98c7a0ea of: Fix NULL 
dereference in selftest removal code)
Merging rr-fixes/fixes (f49819560f53 virtio-rng: skip reading when we start to 

linux-next: Tree for Oct 16

2013-10-16 Thread Thierry Reding
Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

git://gitorious.org/thierryreding/linux-next.git

A next-20131016 tag is also provided for convenience.

Gained two new conflicts, but nothing too exciting. x86 and ARM default
configurations as well as the x86 allmodconfig mostly build fine on the
final tree. There was a failure for the ARM at91x40_defconfig, but the
proper fix wasn't immediately obvious to me, so I've left it broken for
now.

Thierry
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c)

2013-10-16 Thread Randy Dunlap
On 10/16/13 11:51, Thierry Reding wrote:
 Hi all,
 
 I've uploaded today's linux-next tree to the master branch of the
 repository below:
 
 git://gitorious.org/thierryreding/linux-next.git
 
 A next-20131016 tag is also provided for convenience.
 
 Gained two new conflicts, but nothing too exciting. x86 and ARM default
 configurations as well as the x86 allmodconfig mostly build fine on the
 final tree. There was a failure for the ARM at91x40_defconfig, but the
 proper fix wasn't immediately obvious to me, so I've left it broken for
 now.

on i386, when CONFIG_NET_NS is not enabled:

net/sched/em_ipset.c: In function 'em_ipset_change':
net/sched/em_ipset.c:27:36: error: 'struct net_device' has no member named 
'nd_net'
net/sched/em_ipset.c: In function 'em_ipset_destroy':
net/sched/em_ipset.c:49:34: error: 'struct net_device' has no member named 
'nd_net'


-- 
~Randy
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c)

2013-10-16 Thread Stephen Hemminger
On Wed, 16 Oct 2013 14:48:32 -0700
Randy Dunlap rdun...@infradead.org wrote:

 On 10/16/13 11:51, Thierry Reding wrote:
  Hi all,
  
  I've uploaded today's linux-next tree to the master branch of the
  repository below:
  
  git://gitorious.org/thierryreding/linux-next.git
  
  A next-20131016 tag is also provided for convenience.
  
  Gained two new conflicts, but nothing too exciting. x86 and ARM default
  configurations as well as the x86 allmodconfig mostly build fine on the
  final tree. There was a failure for the ARM at91x40_defconfig, but the
  proper fix wasn't immediately obvious to me, so I've left it broken for
  now.
 
 on i386, when CONFIG_NET_NS is not enabled:
 
 net/sched/em_ipset.c: In function 'em_ipset_change':
 net/sched/em_ipset.c:27:36: error: 'struct net_device' has no member named 
 'nd_net'
 net/sched/em_ipset.c: In function 'em_ipset_destroy':
 net/sched/em_ipset.c:49:34: error: 'struct net_device' has no member named 
 'nd_net'
 
 

I think this should fix.



--- a/net/sched/em_ipset.c  2013-10-06 14:48:25.030449222 -0700
+++ b/net/sched/em_ipset.c  2013-10-16 15:38:05.030278287 -0700
@@ -24,7 +24,7 @@ static int em_ipset_change(struct tcf_pr
 {
struct xt_set_info *set = data;
ip_set_id_t index;
-   struct net *net = qdisc_dev(tp-q)-nd_net;
+   struct net *net = dev_net(qdisc_dev(tp-q));
 
if (data_len != sizeof(*set))
return -EINVAL;
@@ -46,7 +46,7 @@ static void em_ipset_destroy(struct tcf_
 {
const struct xt_set_info *set = (const void *) em-data;
if (set) {
-   ip_set_nfnl_put(qdisc_dev(p-q)-nd_net, set-index);
+   ip_set_nfnl_put(dev_net(qdisc_dev(p-q)), set-index);
kfree((void *) em-data);
}
 }
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Oct 16 (net/sched/em_ipset.c)

2013-10-16 Thread Randy Dunlap
On 10/16/13 15:39, Stephen Hemminger wrote:
 On Wed, 16 Oct 2013 14:48:32 -0700
 Randy Dunlap rdun...@infradead.org wrote:
 
 On 10/16/13 11:51, Thierry Reding wrote:
 Hi all,

 I've uploaded today's linux-next tree to the master branch of the
 repository below:

 git://gitorious.org/thierryreding/linux-next.git

 A next-20131016 tag is also provided for convenience.

 Gained two new conflicts, but nothing too exciting. x86 and ARM default
 configurations as well as the x86 allmodconfig mostly build fine on the
 final tree. There was a failure for the ARM at91x40_defconfig, but the
 proper fix wasn't immediately obvious to me, so I've left it broken for
 now.

 on i386, when CONFIG_NET_NS is not enabled:

 net/sched/em_ipset.c: In function 'em_ipset_change':
 net/sched/em_ipset.c:27:36: error: 'struct net_device' has no member named 
 'nd_net'
 net/sched/em_ipset.c: In function 'em_ipset_destroy':
 net/sched/em_ipset.c:49:34: error: 'struct net_device' has no member named 
 'nd_net'


 
 I think this should fix.
 

That works.  Thanks.

Acked-by: Randy Dunlap rdun...@infradead.org


 
 
 --- a/net/sched/em_ipset.c2013-10-06 14:48:25.030449222 -0700
 +++ b/net/sched/em_ipset.c2013-10-16 15:38:05.030278287 -0700
 @@ -24,7 +24,7 @@ static int em_ipset_change(struct tcf_pr
  {
   struct xt_set_info *set = data;
   ip_set_id_t index;
 - struct net *net = qdisc_dev(tp-q)-nd_net;
 + struct net *net = dev_net(qdisc_dev(tp-q));
  
   if (data_len != sizeof(*set))
   return -EINVAL;
 @@ -46,7 +46,7 @@ static void em_ipset_destroy(struct tcf_
  {
   const struct xt_set_info *set = (const void *) em-data;
   if (set) {
 - ip_set_nfnl_put(qdisc_dev(p-q)-nd_net, set-index);
 + ip_set_nfnl_put(dev_net(qdisc_dev(p-q)), set-index);
   kfree((void *) em-data);
   }
  }
 --


-- 
~Randy
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Oct 16

2013-10-16 Thread Guenter Roeck

On 10/16/2013 11:51 AM, Thierry Reding wrote:

Hi all,

I've uploaded today's linux-next tree to the master branch of the
repository below:

 git://gitorious.org/thierryreding/linux-next.git

A next-20131016 tag is also provided for convenience.

Gained two new conflicts, but nothing too exciting. x86 and ARM default
configurations as well as the x86 allmodconfig mostly build fine on the
final tree. There was a failure for the ARM at91x40_defconfig, but the
proper fix wasn't immediately obvious to me, so I've left it broken for
now.



Upside: mips qemu run now passes (mips64 qemu build still fails).

Downside: Up to 13 build failures, from 12.

Besides the mips64 qemu build, current failures are:

arm:allmodconfig
blackfin:defconfig
mips:nlm_xlp_defconfig
mips:cavium_octeon_defconfig
powerpc: (7 out of 14)
sparc64:allmodconfig
xtensa:allmodconfig (new failure)

Details are at http://server.roeck-us.net:8010/builders.

Guenter

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: linux-next: Tree for Oct 16 (readeon_legacy)

2012-10-16 Thread Alex Deucher
On Tue, Oct 16, 2012 at 4:05 PM, Randy Dunlap rdun...@xenotime.net wrote:
 On 10/15/2012 08:58 PM, Stephen Rothwell wrote:

 Hi all,

 The merge window has closed, feel free to add new stuff again.

 Changes since 201201015:


patch already sent to Dave:
http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-fixesid=cd23492af3d4401c02c48a4bebe5995c9498eac5

Alex



 on x86_64:

 drivers/built-in.o: In function `radeon_asic_init':
 (.text+0xd3c71): undefined reference to `radeon_legacy_set_backlight_level'
 drivers/built-in.o:(.data+0x20490): undefined reference to 
 `radeon_legacy_set_backlight_level'
 drivers/built-in.o:(.data+0x20498): undefined reference to 
 `radeon_legacy_get_backlight_level'
 drivers/built-in.o:(.data+0x20710): undefined reference to 
 `radeon_legacy_set_backlight_level'
 drivers/built-in.o:(.data+0x20718): undefined reference to 
 `radeon_legacy_get_backlight_level'
 drivers/built-in.o:(.data+0x20990): undefined reference to 
 `radeon_legacy_set_backlight_level'
 drivers/built-in.o:(.data+0x20998): undefined reference to 
 `radeon_legacy_get_backlight_level'
 drivers/built-in.o:(.data+0x20c10): undefined reference to 
 `radeon_legacy_set_backlight_level'
 drivers/built-in.o:(.data+0x20c18): undefined reference to 
 `radeon_legacy_get_backlight_level'
 drivers/built-in.o:(.data+0x21110): undefined reference to 
 `radeon_legacy_set_backlight_level'
 drivers/built-in.o:(.data+0x21118): undefined reference to 
 `radeon_legacy_get_backlight_level'


 Full randconfig file is attached.
 CONFIG_BACKLIGHT_CLASS_DEVICE is not enabled.

 --
 ~Randy

 ___
 dri-devel mailing list
 dri-de...@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/dri-devel

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


linux-next: Tree for Oct 16

2012-10-15 Thread Stephen Rothwell
Hi all,

The merge window has closed, feel free to add new stuff again.

Changes since 201201015:

New tree: cortex
Dropped Tree: cortex (complex merge conflict)
Removed tree: kmemleak (maintainer suggested)

The l2-mtd tree still had its build failure so I used the version from
next-20121011.

The tip tree gained a conflict against Linus' tree.

The kvm-ppc tree lost its build failure.

The cortex tree gained conflicts against Linus' tree.

The signal tree gained a build failure for which I applied a suggested
patch.

The akpm tree gained a conflict against the signal 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,
sparc64 and arm 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 204 trees (counting Linus' and 26 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 Rothwells...@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master (dd8e8c4 thermal, cpufreq: Fix build when CPU_FREQ_TABLE 
isn't configured)
Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of 
git://git.pengutronix.de/git/wsa/linux)
Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
Merging arm-current/fixes (3d6ee36 Merge branch 'late-for-linus' of 
git://git.linaro.org/people/rmk/linux-arm)
Merging m68k-current/for-linus (92f79db m68k: Remove empty #ifdef/#else/#endif 
block)
Merging powerpc-merge/merge (fd3bc66 Merge tag 'disintegrate-powerpc-20121009' 
into merge)
Merging sparc/master (ddffeb8 Linux 3.7-rc1)
Merging net/master (29bb4cc docbook: networking: fix file paths for uapi 
headers)
Merging sound-current/for-linus (ddffeb8 Linux 3.7-rc1)
Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding 
is disabled)
Merging wireless/master (bf11315 net/wireless: ipw2200: Fix panic occurring in 
ipw_handle_promiscuous_tx())
Merging driver-core.current/driver-core-linus (ddffeb8 Linux 3.7-rc1)
Merging tty.current/tty-linus (3e5bde8 serial/8250_hp300: Missing 8250 register 
interface conversion bits)
Merging usb.current/usb-linus (8282da4 MAINTAINERS: Add maintainer entry for 
the USB webcam gadget)
Merging staging.current/staging-linus (ddffeb8 Linux 3.7-rc1)
Merging char-misc.current/char-misc-linus (ddffeb8 Linux 3.7-rc1)
Merging input-current/for-linus (0cc8d6a Merge branch 'next' into for-linus)
Merging md-current/for-linus (72f36d5 md: refine reporting of resync/reshape 
delays.)
Merging audit-current/for-linus (c158a35 audit: no leading space in 
audit_log_d_path prefix)
Merging crypto-current/master (c9f97a2 crypto: x86/glue_helper - fix storing of 
new IV in CBC encryption)
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
Merging dwmw2/master (244dc4e Merge 
git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to 
inline functions)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs 
formatting)
Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for 
of_parse_phandle_with_args)
Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using 
proper spi: modalias prefixes.)
Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, 
remove cast)
Merging asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of