Linus Torvalds
f0094b28f3
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"Several networking final fixes and tidies for the merge window:
1) Changes during the merge window unintentionally took away the
ability to build bluetooth modular, fix from Geert Uytterhoeven.
2) Several phy_node reference count bug fixes from Uwe Kleine-König.
3) Fix ucc_geth build failures, also from Uwe Kleine-König.
4) Fix klog false positivies when netlink messages go to network
taps, by properly resetting the network header. Fix from Daniel
Borkmann.
5) Sizing estimate of VF netlink messages is too small, from Jiri
Benc.
6) New APM X-Gene SoC ethernet driver, from Iyappan Subramanian.
7) VLAN untagging is erroneously dependent upon whether the VLAN
module is loaded or not, but there are generic dependencies that
matter wrt what can be expected as the SKB enters the stack.
Make the basic untagging generic code, and do it unconditionally.
From Vlad Yasevich.
8) xen-netfront only has so many slots in it's transmit queue so
linearize packets that have too many frags. From Zoltan Kiss.
9) Fix suspend/resume PHY handling in bcmgenet driver, from Florian
Fainelli"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (55 commits)
net: bcmgenet: correctly resume adapter from Wake-on-LAN
net: bcmgenet: update UMAC_CMD only when link is detected
net: bcmgenet: correctly suspend and resume PHY device
net: bcmgenet: request and enable main clock earlier
net: ethernet: myricom: myri10ge: myri10ge.c: Cleaning up missing null-terminate after strncpy call
xen-netfront: Fix handling packets on compound pages with skb_linearize
net: fec: Support phys probed from devicetree and fixed-link
smsc: replace WARN_ON() with WARN_ON_SMP()
xen-netback: Don't deschedule NAPI when carrier off
net: ethernet: qlogic: qlcnic: Remove duplicate object file from Makefile
wan: wanxl: Remove typedefs from struct names
m68k/atari: EtherNEC - ethernet support (ne)
net: ethernet: ti: cpmac.c: Cleaning up missing null-terminate after strncpy call
hdlc: Remove typedefs from struct names
airo_cs: Remove typedef local_info_t
atmel: Remove typedef atmel_priv_ioctl
com20020_cs: Remove typedef com20020_dev_t
ethernet: amd: Remove typedef local_info_t
net: Always untag vlan-tagged traffic on input.
drivers: net: Add APM X-Gene SoC ethernet driver support.
...
2014-08-13 18:27:40 -06:00
bcma: use NS prefix for names of Northstar specific cores
2014-07-31 13:45:32 -04:00
include/linux/byteorder/generic.h: minor comment fix
2014-08-06 18:01:23 -07:00
clk: Support for clock parents and rates assigned from device tree
2014-07-25 15:16:27 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
extcon: sm5502: Change internal hardware switch according to cable type
2014-07-23 10:22:35 +09:00
fsl /bestcomm
gpio: add missing includes in machine.h
2014-08-07 11:54:51 +02:00
Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-08-09 09:15:07 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:46:42 -07:00
Input: pixcir_i2c_ts - support up to 5 fingers and hardware tracking IDs
2014-07-28 10:26:18 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:38:45 -07:00
== Changes to existing drivers ==
2014-08-07 17:17:39 -07:00
net/mlx4_core: Use low memory profile on kdump kernel
2014-07-22 19:53:14 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
mtd: nand: add ONFI timing mode to nand_timings converter
2014-07-21 19:39:55 -07:00
phy: core: Let node ptr of PHY point to PHY and not of PHY provider
2014-07-22 12:46:11 +05:30
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-08-11 07:14:01 -07:00
Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/getreg', 'regulator/topic/gpio' and 'regulator/topic/lp872x' into regulator-next
2014-08-05 18:29:21 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
NFS client updates for Linux 3.17
2014-08-13 18:13:19 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2014-08-06 09:38:14 -07:00
make fs/{namespace,super}.c forget about acct.h
2014-08-07 14:40:09 -04:00
Merge branch 'i2c/for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2014-08-09 09:15:07 -07:00
x86/ras: Fix build warnings in <linux/aer.h>
2014-07-30 10:42:55 -07:00
ata: libahci_platform: move port_map parameters into the AHCI structure
2014-07-30 15:39:46 -04:00
lib: bitmap: add missing mask in bitmap_andnot
2014-08-06 18:01:27 -07:00
CAPABILITIES: remove undefined caps from all processes
2014-07-24 21:53:47 +10:00
clocksource: Get rid of cycle_last
2014-07-23 15:01:52 -07:00
mm, CMA: change cma_declare_contiguous() to obey coding convention
2014-08-06 18:01:16 -07:00
cpufreq: Introduce new relation for freq selection
2014-07-21 13:43:19 +02:00
crypto: Resolve shadow warnings
2014-08-01 22:35:55 +08:00
dcache: d_obtain_alias callers don't all want DISCONNECTED
2014-08-07 14:40:10 -04:00
IOMMU Updates for Linux v3.17
2014-08-05 15:59:35 -07:00
CMA: generalize CMA reserved area management functionality
2014-08-06 18:01:16 -07:00
Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
2014-08-11 07:14:01 -07:00
iommu/vt-d: Simplify include/linux/dmar.h
2014-07-23 16:04:47 +02:00
kexec: support kexec/kdump on EFI systems
2014-08-08 15:57:33 -07:00
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-08-11 11:44:11 -07:00
take fs_pin stuff to fs/*
2014-08-07 14:40:08 -04:00
fanotify: fix double free of pending permission events
2014-08-06 18:01:12 -07:00
ftrace: Rename ftrace_ops field from trampolines to nr_trampolines
2014-07-23 15:03:00 -04:00
Nicolas Pitre added generic tracepoints for tracing IPIs and updated the
2014-08-09 17:33:44 -07:00
mm/page_alloc.c: add __meminit to alloc_pages_exact_nid()
2014-08-06 18:01:15 -07:00
lib: add lib/glob.c
2014-08-06 18:01:24 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2014-08-08 17:39:48 -07:00
mm: BUG when __kmap_atomic_idx equals KM_TYPE_NR
2014-08-06 18:01:22 -07:00
drm/tegra: Make job submission 64-bit safe
2014-08-04 10:07:36 +02:00
time: Consolidate the time accessor prototypes
2014-07-23 10:17:54 -07:00
mm: make copy_pte_range static again
2014-08-06 18:01:19 -07:00
mm, hugetlb: remove hugetlb_zero and hugetlb_infinity
2014-08-06 18:01:19 -07:00
mac80211: add TDLS QoS param IE on setup-confirm
2014-07-21 12:14:04 +02:00
net: Always untag vlan-tagged traffic on input.
2014-08-11 12:16:51 -07:00
ima: add support for measuring and appraising firmware
2014-07-25 11:47:46 -07:00
of: Provide a function to request and map memory
2014-07-23 12:02:30 +02:00
resource: provide new functions to walk through resources
2014-08-08 15:57:32 -07:00
iommu/vt-d: Introduce helper function iova_size() to improve code readability
2014-07-23 16:04:47 +02:00
net: filter: split 'struct sk_filter' into socket and bpf parts
2014-08-02 15:03:58 -07:00
This finally applies the stricter sysfs perms checking we pulled out
2014-08-10 21:31:58 -07:00
kexec: verify the signature of signed PE bzImage
2014-08-08 15:57:33 -07:00
KEYS: Allow expiry time to be set when preparsing a key
2014-07-22 21:46:08 +01:00
Merge branch 'keys-fixes' into keys-next
2014-07-22 21:55:45 +01:00
klist: use same naming scheme as hlist for klist_add_after()
2014-08-06 18:01:24 -07:00
kthread_work: remove the unused wait_queue_head
2014-07-28 14:16:30 -04:00
time: Consolidate the time accessor prototypes
2014-07-23 10:17:54 -07:00
KVM: Move more code under CONFIG_HAVE_KVM_IRQFD
2014-08-06 14:24:47 +02:00
libata: introduce ata_host->n_tags to avoid oops on SAS controllers
2014-07-23 10:30:34 -04:00
list: fix order of arguments for hlist_add_after(_rcu)
2014-08-06 18:01:24 -07:00
include/linux/memblock.h: add __init to memblock_set_bottom_up()
2014-08-06 18:01:15 -07:00
mm: memcontrol: use page lists for uncharge batching
2014-08-08 15:57:18 -07:00
memory-hotplug: add zone_for_memory() for selecting zone for new memory
2014-08-06 18:01:21 -07:00
arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area
2014-08-08 15:57:27 -07:00
fork/exec: cleanup mm initialization
2014-08-08 15:57:23 -07:00
include/linux/mmdebug.h: add VM_WARN_ONCE()
2014-08-06 18:01:18 -07:00
mmu_notifier: add call_srcu and sync function for listener to delay call and sync
2014-08-06 18:01:22 -07:00
mm: page_alloc: reduce cost of the fair zone allocation policy
2014-08-06 18:01:20 -07:00
module: return bool from within_module*()
2014-07-27 20:52:44 +09:30
modules: Fix build error in moduleloader.h
2014-07-27 20:52:42 +09:30
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-08-11 11:44:11 -07:00
openvswitch: Enable tunnel GSO for OVS bridge.
2014-07-24 01:15:04 -07:00
net: kernel-doc compliant documentation for net_device
2014-07-31 21:34:20 -07:00
NFS: allow lockless access to access_cache
2014-08-03 17:14:13 -04:00
nfs: fix comment and add warn_on for PG_INODE_REF
2014-08-03 17:05:25 -04:00
acpi, apei, ghes: Make NMI error notification to be GHES architecture extension.
2014-07-22 15:05:06 -07:00
mm, oom: ensure memoryless node zonelist always includes zones
2014-08-06 18:01:21 -07:00
namespaces: Use task_lock and not rcu to protect nsproxy
2014-07-29 18:08:50 -07:00
of: Provide a function to request and map memory
2014-07-23 12:02:30 +02:00
dmaengine: of: add common xlate function for matching by channel id
2014-07-26 00:21:41 +05:30
of: Add memory limiting function for flattened devicetrees
2014-07-29 21:26:45 -06:00
ARM: OMAP2+: DMA: remove requirement of irq for platform-dma driver
2014-07-21 23:32:51 -07:00
iommu/omap: Remove virtual memory manager
2014-07-29 12:38:07 +02:00
mm, oom: rename zonelist locking functions
2014-08-06 18:01:21 -07:00
mm: page-flags: clean up the page flag test, set, clear macros
2014-08-06 18:01:17 -07:00
memcg: remove lookup_cgroup_page() prototype
2014-08-08 15:57:18 -07:00
mm: describe mmap_sem rules for __lock_page_or_retry() and callers
2014-08-06 18:01:20 -07:00
ACPI / PM: Revork the handling of ACPI device wakeup notifications
2014-07-23 01:00:45 +02:00
Char / Misc driver patches for 3.17-rc1
2014-08-04 17:32:24 -07:00
Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2014-08-04 10:09:27 -07:00
net: libphy: Add phy specific function to access mmd phy registers
2014-07-30 20:00:21 -07:00
proc: Implement /proc/thread-self to point at the directory of the current thread
2014-08-04 10:07:11 -07:00
PM: Create PM workqueue if runtime PM is not configured too
2014-07-23 01:00:36 +02:00
printk: rename DEFAULT_MESSAGE_LOGLEVEL
2014-08-06 18:01:24 -07:00
list: fix order of arguments for hlist_add_after(_rcu)
2014-08-06 18:01:24 -07:00
regmap: Fix return code for stub regmap_get_device()
2014-07-25 19:01:53 +01:00
lib: Resizable, Scalable, Concurrent Hash Table
2014-08-02 19:49:38 -07:00
rapidio: add new RapidIO DMA interface routines
2014-08-08 15:57:24 -07:00
lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig
2014-08-08 15:57:26 -07:00
Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc
2014-08-09 09:58:12 -07:00
Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into next
2014-07-30 01:31:46 +10:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-05 17:46:42 -07:00
ACPI / SFI: Fix wrong <acpi/acpi.h> inclusion in SFI/ACPI wrapper - table definitions.
2014-07-23 01:10:45 +02:00
shm: remove unneeded extern for function
2014-08-08 15:57:26 -07:00
shm: add sealing API
2014-08-08 15:57:31 -07:00
Rip out get_signal_to_deliver()
2014-08-06 13:03:44 +02:00
net: Always untag vlan-tagged traffic on input.
2014-08-11 12:16:51 -07:00
net: stmmac: Support devicetree configs for mcast and ucast filter entries
2014-07-31 14:13:29 -07:00
mm: memcontrol: rewrite uncharge API
2014-08-08 15:57:17 -07:00
kexec: new syscall kexec_file_load() declaration
2014-08-08 15:57:32 -07:00
sysctl: remove typedef ctl_table
2014-08-08 15:57:24 -07:00
thermal: document struct thermal_zone_device and thermal_governor
2014-07-22 10:12:05 +08:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-08-04 16:23:30 -07:00
time: Consolidate the time accessor prototypes
2014-07-23 10:17:54 -07:00
time: More core infrastructure for timespec64
2014-07-23 10:17:53 -07:00
timekeeping: Fixup typo in update_vsyscall_old definition
2014-07-30 09:26:25 +02:00
timekeeping: Provide fast and NMI safe access to CLOCK_MONOTONIC
2014-07-23 15:01:55 -07:00
tpm: Provide a generic means to override the chip returned timeouts
2014-07-29 23:10:56 +02:00
tracehook_signal_handler: Remove sig, info, ka and regs
2014-08-06 13:03:43 +02:00
tracing: Do not do anything special with tracepoint_string when tracing is disabled
2014-08-07 20:39:36 -04:00
switch iov_iter_get_pages() to passing maximal number of pages
2014-08-07 14:40:11 -04:00
proc: constify seq_operations
2014-08-08 15:57:22 -07:00
drivers/vfio: EEH support for VFIO PCI device
2014-08-05 15:28:48 +10:00
mm/vmalloc.c: clean up map_vm_area third argument
2014-08-06 18:01:19 -07:00
mm/zbud: change zbud_alloc size type to size_t
2014-08-06 18:01:23 -07:00
initramfs: support initramfs that is bigger than 2GiB
2014-08-08 15:57:26 -07:00
mm/zpool: implement common zpool api to zbud/zsmalloc
2014-08-06 18:01:23 -07:00
