Changes in Makefile

976e3645923bdd2fe7893aae33fd7a21098bfb28 - Merge branch 'next' into for-linus

Mon, 25 Nov 2019 22:26:56 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.5 merge window. List of files: /linux/drivers/net/can/sja1000/Makefile

9f4813b531a0b8cc502fcfb142937fe4e9104d77 - Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixes

Tue, 19 Nov 2019 09:00:45 +0100

Merge tag 'v5.4-rc8' into WIP.x86/mm, to pick up fixesSigned-off-by: Ingo Molnar List of files: /linux/drivers/net/can/sja1000/Makefile

ac94be498f84f7327533b62faca4c3da64434904 - Merge branch 'linus' into x86/hyperv

Fri, 15 Nov 2019 10:30:50 +0100

Merge branch 'linus' into x86/hypervPick up upstream fixes to avoid conflicts. List of files: /linux/drivers/net/can/sja1000/Makefile

728d90bdc9e480dc93913e59a0aa3c896c7aa697 - Merge tag 'v5.4-rc5' into next

Sun, 27 Oct 2019 19:00:19 +0100

Merge tag 'v5.4-rc5' into nextSync up with mainline. List of files: /linux/drivers/net/can/sja1000/Makefile

112d6212c80a1c560757520bd822a41c0ad15c2c - Merge tag 'v5.4-rc3' into spi-5.4

Fri, 18 Oct 2019 19:30:49 +0200

Merge tag 'v5.4-rc3' into spi-5.4Linux 5.4-rc3 List of files: /linux/drivers/net/can/sja1000/Makefile

fa41d6ee904266fa8739cafa6ec038c3a8e435b7 - Merge drm/drm-next into drm-intel-next-queued

Tue, 15 Oct 2019 10:18:26 +0200

Merge drm/drm-next into drm-intel-next-queuedBackmerging to pull in HDR DP code:https://lists.freedesktop.org/archives/dri-devel/2019-September/236453.htmlSigned-off-by: Joonas Lahtinen List of files: /linux/drivers/net/can/sja1000/Makefile

1913c7f3fc2514e09262baf2267a82dfdb215c39 - Merge tag 'fix-missing-panels' into fixes

Fri, 04 Oct 2019 18:06:41 +0200

Merge tag 'fix-missing-panels' into fixes List of files: /linux/drivers/net/can/sja1000/Makefile

4092de1ba34eb376791809fb366bc15f8a9e0b7c - Merge drm/drm-next into drm-misc-next

Thu, 03 Oct 2019 16:38:50 +0200

Merge drm/drm-next into drm-misc-nextWe haven't done any backmerge for a while due to the merge window, and itstarts to become an issue for komeda. Let's bring 5.4-rc1 in.Signed-off-by: Maxime Ripard List of files: /linux/drivers/net/can/sja1000/Makefile

77fdaa091d79c87323a9f3912a25f73e02ea2a01 - Merge drm/drm-fixes into drm-misc-fixes

Thu, 03 Oct 2019 09:59:29 +0200

Merge drm/drm-fixes into drm-misc-fixesWe haven't backmerged for a while, let's start the -rc period by pullingrc1.Signed-off-by: Maxime Ripard List of files: /linux/drivers/net/can/sja1000/Makefile

81160dda9a7aad13c04e78bb2cfd3c4630e3afab - Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

