summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net/ncsi: Don't take any action on HNCDSC AENSamuel Mendoza-Jonas2017-12-181-32/+3
* Merge branch 'phy-meson-gxl-clean-up-and-improvements'David S. Miller2017-12-181-39/+146
|\
| * net: phy: meson-gxl: join the authorsJerome Brunet2017-12-181-0/+1
| * net: phy: meson-gxl: add interrupt supportJerome Brunet2017-12-181-1/+36
| * net: phy: meson-gxl: leave CONFIG_A6 untouchedJerome Brunet2017-12-181-9/+0
| * net: phy: meson-gxl: use genphy_config_initJerome Brunet2017-12-181-1/+1
| * net: phy: meson-gxl: add read and write helpers for banked registersJerome Brunet2017-12-181-61/+69
| * net: phy: meson-gxl: define control registersJerome Brunet2017-12-181-20/+66
| * net: phy: meson-gxl: check phy_write return valueJerome Brunet2017-12-181-12/+38
|/
* Merge branch 'sfc-Medford2'David S. Miller2017-12-189-68/+162
|\
| * sfc: populate the timer reload fieldBert Kenward2017-12-181-2/+3
| * sfc: update EF10 register definitionsBert Kenward2017-12-182-25/+37
| * sfc: improve PTP error reportingEdward Cree2017-12-183-2/+13
| * sfc: add Medford2 (SFC9250) PCI Device IDsEdward Cree2017-12-181-0/+4
| * sfc: support VI strides other than 8kEdward Cree2017-12-185-27/+70
| * sfc: make mem_bar a function rather than a constantEdward Cree2017-12-185-12/+35
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2017-12-1873-352/+6071
|\
| * trace: reenable preemption if we modify the ipJosef Bacik2017-12-171-1/+8
| * nfp: set flags in the correct member of netdev_bpfJakub Kicinski2017-12-171-1/+1
| * libbpf: fix Makefile exit code if libelf not foundJakub Kicinski2017-12-171-2/+2
| * Merge branch 'bpf-to-bpf-function-calls'Daniel Borkmann2017-12-1723-269/+4378
| |\
| | * selftests/bpf: additional bpf_call testsDaniel Borkmann2017-12-171-0/+597
| | * bpf: arm64: add JIT support for multi-function programsAlexei Starovoitov2017-12-171-4/+64
| | * bpf: x64: add JIT support for multi-function programsAlexei Starovoitov2017-12-177-6/+189
| | * bpf: fix net.core.bpf_jit_enable raceAlexei Starovoitov2017-12-1710-11/+13
| | * bpf: add support for bpf_call to interpreterAlexei Starovoitov2017-12-174-17/+116
| | * selftests/bpf: add xdp noinline testAlexei Starovoitov2017-12-173-1/+916
| | * selftests/bpf: add bpf_call testAlexei Starovoitov2017-12-173-6/+492
| | * libbpf: add support for bpf_callAlexei Starovoitov2017-12-173-44/+134
| | * selftests/bpf: add tests for stack_zero trackingAlexei Starovoitov2017-12-171-2/+64
| | * bpf: teach verifier to recognize zero initialized stackAlexei Starovoitov2017-12-172-29/+103
| | * selftests/bpf: add verifier tests for bpf_callAlexei Starovoitov2017-12-171-1/+960
| | * bpf: introduce function calls (verification)Alexei Starovoitov2017-12-172-153/+585
| | * bpf: introduce function calls (function boundaries)Alexei Starovoitov2017-12-174-5/+155
| |/
| * nfp: bpf: correct printk formats for size_tJakub Kicinski2017-12-151-2/+2
| * Merge branch 'bpf-nfp-jit-adjust-head-support'Daniel Borkmann2017-12-159-0/+392
| |\
| | * nfp: bpf: optimize the adjust_head calls in trivial casesJakub Kicinski2017-12-154-2/+76
| | * nfp: bpf: add basic support for adjust head callJakub Kicinski2017-12-156-0/+190
| | * nfp: bpf: prepare for call supportJakub Kicinski2017-12-152-0/+28
| | * nfp: bpf: prepare for parsing BPF FW capabilitiesJakub Kicinski2017-12-153-0/+88
| | * nfp: add nfp_cpp_area_size() accessorJakub Kicinski2017-12-152-0/+12
| |/
| * Merge branch 'bpf-bpftool-cgroup-ops'Daniel Borkmann2017-12-1410-39/+566
| |\
| | * bpftool: implement cgroup bpf operationsRoman Gushchin2017-12-147-5/+434
| | * bpftool: implement prog load commandRoman Gushchin2017-12-145-34/+79
| | * libbpf: prefer global symbols as bpf program name sourceRoman Gushchin2017-12-141-0/+2
| | * libbpf: add ability to guess program type based on section nameRoman Gushchin2017-12-141-0/+51
| |/
| * bpf/tracing: fix kernel/events/core.c compilation errorYonghong Song2017-12-134-3/+8
| * Merge branch 'bpf-override-return'Alexei Starovoitov2017-12-1229-12/+424
| |\
| | * btrfs: allow us to inject errors at io_ctl_initJosef Bacik2017-12-121-0/+2
| | * samples/bpf: add a test for bpf_override_returnJosef Bacik2017-12-126-2/+71