Linus Torvalds
89453379aa
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"A bit has accumulated, but it's been a week or so since my last batch
of post-merge-window fixes, so...
1) Missing module license in netfilter reject module, from Pablo.
Lots of people ran into this.
2) Off by one in mac80211 baserate calculation, from Karl Beldan.
3) Fix incorrect return value from ax88179_178a driver's set_mac_addr
op, which broke use of it with bonding. From Ian Morgan.
4) Checking of skb_gso_segment()'s return value was not all
encompassing, it can return an SKB pointer, a pointer error, or
NULL. Fix from Florian Westphal.
This is crummy, and longer term will be fixed to just return error
pointers or a real SKB.
6) Encapsulation offloads not being handled by
skb_gso_transport_seglen(). From Florian Westphal.
7) Fix deadlock in TIPC stack, from Ying Xue.
8) Fix performance regression from using rhashtable for netlink
sockets. The problem was the synchronize_net() invoked for every
socket destroy. From Thomas Graf.
9) Fix bug in eBPF verifier, and remove the strong dependency of BPF
on NET. From Alexei Starovoitov.
10) In qdisc_create(), use the correct interface to allocate
->cpu_bstats, otherwise the u64_stats_sync member isn't
initialized properly. From Sabrina Dubroca.
11) Off by one in ip_set_nfnl_get_byindex(), from Dan Carpenter.
12) nf_tables_newchain() was erroneously expecting error pointers from
netdev_alloc_pcpu_stats(). It only returna a valid pointer or
NULL. From Sabrina Dubroca.
13) Fix use-after-free in _decode_session6(), from Li RongQing.
14) When we set the TX flow hash on a socket, we mistakenly do so
before we've nailed down the final source port. Move the setting
deeper to fix this. From Sathya Perla.
15) NAPI budget accounting in amd-xgbe driver was counting descriptors
instead of full packets, fix from Thomas Lendacky.
16) Fix total_data_buflen calculation in hyperv driver, from Haiyang
Zhang.
17) Fix bcma driver build with OF_ADDRESS disabled, from Hauke
Mehrtens.
18) Fix mis-use of per-cpu memory in TCP md5 code. The problem is
that something that ends up being vmalloc memory can't be passed
to the crypto hash routines via scatter-gather lists. From Eric
Dumazet.
19) Fix regression in promiscuous mode enabling in cdc-ether, from
Olivier Blin.
20) Bucket eviction and frag entry killing can race with eachother,
causing an unlink of the object from the wrong list. Fix from
Nikolay Aleksandrov.
21) Missing initialization of spinlock in cxgb4 driver, from Anish
Bhatt.
22) Do not cache ipv4 routing failures, otherwise if the sysctl for
forwarding is subsequently enabled this won't be seen. From
Nicolas Cavallari"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (131 commits)
drivers: net: cpsw: Support ALLMULTI and fix IFF_PROMISC in switch mode
drivers: net: cpsw: Fix broken loop condition in switch mode
net: ethtool: Return -EOPNOTSUPP if user space tries to read EEPROM with lengh 0
stmmac: pci: set default of the filter bins
net: smc91x: Fix gpios for device tree based booting
mpls: Allow mpls_gso to be built as module
mpls: Fix mpls_gso handler.
r8152: stop submitting intr for -EPROTO
netfilter: nft_reject_bridge: restrict reject to prerouting and input
netfilter: nft_reject_bridge: don't use IP stack to reject traffic
netfilter: nf_reject_ipv6: split nf_send_reset6() in smaller functions
netfilter: nf_reject_ipv4: split nf_send_reset() in smaller functions
netfilter: nf_tables_bridge: update hook_mask to allow {pre,post}routing
drivers/net: macvtap and tun depend on INET
drivers/net, ipv6: Select IPv6 fragment idents for virtio UFO packets
drivers/net: Disable UFO through virtio
net: skb_fclone_busy() needs to detect orphaned skb
gre: Use inner mac length when computing tunnel length
mlx4: Avoid leaking steering rules on flow creation error flow
net/mlx4_en: Don't attempt to TX offload the outer UDP checksum for VXLAN
...
2014-10-31 15:04:58 -07:00
spi: pl022: Add support for chip select extension
2014-09-24 10:25:52 +01:00
bcma: register bcma as device tree driver
2014-09-30 13:17:14 -04:00
libceph: sync osd op definitions in rados.h
2014-10-14 12:57:02 -07:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
dmaengine: dw: export probe()/remove() and Co to users
2014-10-15 20:31:05 +05:30
extcon: gpio: Fix code cleanup
2014-09-22 16:48:47 +09:00
fsl /bestcomm
This is the bulk of GPIO changes for the v3.18 development
2014-10-09 14:58:15 -04:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-09 06:42:04 -04:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-10-19 12:50:44 -07:00
net/mlx4_en: Code cleanups in tx path
2014-10-06 01:04:15 -04:00
Main set of InfiniBand/RDMA updates for 3.18 merge window:
2014-10-19 12:29:23 -07:00
mmc: sdhci: Add quirk for always getting TC with stop cmd
2014-10-03 14:18:17 +02:00
mtd: nand: support ONFI timing mode retrieval for non-ONFI NANDs
2014-09-22 11:29:57 -07:00
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-10-19 12:50:44 -07:00
regulator: Include err.h from consumer.h to fix build failure
2014-10-13 13:05:58 +02:00
soc /ti
drivers/soc: ti: fix build break with modules
2014-09-24 11:53:39 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
2014-10-08 12:51:44 -04:00
usbnet: add a callback for set_rx_mode
2014-10-28 17:26:19 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2014-10-24 11:21:43 -07:00
PCI/AER: Make <linux/aer.h> standalone includable
2014-09-16 16:28:34 -06:00
audit: Remove "weak" from audit_classify_compat_syscall() declaration
2014-10-22 16:14:03 -06:00
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
block: add bioset_create_nobvec()
2014-10-03 15:28:18 -06:00
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
2014-10-18 11:53:51 -07:00
block: Remove REQ_KERNEL
2014-10-14 09:00:44 -06:00
block: Fix merge logic when CONFIG_BLK_DEV_INTEGRITY is not defined
2014-10-28 20:27:43 -06:00
bpf: verifier (add verifier core)
2014-09-26 15:05:15 -04:00
net: phy: add BCM7425 and BCM7429 PHYs
2014-10-01 22:12:48 -04:00
crypto: ccp - Check for CCP before registering crypto algs
2014-09-24 14:23:34 +08:00
cgroup: remove CGRP_RELEASABLE flag
2014-09-19 09:29:32 -04:00
Allwinner Clocks Additions for 3.18
2014-09-27 12:52:33 -07:00
Allwinner Clocks Additions for 3.18
2014-09-27 12:52:33 -07:00
The clk tree changes for 3.18 are dominated by clock drivers. Mostly
2014-10-15 07:05:03 +02:00
clocksource: Remove "weak" from clocksource_default_clock() declaration
2014-10-22 16:14:03 -06:00
drivers: dma-contiguous: add initialization from device tree
2014-10-14 02:18:12 +02:00
ARCNET: add support for multi interfaces on com20020
2014-09-29 14:36:26 -04:00
mm, compaction: khugepaged should not give up due to need_resched()
2014-10-09 22:25:54 -04:00
compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
2014-10-28 11:03:40 +01:00
compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
2014-10-28 11:03:40 +01:00
rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
2014-09-18 16:22:27 -07:00
cpufreq: cpufreq-dt: extend with platform_data
2014-10-21 00:51:01 +02:00
cpufreq: allow driver-specific data
2014-10-21 00:51:01 +02:00
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2014-10-10 07:24:40 -04:00
vmcore: Remove "weak" from function declarations
2014-10-22 16:14:04 -06:00
block: Add T10 Protection Information functions
2014-09-27 09:14:59 -06:00
don't need that forward declaration of struct nameidata in dcache.h anymore
2014-10-12 17:09:06 -04:00
device coredump: add new device coredump class
2014-09-23 22:53:15 -07:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-10-18 18:11:04 -07:00
iommu/vt-d: Store bus information in RMRR PCI device path
2014-10-02 12:12:25 +02:00
dynamic_debug: change __dynamic_<foo>_dbg return types to void
2014-10-03 14:55:48 -07:00
dql: dql_queued() should write first to reduce bus transactions
2014-09-29 00:04:55 -04:00
efi: Provide a non-blocking SetVariable() operation
2014-10-03 18:41:03 +01:00
f2fs: support large sector size
2014-09-23 11:10:20 -07:00
bpf: handle pseudo BPF_LD_IMM64 insn
2014-09-26 15:05:15 -04:00
fonts: Add 6x10 font
2014-10-09 11:35:48 +03:00
fs: limit filesystem stacking depth
2014-10-24 00:14:39 +02:00
net: fs_enet: Remove non NAPI RX
2014-10-08 16:01:41 -04:00
dmaengine: freescale: add and export fsl_dma_external_start()
2014-10-15 21:31:27 +05:30
lib/genalloc.c: add genpool range check function
2014-10-09 22:25:52 -04:00
genl_magic: Resolve logical-op warnings
2014-10-14 17:03:53 -04:00
mm: rename allocflags_to_migratetype for clarity
2014-10-09 22:25:55 -04:00
Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd', 'for-3.18/rmi', 'for-3.18/sony', 'for-3.18/uhid', 'for-3.18/upstream' and 'for-3.18/wacom' into for-linus
2014-10-06 23:34:40 +02:00
mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA
2014-10-09 22:25:57 -04:00
i2c: move acpi code back into the core
2014-09-25 16:07:15 +02:00
macvlan: add source mode
2014-09-29 15:37:01 -04:00
IOMMU Updates for Linux v3.18
2014-10-15 07:23:49 +02:00
ipack: save carrier owner to allow device to get it
2014-09-23 23:13:13 -07:00
ACPI and power management updates for 3.18-rc1
2014-10-09 16:07:43 -04:00
jbd2: simplify calling convention around __jbd2_journal_clean_checkpoint_list
2014-09-18 00:58:12 -04:00
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-23 14:45:09 -07:00
isdn/capi: correct capi20_manufacturer argument type mismatch
2014-10-14 15:05:34 -04:00
kexec: take the segment adding out of locate_mem_hole functions
2014-10-14 02:18:21 +02:00
KEYS: Make the key matching functions return bool
2014-09-16 17:36:08 +01:00
kgdb: Remove "weak" from kgdb_arch_pc() declaration
2014-10-22 16:14:04 -06:00
mm, thp: fix collapsing of hugepages on madvise
2014-10-29 16:33:14 -07:00
kvm: vfio: fix unregister kvm_device_ops of vfio
2014-10-24 13:30:47 +02:00
libata: change ata_<foo>_printk routines to return void
2014-09-23 10:02:31 -04:00
list: include linux/kernel.h
2014-10-14 02:18:13 +02:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 15:51:40 +02:00
mailbox: Introduce framework for mailbox
2014-10-08 10:39:41 +05:30
mailbox: Introduce framework for mailbox
2014-10-08 10:39:41 +05:30
mei: remove include to pci header from mei module files
2014-09-29 11:56:02 -04:00
mm: memcontrol: fix missed end-writeback page accounting
2014-10-29 16:33:15 -07:00
memory-hotplug: Remove "weak" from memory_block_size_bytes() declaration
2014-10-22 16:14:04 -06:00
memory-hotplug: add sysfs valid_zones attribute
2014-10-09 22:25:52 -04:00
mempolicy: unexport get_vma_policy() and remove its "task" arg
2014-10-09 22:25:56 -04:00
net/phy: micrel: Add clock support for KSZ8021/KSZ8031
2014-10-10 15:35:13 -04:00
mm/balloon_compaction: redesign ballooned pages management
2014-10-09 22:26:01 -04:00
mm: page-writeback: inline account_page_dirtied() into single caller
2014-10-29 16:33:14 -07:00
mm: introduce VM_BUG_ON_MM
2014-10-09 22:25:58 -04:00
kvm: Fix page ageing bugs
2014-09-24 14:07:58 +02:00
mm: clean up zone flags
2014-10-09 22:25:57 -04:00
kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>
2014-10-14 02:18:28 +02:00
vfs: introduce clone_private_mount()
2014-10-24 00:14:36 +02:00
PCI/MSI: Remove "pos" from the struct msi_desc msi_attrib
2014-10-01 12:21:23 -06:00
net: Add ndo_gso_check
2014-10-15 12:11:00 -04:00
netfilter: bridge: move br_netfilter out of the core
2014-09-26 18:42:31 +02:00
NFS: Implement SEEK
2014-09-30 16:24:56 -04:00
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
2014-10-18 11:53:51 -07:00
NFS: Implement SEEK
2014-09-30 16:24:56 -04:00
Merge branch 'client-4.2' into linux-next
2014-09-30 17:22:02 -04:00
kernel/watchdog.c: control hard lockup detection default
2014-10-14 02:18:27 +02:00
of: Introduce Device Tree resolve support.
2014-10-04 21:24:26 +01:00
of/pci: Fix the conversion of IO ranges into IO resources
2014-09-30 17:08:40 -06:00
of/pci: Add support for parsing PCI host bridge resources from DT
2014-09-30 17:08:57 -06:00
drivers: of: add return value to of_reserved_mem_device_init()
2014-10-29 16:33:14 -07:00
ARM: OMAP: Remove unused pieces of legacy DMA API
2014-09-18 09:53:25 -07:00
OOM, PM: OOM killed task shouldn't escape PM suspend
2014-10-21 23:44:21 +02:00
mm/balloon_compaction: remove balloon mapping and flag AS_BALLOON_MAP
2014-10-09 22:26:01 -04:00
PCI changes for the v3.18 merge window:
2014-10-09 15:03:49 -04:00
Changes to existing drivers:
2014-10-15 06:58:16 +02:00
Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-10-10 07:26:02 -04:00
net: phy: adjust fixed_phy_register() return value
2014-10-07 13:06:45 -04:00
mailbox: rename pl320-ipc specific mailbox.h
2014-10-08 10:39:33 +05:30
Merge branch 'pm-domains'
2014-10-07 01:18:12 +02:00
PM / Domains: Rename cpu_data to cpuidle_data
2014-10-03 15:43:14 +02:00
PM / QoS: Add PM_QOS_MEMORY_BANDWIDTH class
2014-09-25 01:18:33 +02:00
Boaz Harrosh - Fix broken email address
2014-10-19 20:22:32 +03:00
power-supply: Forward declare structs together
2014-09-16 11:01:28 +02:00
lockd: move lockd's grace period handling into its own module
2014-09-17 16:33:11 -04:00
rbtree: add comment to rb_insert_augmented()
2014-10-14 02:18:21 +02:00
rcutorture: Rename rcutorture_runnable parameter
2014-09-16 13:41:44 -07:00
kernel: add support for kernel restart handler call chain
2014-09-26 00:00:06 -07:00
mm: convert a few VM_BUG_ON callers to VM_BUG_ON_VMA
2014-10-09 22:25:57 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
include/linux/screen_info.h: remove unused ORIG_* macros
2014-10-09 22:26:04 -04:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2014-10-12 10:13:55 -04:00
seqlock: Add irqsave variant of read_seqbegin_or_lock()
2014-09-19 12:35:16 +02:00
tty: serial: 8250: use 32bit variable for rpm_tx_active
2014-09-29 18:20:38 -07:00
tty: serial: 8250_core: allow to set ->throttle / ->unthrottle callbacks
2014-09-26 18:01:56 +02:00
signal: use BUILD_BUG() instead of _NSIG_WORDS_is_unsupported_size()
2014-10-14 02:18:20 +02:00
net: skb_fclone_busy() needs to detect orphaned skb
2014-10-30 19:58:30 -04:00
mm/sl[ao]b: always track caller in kmalloc_(node_)track_caller()
2014-10-09 22:25:50 -04:00
mm/slab: use percpu allocator for cpu cache
2014-10-09 22:25:51 -04:00
smp: Add new wake_up_all_idle_cpus() function
2014-09-19 12:35:15 +02:00
This adds a memzero_explicit() call which is guaranteed not to be
2014-10-24 12:33:32 -07:00
lib / string_helpers: introduce string_escape_mem()
2014-10-14 02:18:26 +02:00
ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idle
2014-09-30 21:06:07 +02:00
mm: memcontrol: fix transparent huge page allocations under pressure
2014-10-09 22:25:59 -04:00
bpf: enable bpf syscall on x64 and i386
2014-09-26 15:05:14 -04:00
block: Add T10 Protection Information functions
2014-09-27 09:14:59 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-10-08 21:40:54 -04:00
Thermal: introduce INT3402 thermal driver
2014-10-10 14:02:25 +08:00
misc: st_kim: Increase size of dev_name buffer to incorporate termination
2014-09-26 08:15:29 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2014-10-14 03:47:00 +02:00
topology: add support for node_to_mem_node() to determine the fallback node
2014-10-09 22:25:51 -04:00
torture: Address race in module cleanup
2014-09-16 13:41:06 -07:00
tty: Fix width of unsigned long bitfield padding
2014-09-25 12:17:25 +02:00
tty: Serialize tty flow control changes with flow_lock
2014-09-23 21:19:35 -07:00
Add copy_to_iter(), copy_from_iter() and iov_iter_zero()
2014-10-09 02:39:03 -04:00
uio: Export definition of struct uio_device
2014-10-02 21:35:54 -07:00
uprobes: Remove "weak" from function declarations
2014-10-22 16:14:04 -06:00
usb: Add LED triggers for USB activity
2014-09-25 17:05:12 +02:00
uas: Add no-report-opcodes quirk
2014-09-23 21:40:48 -07:00
vgaswitcheroo: add vga_switcheroo_fini_domain_pm_ops
2014-09-18 19:21:20 -04:00
vgaarb: Drop obsolete #ifndef
2014-09-16 15:02:55 -06:00
virtio: defer config changed notifications
2014-10-15 10:24:56 +10:30
virtio: add API to enable VQs early
2014-10-15 10:25:01 +10:30
mm/balloon_compaction: add vmstat counters and kpageflags bit
2014-10-09 22:26:01 -04:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-10-13 16:23:15 +02:00
watchdog: simplify definitions of WATCHDOG_NOWAYOUT(_INIT_STATUS)?
2014-10-20 20:46:25 +02:00
zsmalloc: change return value unit of zs_get_total_size_bytes
2014-10-09 22:26:02 -04:00