Wed, 18 Sep 2019 21:34:53 +0200

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-nextPull networking updates from David Miller: 1) Support IPV6 RA Captive Portal Identifier, from Maciej Żenczykowski. 2) Use bio_vec in the networking instead of custom skb_frag_t, from Matthew Wilcox. 3) Make use of xmit_more in r8169 driver, from Heiner Kallweit. 4) Add devmap_hash to xdp, from Toke Høiland-Jørgensen. 5) Support all variants of 5750X bnxt_en chips, from Michael Chan. 6) More RTNL avoidance work in the core and mlx5 driver, from Vlad Buslov. 7) Add TCP syn cookies bpf helper, from Petar Penkov. 8) Add 'nettest' to selftests and use it, from David Ahern. 9) Add extack support to drop_monitor, add packet alert mode and support for HW drops, from Ido Schimmel.10) Add VLAN offload to stmmac, from Jose Abreu.11) Lots of devm_platform_ioremap_resource() conversions, from YueHaibing.12) Add IONIC driver, from Shannon Nelson.13) Several kTLS cleanups, from Jakub Kicinski.* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1930 commits) mlxsw: spectrum_buffers: Add the ability to query the CPU port's shared buffer mlxsw: spectrum: Register CPU port with devlink mlxsw: spectrum_buffers: Prevent changing CPU port's configuration net: ena: fix incorrect update of intr_delay_resolution net: ena: fix retrieval of nonadaptive interrupt moderation intervals net: ena: fix update of interrupt moderation register net: ena: remove all old adaptive rx interrupt moderation code from ena_com net: ena: remove ena_restore_ethtool_params() and relevant fields net: ena: remove old adaptive interrupt moderation code from ena_netdev net: ena: remove code duplication in ena_com_update_nonadaptive_moderation_interval _*() net: ena: enable the interrupt_moderation in driver_supported_features net: ena: reimplement set/get_coalesce() net: ena: switch to dim algorithm for rx adaptive interrupt moderation net: ena: add intr_moder_rx_interval to struct ena_com_dev and use it net: phy: adin: implement Energy Detect Powerdown mode via phy-tunable ethtool: implement Energy Detect Powerdown support via phy-tunable xen-netfront: do not assume sk_buff_head list is empty in error handling s390/ctcm: Delete unnecessary checks before the macro call “dev_kfree_skb” net: ena: don't wake up tx queue when down drop_monitor: Better sanitize notified packets ... List of files: /linux/drivers/net/can/sja1000/Makefile

f876a784292bd6f787035db73e2c2f0556e64b25 - Merge tag 'linux-can-next-for-5.4-20190724' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Wed, 24 Jul 2019 20:36:24 +0200

Merge tag 'linux-can-next-for-5.4-20190724' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-nextMarc Kleine-Budde says:====================pull-request: can-next 2019-07-24this is a pull request for net-next/master consisting of 26 patches.The first two patches are by me. One adds missing files of the CANsubsystem to the MAINTAINERS file, while the other sorts theMakefile/Kconfig of the sja1000 drivers sub directory. In the next patchJi-Ze Hong (Peter Hong) provides a driver for the "Fintek PCIE to 2 CAN"controller, based on the the sja1000 IP core.Gustavo A. R. Silva's patch for the kvaser_usb driver introduces the useof struct_size() instead of open coding it. Henning Colliander's patchadds a driver for the "Kvaser PCIEcan" devices.Another patch by Gustavo A. R. Silva marks expected switch fall-throughsproperly.Dan Murphy provides 5 patches for the m_can. After cleanups a frameworkis introduced so that the driver can be used from memory mapped IO aswell as SPI attached devices. Finally he adds a driver for the tcan4x5xwhich uses this framework.A series of 5 patches by Appana Durga Kedareswara rao for the xilinx_candriver, first clean up,then add support for CANFD. Colin Ian Kingcontributes another cleanup for the xilinx_can driver.Robert P. J. Day's patch corrects the brief history of the CAN protocolgiven in the Kconfig menu entry.2 patches by Dong Aisheng for the flexcan driver provide PE clock sourceselect support and dt-bindings description.2 patches by Sean Nyekjaer for the flexcan driver provide add CANwakeup-source property and dt-bindings description.Jeroen Hofstee's patch converts the ti_hecc driver to make use of therx-offload helper fixing a number of outstanding bugs.The first patch of Oliver Hartkopp removes the now obsolete emptyioctl() handler for the CAN protocols. The second patch adds SPDXlicense identifiers for CAN subsystem.====================Signed-off-by: David S. Miller List of files: /linux/drivers/net/can/sja1000/Makefile

2d91fdccad4d3bd890e03775bcd7e8beed07c610 - can: sja1000: f81601: add Fintek F81601 support

Tue, 23 Jul 2019 11:03:06 +0200

can: sja1000: f81601: add Fintek F81601 supportThis patch add support for Fintek PCIE to 2 CAN controller supportSigned-off-by: Ji-Ze Hong (Peter Hong) Signed-off-by: Marc Kleine-Budde List of files: /linux/drivers/net/can/sja1000/Makefile

4dfc39e1b639c7220ac7275dc8684cd8e82f188a - can: sja1000: Makefile/Kconfig: sort alphabetically

Mon, 22 Jul 2019 11:36:08 +0200

can: sja1000: Makefile/Kconfig: sort alphabeticallyThis patch sorts the drivers in the Makefile alphabetically and arrangesthe Kconfig file accordingly.Signed-off-by: Marc Kleine-Budde List of files: /linux/drivers/net/can/sja1000/Makefile

498495dba268b20e8eadd7fe93c140c68b6cc9d2 - Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel

Mon, 08 Jan 2018 16:54:50 +0100

Merge branch 'fix/intel' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel List of files: /linux/drivers/net/can/sja1000/Makefile

70a02f840c5113cd9255ce4c1b1848bb48b0bd21 - Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next

Fri, 29 Dec 2017 17:49:13 +0100

Merge tag 'v4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-nextLinux 4.15-rc5 List of files: /linux/drivers/net/can/sja1000/Makefile

2ef6765ccaab2c69470d7049d9a9bf6456a6e666 - Merge tag 'drm-intel-next-2017-12-14' into gvt-next

Mon, 18 Dec 2017 09:29:37 +0100

Merge tag 'drm-intel-next-2017-12-14' into gvt-next- Fix documentation build issues (Randy, Markus)- Fix timestamp frequency calculation for perf on CNL (Lionel)- New DMC firmware for Skylake (Anusha)- GTT flush fixes and other GGTT write track and refactors (Chris)- Taint kernel when GPU reset fails (Chris)- Display workarounds organization (Lucas)- GuC and HuC initialization clean-up and fixes (Michal)- Other fixes around GuC submission (Michal)- Execlist clean-ups like caching ELSP reg offset and improving log readability (Chri\s)- Many other improvements on our logs and dumps (Chris)- Restore GT performance in headless mode with DMC loaded (Tvrtko)- Stop updating legacy fb parameters since FBC is not using anymore (Daniel)- More selftest improvements (Chris)- Preemption fixes and improvements (Chris)- x86/early-quirks improvements for Intel graphics stolen memory. (Joonas, Matthew)- Other improvements on Stolen Memory code to be resource centric. (Matthew)- Improvements and fixes on fence allocation/release (Chris).GVT:- fixes for two coverity scan errors (Colin)- mmio switch code refine (Changbin)- more virtual display dmabuf fixes (Tina/Gustavo)- misc cleanups (Pei)- VFIO mdev display dmabuf interface and gvt support (Tina)- VFIO mdev opregion support/fixes (Tina/Xiong/Chris)- workload scheduling optimization (Changbin)- preemption fix and temporal workaround (Zhenyu)- and misc fixes after refactor (Chris) List of files: /linux/drivers/net/can/sja1000/Makefile

d21bd6898336a7892914d308d5e0868f0b863571 - Sync to v4.15-rc3 for security subsystem developers to work against.

Mon, 11 Dec 2017 07:01:08 +0100

Sync to v4.15-rc3 for security subsystem developers to work against. List of files: /linux/drivers/net/can/sja1000/Makefile

6647852abc1fd74e9c5e0dcf404ea4cb9c929630 - Merge airlied/drm-next into drm-intel-next-queued

Fri, 08 Dec 2017 19:15:30 +0100

Merge airlied/drm-next into drm-intel-next-queuedChris requested this backmerge for a reconciliation ondrm_print.h between drm-misc-next and drm-intel-next-queuedSigned-off-by: Rodrigo Vivi List of files: /linux/drivers/net/can/sja1000/Makefile

7b47c66cfa203288c43851260edeeb0fae56f692 - Merge arlied/drm-next into drm-misc-next

Mon, 04 Dec 2017 19:04:45 +0100

Merge arlied/drm-next into drm-misc-nextWe need to pull 66660d4cf21b (drm: add connector info/property fornon-desktop displays [v2]) into drm-misc-next to continue the developmentof the display rotation series.Effectively this also pulls 4.15-r2 into drm-misc-next.Signed-off-by: Gustavo Padovan List of files: /linux/drivers/net/can/sja1000/Makefile

d218439feccafaa3e852bbaecc0d9f6110096b65 - Merge branch 'fix/amd' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-amd

Mon, 04 Dec 2017 18:59:52 +0100

Merge branch 'fix/amd' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-amd List of files: /linux/drivers/net/can/sja1000/Makefile